Merge "NativeImageSource with tbm_surface for tizen 3.0 wayland" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / shader-effects / swirl-effect.h

diff --git a/dali-toolkit/devel-api/shader-effects/swirl-effect.h b/dali-toolkit/devel-api/shader-effects/swirl-effect.h
index af90eea..3c8b36f 100644 (file)
--- a/dali-toolkit/devel-api/shader-effects/swirl-effect.h
+++ b/dali-toolkit/devel-api/shader-effects/swirl-effect.h
@@ -50,7 +50,7 @@ inline ShaderEffect CreateSwirlEffect( bool warp )
       "uniform mediump vec2  uCenter;\n"
       "void main()\n"
       "{\n"
-      "  highp vec2 textureCenter = (sTextureRect.xy + sTextureRect.zw) * 0.5;\n"
+      "  highp vec2 textureCenter = (uTextureRect.xy + uTextureRect.zw) * 0.5;\n"
       "  textureCenter = vTexCoord.st - textureCenter;\n"
       "  highp float distance = length(textureCenter);\n"
       "  if (distance >= uRadius)\n"
@@ -80,7 +80,6 @@ inline ShaderEffect CreateSwirlEffect( bool warp )
   Dali::ShaderEffect shaderEffect =  Dali::ShaderEffect::New(
       "",
       fragmentShader,
-      Dali::GeometryType( GEOMETRY_TYPE_IMAGE ),
       ShaderEffect::GeometryHints( ShaderEffect::HINT_BLENDING | ShaderEffect::HINT_GRID ));
 
   shaderEffect.SetUniform( "uAngle", 0.0f );