Merged in graham_linden/viewer-eep-graham (pull request #22)

Support blending current/next bloom textures in deferred star rendering.

1 files changed, 5 insertions, 1 deletions

diff --git a/indra/newview/app_settings/shaders/class1/deferred/starsF.glsl b/indra/newview/app_settings/shaders/class1/deferred/starsF.glsl
index 7f55d020d4..d6a1edbf42 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/starsF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/starsF.glsl
@@ -35,12 +35,16 @@ VARYING vec4 vertex_color;
 VARYING vec2 vary_texcoord0;
 
 uniform sampler2D diffuseMap;
+uniform sampler2D altDiffuseMap;
+uniform float blend_factor;
 uniform float custom_alpha;
 uniform vec4 sunlight_color;
 
 void main() 
 {
-	vec4 col = texture2D(diffuseMap, vary_texcoord0.xy);
+	vec4 col_a = texture2D(diffuseMap, vary_texcoord0.xy);
+	vec4 col_b = texture2D(diffuseMap, vary_texcoord0.xy);
+    vec4 col = mix(col_a, col_b, blend_factor);
     col.rgb *= vertex_color.rgb;
     col.a *= custom_alpha;
 	frag_color = col;