[dali_2.3.22] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / visuals / color / color-visual.cpp

diff --git a/dali-toolkit/internal/visuals/color/color-visual.cpp b/dali-toolkit/internal/visuals/color/color-visual.cpp
index ef61a6b..cb20865 100644 (file)
--- a/dali-toolkit/internal/visuals/color/color-visual.cpp
+++ b/dali-toolkit/internal/visuals/color/color-visual.cpp
@@ -242,12 +242,6 @@ Shader ColorVisual::GenerateShader() const
     // If we use blur, just ignore borderline
     borderline = false;
     shaderTypeFlag |= ColorVisualRequireFlag::BLUR;
-
-    // If shader version doesn't support blur with corner radius, ignore corner radius
-    if(DALI_UNLIKELY(Dali::Shader::GetShaderLanguageVersion() < MINIMUM_SHADER_VERSION_SUPPORT_ROUNDED_BLUR))
-    {
-      roundedCorner = false;
-    }
   }
   if(roundedCorner)
   {
@@ -273,6 +267,12 @@ Shader ColorVisual::GenerateShader() const
     {
       vertexShaderPrefixList += "#define IS_REQUIRED_BLUR\n";
       fragmentShaderPrefixList += "#define IS_REQUIRED_BLUR\n";
+
+      // If shader version doesn't support latest blur with corner radius, Let we use legacy code.
+      if(DALI_UNLIKELY(Dali::Shader::GetShaderLanguageVersion() < MINIMUM_SHADER_VERSION_SUPPORT_ROUNDED_BLUR))
+      {
+        fragmentShaderPrefixList += "#define SL_VERSION_LOW\n";
+      }
     }
     if(borderline)
     {