瀏覽代碼

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.
Pedro J. Estébanez 6 年之前
父節點
當前提交
11815a23dc
共有 1 個文件被更改,包括 3 次插入0 次删除
  1. 3 0
      drivers/gles2/shaders/canvas.glsl

+ 3 - 0
drivers/gles2/shaders/canvas.glsl

@@ -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;