Merge "Fix for font validation." into devel/master

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

diff --git a/dali-toolkit/devel-api/shader-effects/spot-effect.h b/dali-toolkit/devel-api/shader-effects/spot-effect.h
index c41e0f4..054942e 100644 (file)
--- a/dali-toolkit/devel-api/shader-effects/spot-effect.h
+++ b/dali-toolkit/devel-api/shader-effects/spot-effect.h
@@ -57,7 +57,7 @@ inline ShaderEffect CreateSpotEffect()
       "  vRange = max(0.1, range);\n"
       "  \n"
       "  gl_Position = uMvpMatrix * world;\n"
-      "  vTexCoord = aTexCoord;\n"
+      "  vTexCoord = mix( sTextureRect.xy, sTextureRect.zw, aTexCoord );\n"
       "}");
 
   std::string fragmentShader(
@@ -70,7 +70,6 @@ inline ShaderEffect CreateSpotEffect()
 
   Dali::ShaderEffect shaderEffect =  Dali::ShaderEffect::New(
       vertexShader, fragmentShader,
-      Dali::GeometryType( GEOMETRY_TYPE_IMAGE ),
       ShaderEffect::GeometryHints( ShaderEffect::HINT_GRID ));
 
   shaderEffect.SetUniform( "uCenter", Vector2(0.0f, 0.0f) );