Fix to initialize render effect shader with zero corner radius

Change-Id: I215487b4a4457d958ea38bca6547a7cdbac2ca0d
Signed-off-by: jmm <j0064423.lee@samsung.com>

diff --git a/dali-toolkit/internal/controls/render-effects/blur-effect-impl.cpp b/dali-toolkit/internal/controls/render-effects/blur-effect-impl.cpp
index d2a827e008c883fc09031215aa2e5bff0f836f0b..7e3cabc26f8ab4a9e92d60d2fc0d35b3038c8a04 100644 (file)
--- a/dali-toolkit/internal/controls/render-effects/blur-effect-impl.cpp
+++ b/dali-toolkit/internal/controls/render-effects/blur-effect-impl.cpp
@@ -275,7 +275,7 @@ void BlurEffectImpl::OnActivate()
   mHorizontalBlurActor.SetProperty(Actor::Property::SIZE, Vector2(downsampledWidth, downsampledHeight));
   mVerticalBlurActor.SetProperty(Actor::Property::SIZE, Vector2(downsampledWidth, downsampledHeight));
 
-  // Keep sceneHolder as week handle.
+  // Keep sceneHolder as weak handle.
   Integration::SceneHolder sceneHolder = Integration::SceneHolder::Get(ownerControl);
   if(DALI_UNLIKELY(!sceneHolder))
   {
@@ -293,7 +293,7 @@ void BlurEffectImpl::OnActivate()
   Renderer renderer = GetTargetRenderer();
   if(mIsBackground)
   {
-    renderer.SetProperty(Dali::Renderer::Property::DEPTH_INDEX, Dali::Toolkit::DepthIndex::BACKGROUND - 3);
+    renderer.SetProperty(Dali::Renderer::Property::DEPTH_INDEX, Dali::Toolkit::DepthIndex::BACKGROUND_EFFECT);
   }
   else
   {

diff --git a/dali-toolkit/internal/controls/render-effects/render-effect-impl.cpp b/dali-toolkit/internal/controls/render-effects/render-effect-impl.cpp
index c38048e01bc9dd3db399c7b31b1bfc62333ef0a8..633ce3fba7ef23a0e7f718b2962870cb9497b6fa 100644 (file)
--- a/dali-toolkit/internal/controls/render-effects/render-effect-impl.cpp
+++ b/dali-toolkit/internal/controls/render-effects/render-effect-impl.cpp
@@ -82,6 +82,11 @@ void RenderEffectImpl::SetOwnerControl(Dali::Toolkit::Control control)
       {
         mRenderer = CreateRenderer(SHADER_RENDER_EFFECT_VERT, SHADER_RENDER_EFFECT_FRAG);
         mRenderer.SetProperty(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA, true); // Always use pre-multiply alpha
+
+        Shader shader = mRenderer.GetShader();
+        shader.RegisterProperty("uCornerRadius", Vector4::ZERO);
+        shader.RegisterProperty("uCornerSquareness", Vector4::ZERO);
+        shader.RegisterProperty("uCornerRadiusPolicy", static_cast<float>(1.0f));
       }
 
       ownerControl.InheritedVisibilityChangedSignal().Connect(this, &RenderEffectImpl::OnControlInheritedVisibilityChanged);

diff --git a/dali-toolkit/internal/controls/render-effects/render-effect-impl.h b/dali-toolkit/internal/controls/render-effects/render-effect-impl.h
index 39a7abde00d9ca2d3e311f71feb7119a3fbdc402..d7656bdb578774d1abdd9c3fb758d0d9334628fb 100644 (file)
--- a/dali-toolkit/internal/controls/render-effects/render-effect-impl.h
+++ b/dali-toolkit/internal/controls/render-effects/render-effect-impl.h
@@ -126,7 +126,7 @@ protected:
   /// For sub classes
 protected:
   /**
-   * @brief Initialize sub classes effect
+   * @brief Initializes sub classes effect
    */
   virtual void OnInitialize() = 0;