[dali_2.3.51] Merge branch 'devel/master'HEADmaster

Change-Id: I0201f66d040f11bfb9a925811c2eeb53c0f1e8d3

1 files changed, 12 insertions, 5 deletions

diff --git a/examples/bullet-physics/shaders/rendering-textured-shape.frag b/examples/bullet-physics/shaders/rendering-textured-shape.frag
index 1f7bac25..af4064f3 100644
--- a/examples/bullet-physics/shaders/rendering-textured-shape.frag
+++ b/examples/bullet-physics/shaders/rendering-textured-shape.frag
@@ -1,7 +1,14 @@
-uniform sampler2D uTexture;
-uniform mediump float uBrightness;
-varying mediump vec2 vTexCoord;
-varying mediump vec3 vIllumination;
+//@version 100
+
+UNIFORM sampler2D uTexture;
+
+UNIFORM_BLOCK VanFrag
+{
+UNIFORM mediump float uBrightness;
+};
+
+INPUT mediump vec2 vTexCoord;
+INPUT mediump vec3 vIllumination;
 
 mediump vec3 redistribute_rgb(mediump vec3 color)
 {
@@ -23,7 +30,7 @@ mediump vec3 redistribute_rgb(mediump vec3 color)
 
 void main()
 {
-  mediump vec4 texColor = texture2D( uTexture, vTexCoord );
+  mediump vec4 texColor = TEXTURE( uTexture, vTexCoord );
   //mediump vec4 texColor = vec4(0.5,0.5,0.5,1.0);
   //gl_FragColor = vec4(texColor.rgb, 1.0);