X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fshader-effects%2Firis-effect.h;h=6c7f6cd48ca9be1d6d3a5eff46aa6bb0127e9ec1;hb=e2dd845116bdbe8bd852c73023ccea33ba1c8576;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..6c7f6cd 100644 --- a/dali-toolkit/devel-api/shader-effects/iris-effect.h +++ b/dali-toolkit/devel-api/shader-effects/iris-effect.h @@ -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 );