diff options
| author | Rye <rye@lindenlab.com> | 2024-11-06 10:27:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-06 10:27:52 -0500 |
| commit | 6b448af1bbb80ee663d9cb9587b529a7e777074a (patch) | |
| tree | bb53703849b63bbd8a7a576fa9e986cf366551d3 | |
| parent | 15d4bb6353070ecaf3102363ba83b40c015dd9be (diff) | |
| parent | a783759c11fd1c5ef660fda4a867875fe9fafeb8 (diff) | |
Merge pull request #3027 from secondlife/rye/macshaderfix
Fix accidental deprecation in shaders causing mac shader compile fail
3 files changed, 3 insertions, 3 deletions
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))); } |