Merge remote-tracking branch 'upstream/master' into Visuals-Vol-2

client/shaders/cloud_shader/opengl_vertex.glsl

@@ -8,11 +8,7 @@ void main(void)
 {
 	gl_Position = mWorldViewProj * inVertexPosition;
 
-#ifdef GL_ES
-	vec4 color = inVertexColor.bgra;
-#else
 	vec4 color = inVertexColor;
-#endif
 
 	color *= materialColor;
 	varColor = color;

client/shaders/default_shader/opengl_vertex.glsl

@@ -3,9 +3,5 @@ varying lowp vec4 varColor;
 void main(void)
 {
 	gl_Position = mWorldViewProj * inVertexPosition;
-#ifdef GL_ES
-	varColor = inVertexColor.bgra;
-#else
 	varColor = inVertexColor;
-#endif
 }

client/shaders/minimap_shader/opengl_vertex.glsl

@@ -7,9 +7,5 @@ void main(void)
 {
 	varTexCoord = inTexCoord0.st;
 	gl_Position = mWorldViewProj * inVertexPosition;
-#ifdef GL_ES
-	varColor = inVertexColor.bgra;
-#else
 	varColor = inVertexColor;
-#endif
 }

client/shaders/nodes_shader/opengl_vertex.glsl

@@ -211,15 +211,11 @@ void main(void)
 	vNormal = inVertexNormal;
 
 	// Calculate color.
+	vec4 color = inVertexColor;
 	// Red, green and blue components are pre-multiplied with
 	// 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.
-#ifdef GL_ES
-	vec4 color = inVertexColor.bgra;
-#else
-	vec4 color = inVertexColor;
-#endif
 	// The alpha gives the ratio of sunlight in the incoming light.
 	nightRatio = 1.0 - color.a;
 	color.rgb = color.rgb * (color.a * dayLight.rgb +

client/shaders/object_shader/opengl_vertex.glsl

@@ -124,11 +124,7 @@ void main(void)
 		: directional_ambient(normalize(inVertexNormal));
 #endif
 
-#ifdef GL_ES
-	vec4 color = inVertexColor.bgra;
-#else
 	vec4 color = inVertexColor;
-#endif
 
 	color *= materialColor;
 

client/shaders/selection_shader/opengl_vertex.glsl

@@ -6,9 +6,5 @@ void main(void)
 	varTexCoord = inTexCoord0.st;
 	gl_Position = mWorldViewProj * inVertexPosition;
 
-#ifdef GL_ES
-	varColor = inVertexColor.bgra;
-#else
 	varColor = inVertexColor;
-#endif
 }