Fix GLES2 automatic texture lookup in canvas

After this change the color will only be fetched if the shader code doesn't use it explicitly, to match the GLES3 behaviour.

Fixes #23179.
This commit is contained in:
Pedro J. Estébanez 2018-10-28 02:37:34 +01:00
parent aeddb30fa3
commit 11815a23dc

View File

@ -148,7 +148,10 @@ void main() {
vec4 color = color_interp;
#if !defined(COLOR_USED)
//default behavior, texture by color
color *= texture2D(color_texture, uv_interp);
#endif
#ifdef SCREEN_UV_USED
vec2 screen_uv = gl_FragCoord.xy * screen_pixel_size;