MAINT-9064

Fix binding of current/next sun/moon textures.

Remove redundant code in GLSLShader determination of tex uniform bindings.

Unhack mix calls in sun/moon shaders to reverse sense of blending (was working around reversed bindings).

2 files changed, 2 insertions, 2 deletions

diff --git a/indra/newview/app_settings/shaders/class1/deferred/moonF.glsl b/indra/newview/app_settings/shaders/class1/deferred/moonF.glsl
index 2bfc4f3d2f..e86bca3ddd 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/moonF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/moonF.glsl
@@ -49,7 +49,7 @@ void main()
 {
 	vec4 moonA = texture2D(diffuseMap, vary_texcoord0.xy);
 	vec4 moonB = texture2D(altDiffuseMap, vary_texcoord0.xy);
-    vec4 c     = mix(moonB, moonA, blend_factor);
+    vec4 c     = mix(moonA, moonB, blend_factor);
 
 	c.rgb = pow(c.rgb, vec3(0.7f));
 	c.rgb = fullbrightAtmosTransport(c.rgb);
diff --git a/indra/newview/app_settings/shaders/class1/deferred/sunDiscF.glsl b/indra/newview/app_settings/shaders/class1/deferred/sunDiscF.glsl
index bbc5049f1c..3557c0766e 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/sunDiscF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/sunDiscF.glsl
@@ -45,7 +45,7 @@ void main()
 {
 	vec4 sunDiscA = texture2D(diffuseMap, vary_texcoord0.xy);
 	vec4 sunDiscB = texture2D(altDiffuseMap, vary_texcoord0.xy);
-    vec4 c     = mix(sunDiscB, sunDiscA, blend_factor);
+    vec4 c     = mix(sunDiscA, sunDiscB, blend_factor);
     c.rgb = clamp(c.rgb, vec3(0), vec3(1));
 	c.rgb = pow(c.rgb, vec3(0.7f));
 	c.rgb = fullbrightAtmosTransport(c.rgb);