1 files changed, 36 insertions, 11 deletions

diff --git a/drivers/gles2/shaders/canvas.glsl b/drivers/gles2/shaders/canvas.glsl
index 29d81bb2c4..79d4eb2243 100644
--- a/drivers/gles2/shaders/canvas.glsl
+++ b/drivers/gles2/shaders/canvas.glsl
@@ -1,3 +1,4 @@
+/* clang-format off */
 [vertex]
 
 #ifdef USE_GLES_OVER_GL
@@ -9,6 +10,7 @@ precision mediump int;
 #endif
 
 uniform highp mat4 projection_matrix;
+/* clang-format on */
 uniform highp mat4 modelview_matrix;
 uniform highp mat4 extra_matrix;
 attribute highp vec2 vertex; // attrib:0
@@ -29,8 +31,12 @@ uniform vec4 src_rect;
 
 uniform highp float time;
 
+/* clang-format off */
+
 VERTEX_SHADER_GLOBALS
 
+/* clang-format on */
+
 vec2 select(vec2 a, vec2 b, bvec2 c) {
 	vec2 ret;
 
@@ -74,18 +80,30 @@ void main() {
 
 #endif
 
-{
-        vec2 src_vtx=outvec.xy;
+	{
+		vec2 src_vtx = outvec.xy;
+		/* clang-format off */
+
 VERTEX_SHADER_CODE
 
-}
+		/* clang-format on */
+	}
+
+#if !defined(SKIP_TRANSFORM_USED)
+	outvec = extra_matrix * outvec;
+	outvec = modelview_matrix * outvec;
+#endif
 
 	color_interp = color;
 
-	gl_Position = projection_matrix * modelview_matrix * outvec;
+#ifdef USE_PIXEL_SNAP
+	outvec.xy = floor(outvec + 0.5).xy;
+#endif
 
+	gl_Position = projection_matrix * outvec;
 }
 
+/* clang-format off */
 [fragment]
 
 #ifdef USE_GLES_OVER_GL
@@ -96,9 +114,10 @@ precision mediump float;
 precision mediump int;
 #endif
 
-uniform sampler2D color_texture; // texunit:0
+uniform sampler2D color_texture; // texunit:-1
+/* clang-format on */
 uniform highp vec2 color_texpixel_size;
-uniform mediump sampler2D normal_texture; // texunit:1
+uniform mediump sampler2D normal_texture; // texunit:-2
 
 varying mediump vec2 uv_interp;
 varying mediump vec4 color_interp;
@@ -109,7 +128,7 @@ uniform vec4 final_modulate;
 
 #ifdef SCREEN_TEXTURE_USED
 
-uniform sampler2D screen_texture; // texunit:2
+uniform sampler2D screen_texture; // texunit:-3
 
 #endif
 
@@ -119,27 +138,33 @@ uniform vec2 screen_pixel_size;
 
 #endif
 
+/* clang-format off */
+
 FRAGMENT_SHADER_GLOBALS
 
+/* clang-format on */
 
 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;
 #endif
-{
+	{
+		/* clang-format off */
 
 FRAGMENT_SHADER_CODE
 
-
-}
+		/* clang-format on */
+	}
 
 	color *= final_modulate;
 
 	gl_FragColor = color;
-
 }