Merge remote-tracking branch 'origin/tizen' into new_text

[platform/core/uifw/dali-toolkit.git] / optional / dali-toolkit / public-api / shader-effects / carousel-effect.cpp

diff --git a/optional/dali-toolkit/public-api/shader-effects/carousel-effect.cpp b/optional/dali-toolkit/public-api/shader-effects/carousel-effect.cpp
index 5b1e324..49246cd 100644 (file)
--- a/optional/dali-toolkit/public-api/shader-effects/carousel-effect.cpp
+++ b/optional/dali-toolkit/public-api/shader-effects/carousel-effect.cpp
@@ -57,10 +57,10 @@ CarouselEffect CarouselEffect::New()
               "\n"
               "void main()\n"
               "{\n"
-              "    vec4 world = uModelView * vec4(aPosition,1.0);\n"
-              "    vec2 d = (world.xy - uCenter) * uAnglePerUnit;\n"
-              "    float a = length(d);\n"
-              "    float cs = cos(radians(a));\n"
+              "    mediump vec4 world = uModelView * vec4(aPosition,1.0);\n"
+              "    mediump vec2 d = (world.xy - uCenter) * uAnglePerUnit;\n"
+              "    mediump float a = length(d);\n"
+              "    mediump float cs = cos(radians(a));\n"
               "    world.z -= cs * uRadius;\n"
               "    gl_Position = uProjection * world;\n"
               "    \n"
@@ -69,7 +69,7 @@ CarouselEffect CarouselEffect::New()
 
   ShaderEffect shaderEffectCustom = ShaderEffect::New(vertexShader,
           "",
-          GeometryType( GEOMETRY_TYPE_IMAGE | GEOMETRY_TYPE_TEXT ),
+          GeometryType( GEOMETRY_TYPE_IMAGE ),
           ShaderEffect::GeometryHints( ShaderEffect::HINT_GRID | ShaderEffect::HINT_DEPTH_BUFFER ));
 
   // Pass ownership to CarouselEffect through overloaded constructor, So that it now has access to the