Fix swapped vertex colors on GLES2

diff --git a/client/shaders/default_shader/opengl_vertex.glsl b/client/shaders/default_shader/opengl_vertex.glsl
index d95a3c2d30e77ec0a3fe2a967ff451402952e84f..a908ac953fb3137f152131559af32bdf49f7ea1a 100644 (file)
--- 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
index 1a9491805efd1feeafacad943ec0c38acfdcf7e7..b23d271814a117fdb305c463dcd9b8be54ccb0a1 100644 (file)
--- 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
index c68df4a8ec2a2c9caa80384c4285ecffa51d081e..1a4840d35850668e3cb87a16590cca0e1990427d 100644 (file)
--- 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
index b4a4d0aaa18d919ca309dca3a0203911b3bd67b3..f26224e82b6fc9ca1141c70a715d3204a26e1670 100644 (file)
--- 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
index 9ca87a9cfb32e9f956ef180c5d476c849ea2660b..39dde3056e959846e0ecceba5e438adc863ebc16 100644 (file)
--- 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
 }