Merge "Fix the texture bleeding with wrapping in atlas" into devel/master

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

diff --git a/dali-toolkit/devel-api/shader-effects/dissolve-local-effect.h b/dali-toolkit/devel-api/shader-effects/dissolve-local-effect.h
index a509795..31dcebd 100644 (file)
--- a/dali-toolkit/devel-api/shader-effects/dissolve-local-effect.h
+++ b/dali-toolkit/devel-api/shader-effects/dissolve-local-effect.h
@@ -63,7 +63,7 @@ inline ShaderEffect CreateDissolveLocalEffect( unsigned int numberOfDimples )
       "  }\n"
       "  vPercentage = clamp( percentage, 0.0, 1.0 );\n"
       "  gl_Position = uProjection * position;\n"
-      "  vTexCoord = aTexCoord;\n"
+      "  vTexCoord = mix( sTextureRect.xy, sTextureRect.zw, aTexCoord );\n"
       "}\n");
   vertexShaderStringStream << vertexShader;
 
@@ -87,7 +87,6 @@ inline ShaderEffect CreateDissolveLocalEffect( unsigned int numberOfDimples )
 
   ShaderEffect shaderEffect = ShaderEffect::New(
       vertexShaderStringStream.str(), fragmentShader,
-      GeometryType( GEOMETRY_TYPE_IMAGE),
       ShaderEffect::GeometryHints( ShaderEffect::HINT_GRID | ShaderEffect::HINT_BLENDING ) );
 
   //Register uniform properties