diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-07-21 08:15:21 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-07-21 08:15:21 -0700 |
| commit | 94abe75dea90ee91dd044161d8587279b0bfae13 (patch) | |
| tree | dd5a0c36a7c28f44bc6fd5ce2e0aec9c189a0a1d /indra/newview/app_settings/shaders/class2/deferred | |
| parent | 6c186b0c4137220697999c9ffc5e8a23058f5a4d (diff) | |
NORSPEC-315 NORSPEC-316 NORSPEC-312 fix various haze and gamma correction issues, alpha-blend objects still missing haze underwater
Diffstat (limited to 'indra/newview/app_settings/shaders/class2/deferred')
| -rwxr-xr-x | indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl index 9b72c5b57d..0c71b4f554 100755 --- a/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl +++ b/indra/newview/app_settings/shaders/class2/deferred/softenLightF.glsl @@ -455,23 +455,21 @@ void main() if (norm.w < 0.5) { col = mix(atmosLighting(col), fullbrightAtmosTransport(col), diffuse.a); - - #ifdef WATER_FOG - vec4 fogged = applyWaterFogDeferred(pos,vec4(col, bloom)); - col = fogged.rgb; - bloom = fogged.a; - #endif - col = mix(scaleSoftClip(col), fullbrightScaleSoftClip(col), diffuse.a); } + #ifdef WATER_FOG + vec4 fogged = applyWaterFogDeferred(pos,vec4(col, bloom)); + col = fogged.rgb; + bloom = fogged.a; + #endif + col = srgb_to_linear(col); //col = vec3(1,0,1); //col.g = envIntensity; } - + frag_color.rgb = col; frag_color.a = bloom; } - |