summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders/class3
diff options
context:
space:
mode:
authorJonathan "Geenz" Goodman <geenz@geenzo.com>2023-06-15 09:31:43 -0700
committerJonathan "Geenz" Goodman <geenz@geenzo.com>2023-06-15 09:31:43 -0700
commit07aed1e18646fa788ad79320aaa3e2ff3c7a3f60 (patch)
treeefa26f27eac0b6d1a83a9e25a5396efa7cb0e637 /indra/newview/app_settings/shaders/class3
parent5dedf6d75389772b88c140695ac421699b24fd81 (diff)
parent3305fbe1cf5fe3faa6dc5479aa29e6c891ee943f (diff)
Merge branch 'DRTVWR-559' into DRTVWR-583-glossy-ssr
Diffstat (limited to 'indra/newview/app_settings/shaders/class3')
-rw-r--r--indra/newview/app_settings/shaders/class3/deferred/materialF.glsl3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class3/deferred/materialF.glsl b/indra/newview/app_settings/shaders/class3/deferred/materialF.glsl
index 815069bb6a..ac2e359769 100644
--- a/indra/newview/app_settings/shaders/class3/deferred/materialF.glsl
+++ b/indra/newview/app_settings/shaders/class3/deferred/materialF.glsl
@@ -429,13 +429,12 @@ void main()
LIGHT_LOOP(6)
LIGHT_LOOP(7)
- light *= 1.0-emissive;
color += light;
glare *= 1.0-emissive;
glare = min(glare, 1.0);
float al = max(diffcol.a, glare) * vertex_color.a;
-
+
frag_color = max(vec4(color, al), vec4(0));
#else // mode is not DIFFUSE_ALPHA_MODE_BLEND, encode to gbuffer