diff options
author | Logan Dethrow <log@lindenlab.com> | 2011-06-21 18:29:50 -0400 |
---|---|---|
committer | Logan Dethrow <log@lindenlab.com> | 2011-06-21 18:29:50 -0400 |
commit | d5ea63119d1cc848318dbeeaa42e9ce3b777ee51 (patch) | |
tree | 4b5403406184c8e7635ccb989a2dfceb46f95693 /indra/newview/app_settings/shaders/class2/lighting/lightFullbrightShinyWaterF.glsl | |
parent | 20100ba38c6d3fa16ab11be2ed326ab0964c4c21 (diff) | |
parent | ede3b577d8cebd5065514bb485e2cbd93dd5b05a (diff) |
Merge
Diffstat (limited to 'indra/newview/app_settings/shaders/class2/lighting/lightFullbrightShinyWaterF.glsl')
-rw-r--r-- | indra/newview/app_settings/shaders/class2/lighting/lightFullbrightShinyWaterF.glsl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/app_settings/shaders/class2/lighting/lightFullbrightShinyWaterF.glsl b/indra/newview/app_settings/shaders/class2/lighting/lightFullbrightShinyWaterF.glsl index 9b4b584369..a6e10a249d 100644 --- a/indra/newview/app_settings/shaders/class2/lighting/lightFullbrightShinyWaterF.glsl +++ b/indra/newview/app_settings/shaders/class2/lighting/lightFullbrightShinyWaterF.glsl @@ -5,9 +5,9 @@ * $License$ */ -#version 120 -uniform sampler2D diffuseMap; + + uniform samplerCube environmentMap; vec3 fullbrightShinyAtmosTransport(vec3 light); @@ -16,7 +16,7 @@ vec4 applyWaterFog(vec4 color); void fullbright_shiny_lighting_water() { - vec4 color = texture2D(diffuseMap, gl_TexCoord[0].xy); + vec4 color = diffuseLookup(gl_TexCoord[0].xy); color.rgb *= gl_Color.rgb; vec3 envColor = textureCube(environmentMap, gl_TexCoord[1].xyz).rgb; |