X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fshader-effects%2Firis-effect.h;h=b0af4659d685089fa1caee379c389c08097c214d;hb=b1fd7c9ac268691ba02ca0b358b82a6f76d31edb;hp=8e80322137d125ba07d060988711daeabfc895a2;hpb=c3f7ea6cb0c0b75c2276193aff88b5c7a679a2d5;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/devel-api/shader-effects/iris-effect.h b/dali-toolkit/devel-api/shader-effects/iris-effect.h
index 8e80322..b0af465 100644
--- a/dali-toolkit/devel-api/shader-effects/iris-effect.h
+++ b/dali-toolkit/devel-api/shader-effects/iris-effect.h
@@ -2,7 +2,7 @@
 #define __DALI_TOOLKIT_SHADER_EFFECT_IRIS_H__
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/shader-effects/shader-effect.h>
+#include <dali/devel-api/shader-effects/shader-effect.h>
 
 namespace Dali
 {
@@ -55,11 +55,11 @@ inline ShaderEffect CreateIrisEffect()
       "\n"
       "void main()\n"
       "{\n"
-      "    mediump vec4 world = uModelView * vec4(aPosition,1.0);\n"
+      "    mediump vec4 world = uModelView * vec4(aPosition, 1.0);\n"
       "    gl_Position = uProjection * world;\n"
       "    \n"
-      "    vTexCoord = aTexCoord;\n"
-      "    vRelativePosition = aTexCoord - uCenter;\n"
+      "    vTexCoord = mix( sTextureRect.xy, sTextureRect.zw, aTexCoord );\n"
+      "    vRelativePosition = vTexCoord - uCenter;\n"
       "}\n");
 
   std::string fragmentShader(
@@ -78,7 +78,6 @@ inline ShaderEffect CreateIrisEffect()
   Dali::ShaderEffect shaderEffect =  Dali::ShaderEffect::New(
       vertexShader,
       fragmentShader,
-      GeometryType( GEOMETRY_TYPE_IMAGE ),
       ShaderEffect::GeometryHints( ShaderEffect::HINT_BLENDING ));
 
   shaderEffect.SetUniform( "uRadius", 0.0f );