summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/shaders/class1/deferred/giF.glsl
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-09-16 17:08:39 -0500
committerDave Parks <davep@lindenlab.com>2011-09-16 17:08:39 -0500
commit8a1baaea6c0462b645499e8e7b88345e46b92621 (patch)
tree565537e0a9c3bf0c9d982e8da90dc420a5844b04 /indra/newview/app_settings/shaders/class1/deferred/giF.glsl
parentda84f5552731e1ece3a463c4c385bb327f1048a1 (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/deferred/giF.glsl')
-rw-r--r--indra/newview/app_settings/shaders/class1/deferred/giF.glsl8
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/giF.glsl b/indra/newview/app_settings/shaders/class1/deferred/giF.glsl
index 72c5a93087..55b816041b 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/giF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/giF.glsl
@@ -23,10 +23,12 @@
* $/LicenseInfo$
*/
-
-
#extension GL_ARB_texture_rectangle : enable
+#ifndef gl_FragColor
+out vec4 gl_FragColor;
+#endif
+
uniform sampler2DRect depthMap;
uniform sampler2DRect normalMap;
uniform sampler2D noiseMap;
@@ -182,5 +184,5 @@ void main()
vec3 norm = texture2DRect(normalMap, pos_screen).xyz;
norm = vec3((norm.xy-0.5)*2.0,norm.z); // unpack norm
- gl_FragData[0].xyz = giAmbient(pos, norm);
+ gl_FragColor.xyz = giAmbient(pos, norm);
}