diff options
author | Dave Parks <davep@lindenlab.com> | 2011-09-26 19:27:10 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-09-26 19:27:10 -0500 |
commit | bd02cdc75f1c752a127d1303527be3a96479af93 (patch) | |
tree | d8503b7c296a4cd4f1aa2954c03ff250beda4254 /indra/newview/app_settings/shaders/class1/environment/underWaterF.glsl | |
parent | d475a96e94be90e68cf34bf6c25d8ab259aa47b5 (diff) | |
parent | 8dbfa022778f2a7fcd5d2b527045724551279412 (diff) |
merge
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/environment/underWaterF.glsl')
-rw-r--r-- | indra/newview/app_settings/shaders/class1/environment/underWaterF.glsl | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/app_settings/shaders/class1/environment/underWaterF.glsl b/indra/newview/app_settings/shaders/class1/environment/underWaterF.glsl index 72e8e739b3..2e138d35bf 100644 --- a/indra/newview/app_settings/shaders/class1/environment/underWaterF.glsl +++ b/indra/newview/app_settings/shaders/class1/environment/underWaterF.glsl @@ -23,7 +23,9 @@ * $/LicenseInfo$ */ - +#ifdef DEFINE_GL_FRAGCOLOR +out vec4 gl_FragColor; +#endif uniform sampler2D diffuseMap; uniform sampler2D bumpMap; @@ -33,9 +35,9 @@ uniform float refScale; uniform vec4 waterFogColor; //bigWave is (refCoord.w, view.w); -varying vec4 refCoord; -varying vec4 littleWave; -varying vec4 view; +VARYING vec4 refCoord; +VARYING vec4 littleWave; +VARYING vec4 view; void main() { |