diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-09-16 17:08:39 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-09-16 17:08:39 -0500 |
| commit | 8a1baaea6c0462b645499e8e7b88345e46b92621 (patch) | |
| tree | 565537e0a9c3bf0c9d982e8da90dc420a5844b04 /indra/newview/app_settings/shaders/class1/effects | |
| parent | da84f5552731e1ece3a463c4c385bb327f1048a1 (diff) | |
SH-2243 work in progress -- don't use gl_FragColor or gl_FragData for outputs -- no more deprecation warnings on nvidia
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/effects')
3 files changed, 11 insertions, 5 deletions
diff --git a/indra/newview/app_settings/shaders/class1/effects/glowExtractF.glsl b/indra/newview/app_settings/shaders/class1/effects/glowExtractF.glsl index a34e76d25a..b2d3a135ba 100644 --- a/indra/newview/app_settings/shaders/class1/effects/glowExtractF.glsl +++ b/indra/newview/app_settings/shaders/class1/effects/glowExtractF.glsl @@ -23,10 +23,12 @@ * $/LicenseInfo$ */ - - #extension GL_ARB_texture_rectangle : enable +#ifndef gl_FragColor +out vec4 gl_FragColor; +#endif + uniform sampler2DRect diffuseMap; uniform float minLuminance; uniform float maxExtractAlpha; diff --git a/indra/newview/app_settings/shaders/class1/effects/glowExtractMSF.glsl b/indra/newview/app_settings/shaders/class1/effects/glowExtractMSF.glsl index cbf4dc4bea..18b6e503e1 100644 --- a/indra/newview/app_settings/shaders/class1/effects/glowExtractMSF.glsl +++ b/indra/newview/app_settings/shaders/class1/effects/glowExtractMSF.glsl @@ -23,11 +23,13 @@ * $/LicenseInfo$ */ - - #extension GL_ARB_texture_rectangle : enable #extension GL_ARB_texture_multisample : enable +#ifndef gl_FragColor +out vec4 gl_FragColor; +#endif + uniform sampler2DMS diffuseMap; uniform float minLuminance; uniform float maxExtractAlpha; diff --git a/indra/newview/app_settings/shaders/class1/effects/glowF.glsl b/indra/newview/app_settings/shaders/class1/effects/glowF.glsl index 3d17a20fbb..8e83e53b78 100644 --- a/indra/newview/app_settings/shaders/class1/effects/glowF.glsl +++ b/indra/newview/app_settings/shaders/class1/effects/glowF.glsl @@ -23,7 +23,9 @@ * $/LicenseInfo$ */ - +#ifndef gl_FragColor +out vec4 gl_FragColor; +#endif uniform sampler2D diffuseMap; uniform float glowStrength; |