From a783759c11fd1c5ef660fda4a867875fe9fafeb8 Mon Sep 17 00:00:00 2001
From: Rye <rye@lindenlab.com>
Date: Tue, 5 Nov 2024 23:00:17 -0500
Subject: Fix accidental deprecation in shaders causing mac shader compile fail
---
.../app_settings/shaders/class1/deferred/SMAANeighborhoodBlendF.glsl | 2 +-
indra/newview/app_settings/shaders/class1/deferred/cofF.glsl | 2 +-
.../newview/app_settings/shaders/class1/interface/glowcombineFXAAF.glsl | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
(limited to 'indra/newview')
diff --git a/indra/newview/app_settings/shaders/class1/deferred/SMAANeighborhoodBlendF.glsl b/indra/newview/app_settings/shaders/class1/deferred/SMAANeighborhoodBlendF.glsl
index 08052a9ddf..6b8e7b1ffe 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/SMAANeighborhoodBlendF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/SMAANeighborhoodBlendF.glsl
@@ -62,7 +62,7 @@ void main()
#endif
);
#ifndef NO_GLOW
- diff.rgb += texture2D(emissiveRect, vary_texcoord0).rgb;
+ diff.rgb += texture(emissiveRect, vary_texcoord0).rgb;
#endif
frag_color = diff;
diff --git a/indra/newview/app_settings/shaders/class1/deferred/cofF.glsl b/indra/newview/app_settings/shaders/class1/deferred/cofF.glsl
index 36611db2fb..7b196f7da8 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/cofF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/cofF.glsl
@@ -73,7 +73,7 @@ void main()
sc = min(sc, max_cof);
sc = max(sc, -max_cof);
- vec4 bloom = texture2D(emissiveRect, tc);
+ vec4 bloom = texture(emissiveRect, tc);
frag_color.rgb = diff.rgb + bloom.rgb;
frag_color.a = sc/max_cof*0.5+0.5;
}
diff --git a/indra/newview/app_settings/shaders/class1/interface/glowcombineFXAAF.glsl b/indra/newview/app_settings/shaders/class1/interface/glowcombineFXAAF.glsl
index 8a8de88182..a0d11bb026 100644
--- a/indra/newview/app_settings/shaders/class1/interface/glowcombineFXAAF.glsl
+++ b/indra/newview/app_settings/shaders/class1/interface/glowcombineFXAAF.glsl
@@ -38,7 +38,7 @@ void main()
{
vec3 col = texture(diffuseRect, vary_tc).rgb;
#ifndef NO_GLOW
- col += texture2D(emissiveRect, vary_tc).rgb;
+ col += texture(emissiveRect, vary_tc).rgb;
#endif
frag_color = vec4(col, dot(col, vec3(0.299, 0.587, 0.144)));
}
--
cgit v1.2.3