Fix swapped vertex colors on GLES2

sfan5 · sfan5 · commit 69c70dd31953 · 2021-05-11T21:15:39.000+02:00
diff --git a/client/shaders/default_shader/opengl_vertex.glsl b/client/shaders/default_shader/opengl_vertex.glsl
@@ -3,5 +3,9 @@ varying lowp vec4 varColor;
 void main(void)
 {
 	gl_Position = mWorldViewProj * inVertexPosition;
+#ifdef GL_ES
+	varColor = inVertexColor.bgra;
+#else
 	varColor = inVertexColor;
+#endif
 }
diff --git a/client/shaders/minimap_shader/opengl_vertex.glsl b/client/shaders/minimap_shader/opengl_vertex.glsl
@@ -7,5 +7,9 @@ void main(void)
 {
 	varTexCoord = inTexCoord0.st;
 	gl_Position = mWorldViewProj * inVertexPosition;
+#ifdef GL_ES
+	varColor = inVertexColor.bgra;
+#else
 	varColor = inVertexColor;
+#endif
 }
diff --git a/client/shaders/nodes_shader/opengl_vertex.glsl b/client/shaders/nodes_shader/opengl_vertex.glsl
@@ -146,10 +146,14 @@ void main(void)
 	// the brightness, so now we have to multiply these
 	// colors with the color of the incoming light.
 	// The pre-baked colors are halved to prevent overflow.
-	vec4 color;
+#ifdef GL_ES
+	vec4 color = inVertexColor.bgra;
+#else
+	vec4 color = inVertexColor;
+#endif
 	// The alpha gives the ratio of sunlight in the incoming light.
-	float nightRatio = 1.0 - inVertexColor.a;
-	color.rgb = inVertexColor.rgb * (inVertexColor.a * dayLight.rgb +
+	float nightRatio = 1.0 - color.a;
+	color.rgb = color.rgb * (color.a * dayLight.rgb +
 		nightRatio * artificialLight.rgb) * 2.0;
 	color.a = 1.0;
 
diff --git a/client/shaders/object_shader/opengl_vertex.glsl b/client/shaders/object_shader/opengl_vertex.glsl
@@ -49,5 +49,9 @@ void main(void)
 		: directional_ambient(normalize(inVertexNormal));
 #endif
 
+#ifdef GL_ES
+	varColor = inVertexColor.bgra;
+#else
 	varColor = inVertexColor;
+#endif
 }
diff --git a/client/shaders/selection_shader/opengl_vertex.glsl b/client/shaders/selection_shader/opengl_vertex.glsl
@@ -6,5 +6,9 @@ void main(void)
 	varTexCoord = inTexCoord0.st;
 	gl_Position = mWorldViewProj * inVertexPosition;
 
+#ifdef GL_ES
+	varColor = inVertexColor.bgra;
+#else
 	varColor = inVertexColor;
+#endif
 }

Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,9 @@ varying lowp vec4 varColor;`
`3`	`3`	`void main(void)`
`4`	`4`	`{`
`5`	`5`	`gl_Position = mWorldViewProj * inVertexPosition;`
	`6`	`+#ifdef GL_ES`
	`7`	`+ varColor = inVertexColor.bgra;`
	`8`	`+#else`
`6`	`9`	`varColor = inVertexColor;`
	`10`	`+#endif`
`7`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,9 @@ void main(void)`
`7`	`7`	`{`
`8`	`8`	`varTexCoord = inTexCoord0.st;`
`9`	`9`	`gl_Position = mWorldViewProj * inVertexPosition;`
	`10`	`+#ifdef GL_ES`
	`11`	`+ varColor = inVertexColor.bgra;`
	`12`	`+#else`
`10`	`13`	`varColor = inVertexColor;`
	`14`	`+#endif`
`11`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,5 +49,9 @@ void main(void)`
`49`	`49`	`: directional_ambient(normalize(inVertexNormal));`
`50`	`50`	`#endif`
`51`	`51`
	`52`	`+#ifdef GL_ES`
	`53`	`+ varColor = inVertexColor.bgra;`
	`54`	`+#else`
`52`	`55`	`varColor = inVertexColor;`
	`56`	`+#endif`
`53`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,9 @@ void main(void)`
`6`	`6`	`varTexCoord = inTexCoord0.st;`
`7`	`7`	`gl_Position = mWorldViewProj * inVertexPosition;`
`8`	`8`
	`9`	`+#ifdef GL_ES`
	`10`	`+ varColor = inVertexColor.bgra;`
	`11`	`+#else`
`9`	`12`	`varColor = inVertexColor;`
	`13`	`+#endif`
`10`	`14`	`}`