diff options
| author | Dave Parks <davep@lindenlab.com> | 2023-03-13 10:45:53 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2023-03-13 10:45:53 -0500 |
| commit | 88d3cc680dd10fcb0397b366e73899c6e414ad5c (patch) | |
| tree | 144505bcda1eebf124f95044f568bcbd38f96361 /indra/newview/app_settings/shaders/class1/deferred/cofF.glsl | |
| parent | 14293833c9c54411633b4851174e12eea51c2b0c (diff) | |
| parent | 75dea34e3f80b054c56c38c880166d5e610eef88 (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred/cofF.glsl')
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/deferred/cofF.glsl | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/cofF.glsl b/indra/newview/app_settings/shaders/class1/deferred/cofF.glsl index 1e640d95ae..929b4e17b1 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/cofF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/cofF.glsl @@ -35,7 +35,6 @@ out vec4 frag_color; uniform sampler2D diffuseRect; uniform sampler2D depthMap; -uniform sampler2D bloomMap; uniform float depth_cutoff; uniform float norm_cutoff; @@ -81,7 +80,6 @@ void main() sc = min(sc, max_cof); sc = max(sc, -max_cof); - vec4 bloom = texture2D(bloomMap, vary_fragcoord.xy); - frag_color.rgb = diff.rgb + bloom.rgb; + frag_color.rgb = diff.rgb; frag_color.a = sc/max_cof*0.5+0.5; } |