summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders/class2/deferred
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2018-06-11 11:45:11 -0700
committerRider Linden <rider@lindenlab.com>2018-06-11 11:45:11 -0700
commit0f608cb764856ae8586a9d9631842a782cb70a23 (patch)
tree97a12c3bfcc14ae73df00c68141e9519493a0619 /indra/newview/app_settings/shaders/class2/deferred
parent97da85de0b1e0f8c2fc60c156c31b237b869230a (diff)
parent4fbdfe637049e0a2e93c6fed030e61b32a43ae07 (diff)
Merge
Diffstat (limited to 'indra/newview/app_settings/shaders/class2/deferred')
-rw-r--r--indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
index 371b32406c..9f56bff4c2 100644
--- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
+++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl
@@ -105,7 +105,7 @@ vec4 getPosition(vec2 pos_screen)
#ifdef WATER_FOG
-vec4 applyWaterFogDeferred(vec3 pos, vec4 color);
+vec4 applyWaterFogView(vec3 pos, vec4 color);
#endif
void main()
@@ -198,7 +198,7 @@ void main()
}
#ifdef WATER_FOG
- vec4 fogged = applyWaterFogDeferred(pos,vec4(col, bloom));
+ vec4 fogged = applyWaterFogView(pos,vec4(col, bloom));
col = fogged.rgb;
bloom = fogged.a;
#endif