From e5d71560e86a0e3cd352c8a85c94feed237e4cba Mon Sep 17 00:00:00 2001 From: Shyotl Date: Sat, 2 Nov 2013 02:38:23 -0500 Subject: [PATCH] Fix fullbright stuff in deferred. Have to re-assess old glow occlusion bugfixes. --- .../app_settings/shaders/class1/deferred/fullbrightF.glsl | 8 ++++---- .../shaders/class1/deferred/fullbrightShinyF.glsl | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl index 41cee1db0..f22b16965 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl @@ -166,12 +166,12 @@ void main() vec3 pos = vary_position; vec4 fogged = applyWaterFogDeferred(pos, vec4(color.rgb, final_alpha)); color.rgb = fogged.rgb; - //color.a = fogged.a; + color.a = fogged.a; #else - //color.a = final_alpha; + color.a = final_alpha; #endif - color.a = .0; - frag_color = color; + frag_color.rgb = color.rgb; + frag_color.a = color.a; } diff --git a/indra/newview/app_settings/shaders/class1/deferred/fullbrightShinyF.glsl b/indra/newview/app_settings/shaders/class1/deferred/fullbrightShinyF.glsl index edc6ff049..b0db9876d 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/fullbrightShinyF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/fullbrightShinyF.glsl @@ -63,7 +63,7 @@ void main() color.rgb = fullbrightShinyAtmosTransport(color.rgb); color.rgb = fullbrightScaleSoftClip(color.rgb); - color.a = 0.0; + color.a = 1.0; color.rgb = pow(color.rgb, vec3(1.0/2.2));