Peter M. Groen / dali-demo

Commit 7fe161e5ec204dfd3b01eee97635612cbd0f5afb

Authored by Umar
2 parents 19707a24 2cca7740

[dali_1.3.17] Merge branch 'devel/master' 

Change-Id: I92a7920b5b91cdc55970090f37430249007d8fac
Inline Side-by-side
Showing 2 changed files with 2 additions and 3 deletions
examples/styling/image-channel-control-impl.cpp
  View file @7fe161e
@@ -37,12 +37,11 @@ const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER( @@ -37,12 +37,11 @@ const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER(
37 uniform sampler2D sTexture;\n 37 uniform sampler2D sTexture;\n
38 uniform mediump vec4 uColor;\n 38 uniform mediump vec4 uColor;\n
39 uniform mediump vec3 mixColor;\n 39 uniform mediump vec3 mixColor;\n
40 - uniform mediump float opacity;\n  
41 uniform mediump vec3 uChannels;\n 40 uniform mediump vec3 uChannels;\n
42 \n 41 \n
43 void main()\n 42 void main()\n
44 {\n 43 {\n
45 - gl_FragColor = texture2D( sTexture, vTexCoord ) * vec4(mixColor,opacity) * uColor * vec4(uChannels, 1.0) ;\n 44 + gl_FragColor = texture2D( sTexture, vTexCoord ) * vec4(mixColor,1.0) * uColor * vec4(uChannels, 1.0) ;\n
46 }\n 45 }\n
47 ); 46 );
48 47
packaging/com.samsung.dali-demo.spec
  View file @7fe161e
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 2
3 Name: com.samsung.dali-demo 3 Name: com.samsung.dali-demo
4 Summary: The OpenGLES Canvas Core Demo 4 Summary: The OpenGLES Canvas Core Demo
5 -Version: 1.3.16 5 +Version: 1.3.17
6 Release: 1 6 Release: 1
7 Group: System/Libraries 7 Group: System/Libraries
8 License: Apache-2.0 8 License: Apache-2.0