From 23365ca51aef2447efa07b0097a421ff864feec1 Mon Sep 17 00:00:00 2001 From: "Jonathan \"Geenz\" Goodman" Date: Wed, 12 Apr 2023 16:58:15 -0700 Subject: Fix for nameplates, HUD text generally. DRTVWR-559 SL-19524 SL-19513 --- .../app_settings/shaders/class1/deferred/postDeferredNoDoFF.glsl | 3 +++ indra/newview/app_settings/shaders/class1/interface/glowcombineF.glsl | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/app_settings/shaders/class1') diff --git a/indra/newview/app_settings/shaders/class1/deferred/postDeferredNoDoFF.glsl b/indra/newview/app_settings/shaders/class1/deferred/postDeferredNoDoFF.glsl index 1b868aee8d..004190dbd9 100644 --- a/indra/newview/app_settings/shaders/class1/deferred/postDeferredNoDoFF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/postDeferredNoDoFF.glsl @@ -34,6 +34,7 @@ out vec4 frag_color; #endif uniform sampler2D diffuseRect; +uniform sampler2D depthMap; uniform vec2 screen_res; VARYING vec2 vary_fragcoord; @@ -43,5 +44,7 @@ void main() vec4 diff = texture2D(diffuseRect, vary_fragcoord.xy); frag_color = diff; + + gl_FragDepth = texture(depthMap, vary_fragcoord.xy).r; } diff --git a/indra/newview/app_settings/shaders/class1/interface/glowcombineF.glsl b/indra/newview/app_settings/shaders/class1/interface/glowcombineF.glsl index 3b25a5df16..e578bb6fc5 100644 --- a/indra/newview/app_settings/shaders/class1/interface/glowcombineF.glsl +++ b/indra/newview/app_settings/shaders/class1/interface/glowcombineF.glsl @@ -30,7 +30,6 @@ out vec4 frag_color; uniform sampler2D diffuseRect; -uniform sampler2D depthMap; uniform sampler2D emissiveRect; in vec2 tc; @@ -38,6 +37,4 @@ in vec2 tc; void main() { frag_color = texture2D(diffuseRect, tc) + texture2D(emissiveRect, tc); - - gl_FragDepth = texture(depthMap, tc).r; } -- cgit v1.2.3