Skip to content

Commit a783759

Browse files
author
Rye
committed
Fix accidental deprecation in shaders causing mac shader compile fail
1 parent ef4b74e commit a783759

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

indra/newview/app_settings/shaders/class1/deferred/SMAANeighborhoodBlendF.glsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ void main()
6262
#endif
6363
);
6464
#ifndef NO_GLOW
65-
diff.rgb += texture2D(emissiveRect, vary_texcoord0).rgb;
65+
diff.rgb += texture(emissiveRect, vary_texcoord0).rgb;
6666
#endif
6767
frag_color = diff;
6868

indra/newview/app_settings/shaders/class1/deferred/cofF.glsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ void main()
7373
sc = min(sc, max_cof);
7474
sc = max(sc, -max_cof);
7575

76-
vec4 bloom = texture2D(emissiveRect, tc);
76+
vec4 bloom = texture(emissiveRect, tc);
7777
frag_color.rgb = diff.rgb + bloom.rgb;
7878
frag_color.a = sc/max_cof*0.5+0.5;
7979
}

indra/newview/app_settings/shaders/class1/interface/glowcombineFXAAF.glsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ void main()
3838
{
3939
vec3 col = texture(diffuseRect, vary_tc).rgb;
4040
#ifndef NO_GLOW
41-
col += texture2D(emissiveRect, vary_tc).rgb;
41+
col += texture(emissiveRect, vary_tc).rgb;
4242
#endif
4343
frag_color = vec4(col, dot(col, vec3(0.299, 0.587, 0.144)));
4444
}

0 commit comments

Comments
 (0)