1 files changed, 23 insertions, 0 deletions
diff --git a/indra/newview/app_settings/shaders/class1/effects/bloomCombineF.glsl b/indra/newview/app_settings/shaders/class1/effects/bloomCombineF.glsl
new file mode 100644
index 0000000000..31a6e10fa4
--- /dev/null
+++ b/indra/newview/app_settings/shaders/class1/effects/bloomCombineF.glsl
@@ -0,0 +1,23 @@
+out vec4 frag_color;
+
+in vec2 vary_texcoord0;
+
+uniform sampler2D diffuseMap;
+uniform sampler2D bloomBlurredMap;
+
+uniform float bloomStrength;
+
+void main()
+{
+    vec4 hdrColor = texture(diffuseMap, vary_texcoord0);
+    vec3 bloomColor = texture(bloomBlurredMap, vary_texcoord0).rgb;
+    vec4 result = vec4(0.0);
+
+    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;
+
+    //bloomColor += hdrColor.rgb;
+    frag_color = result;
+}
+\ No newline at end of file