Commit 7fe161e5ec204dfd3b01eee97635612cbd0f5afb
[dali_1.3.17] Merge branch 'devel/master'
Change-Id: I92a7920b5b91cdc55970090f37430249007d8fac
Showing
2 changed files
with
2 additions
and
3 deletions
examples/styling/image-channel-control-impl.cpp
| ... | ... | @@ -37,12 +37,11 @@ const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER( |
| 37 | 37 | uniform sampler2D sTexture;\n |
| 38 | 38 | uniform mediump vec4 uColor;\n |
| 39 | 39 | uniform mediump vec3 mixColor;\n |
| 40 | - uniform mediump float opacity;\n | |
| 41 | 40 | uniform mediump vec3 uChannels;\n |
| 42 | 41 | \n |
| 43 | 42 | void main()\n |
| 44 | 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 | 45 | }\n |
| 47 | 46 | ); |
| 48 | 47 | ... | ... |