Merge remote-tracking branch 'mobserveur/experimental2'

1 files changed, 5 insertions, 7 deletions

diff --git a/indra/newview/app_settings/shaders/class1/effects/bloomCombineF.glsl b/indra/newview/app_settings/shaders/class1/effects/bloomCombineF.glsl
index 31a6e10fa4..40cfdd6bff 100644
--- a/indra/newview/app_settings/shaders/class1/effects/bloomCombineF.glsl
+++ b/indra/newview/app_settings/shaders/class1/effects/bloomCombineF.glsl
@@ -6,18 +6,16 @@ uniform sampler2D diffuseMap;
 uniform sampler2D bloomBlurredMap;
 
 uniform float bloomStrength;
+uniform float bloomClampValue;
 
 void main()
 {
     vec4 hdrColor = texture(diffuseMap, vary_texcoord0);
-    vec3 bloomColor = texture(bloomBlurredMap, vary_texcoord0).rgb;
-    vec4 result = vec4(0.0);
+    vec4 bloomColor = texture(bloomBlurredMap, vary_texcoord0);
+    vec4 result = hdrColor;
 
-    result.r = min(hdrColor.r + bloomStrength * bloomColor.r, 1.0);
-    result.g = min(hdrColor.g + bloomStrength * bloomColor.g, 1.0);
-    result.b = min(hdrColor.b + bloomStrength * bloomColor.b, 1.0);
-    result.a = hdrColor.a;
+    result.rgb += bloomStrength * bloomColor.rgb;
+    result.rgb = clamp(result.rgb, vec3(0.0), vec3(bloomClampValue));
 
-    //bloomColor += hdrColor.rgb;
     frag_color = result;
 }
\ No newline at end of file