From a6e40e6e02600cb47299dc9903400720786f72f0 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Mon, 7 Nov 2011 12:34:05 -0600 Subject: SH-2652 Slightly slower DoF (quality), apply FXAA *after* DoF, fix for some render targets not getting allocated when needed. --- .../app_settings/shaders/class1/interface/glowcombineFXAAF.glsl | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'indra/newview/app_settings/shaders/class1/interface') diff --git a/indra/newview/app_settings/shaders/class1/interface/glowcombineFXAAF.glsl b/indra/newview/app_settings/shaders/class1/interface/glowcombineFXAAF.glsl index 7136d412ea..c66a6e5b48 100644 --- a/indra/newview/app_settings/shaders/class1/interface/glowcombineFXAAF.glsl +++ b/indra/newview/app_settings/shaders/class1/interface/glowcombineFXAAF.glsl @@ -29,17 +29,14 @@ out vec4 gl_FragColor; #endif -uniform sampler2D glowMap; -uniform sampler2DRect screenMap; +uniform sampler2DRect diffuseRect; uniform vec2 screen_res; VARYING vec2 vary_tc; void main() { - vec3 col = texture2D(glowMap, vary_tc).rgb + - texture2DRect(screenMap, vary_tc*screen_res).rgb; - + vec3 col = texture2DRect(diffuseRect, vary_tc*screen_res).rgb; gl_FragColor = vec4(col.rgb, dot(col.rgb, vec3(0.299, 0.587, 0.144))); } -- cgit v1.2.3