summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders/class1/interface/glowcombineFXAAF.glsl
diff options
context:
space:
mode:
authorJonathan "Geenz" Goodman <geenz@geenzo.com>2023-03-31 10:54:19 -0700
committerJonathan "Geenz" Goodman <geenz@geenzo.com>2023-03-31 10:54:19 -0700
commitb44ad50f75724a5d9e53bd52d2724111568caf24 (patch)
treec1f93e169fadbffd7f2b7158dc39f60e4d29b2a8 /indra/newview/app_settings/shaders/class1/interface/glowcombineFXAAF.glsl
parentb130831106d058f0be5414a9a3bcaa99636c7bc0 (diff)
Move glow extract to be after tonemapping.
SL-19513
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/interface/glowcombineFXAAF.glsl')
-rw-r--r--indra/newview/app_settings/shaders/class1/interface/glowcombineFXAAF.glsl3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/app_settings/shaders/class1/interface/glowcombineFXAAF.glsl b/indra/newview/app_settings/shaders/class1/interface/glowcombineFXAAF.glsl
index c50548d528..6cc83138a2 100644
--- a/indra/newview/app_settings/shaders/class1/interface/glowcombineFXAAF.glsl
+++ b/indra/newview/app_settings/shaders/class1/interface/glowcombineFXAAF.glsl
@@ -30,6 +30,7 @@
out vec4 frag_color;
uniform sampler2D diffuseRect;
+uniform sampler2D emissiveRect;
uniform vec2 screen_res;
@@ -37,7 +38,7 @@ in vec2 vary_tc;
void main()
{
- vec3 col = texture(diffuseRect, vary_tc).rgb;
+ vec3 col = texture(diffuseRect, vary_tc).rgb + texture(emissiveRect, vary_tc).rgb;
frag_color = vec4(col.rgb, dot(col.rgb, vec3(0.299, 0.587, 0.144)));
}