diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-06-21 11:47:58 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-06-21 11:47:58 -0400 |
| commit | fcf2ed5901699edfbc04d59d1a0517f19692df1a (patch) | |
| tree | 3960aa76222776cb2b2dcd12fe1872850fc59ad7 /indra/newview/app_settings/shaders/class2/lighting/lightFullbrightShinyF.glsl | |
| parent | 3595216efbeb0210f6c5777fd85a589bbbb08e4c (diff) | |
| parent | 4d77146b9016a4db37112e153e71c05c596f7fdc (diff) | |
merged .hgtags & BuildParams
Diffstat (limited to 'indra/newview/app_settings/shaders/class2/lighting/lightFullbrightShinyF.glsl')
| -rw-r--r-- | indra/newview/app_settings/shaders/class2/lighting/lightFullbrightShinyF.glsl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/app_settings/shaders/class2/lighting/lightFullbrightShinyF.glsl b/indra/newview/app_settings/shaders/class2/lighting/lightFullbrightShinyF.glsl index 73ff81e03a..26f0ea84e0 100644 --- a/indra/newview/app_settings/shaders/class2/lighting/lightFullbrightShinyF.glsl +++ b/indra/newview/app_settings/shaders/class2/lighting/lightFullbrightShinyF.glsl @@ -5,9 +5,8 @@ * $/LicenseInfo$ */ -#version 120 -uniform sampler2D diffuseMap; + uniform samplerCube environmentMap; vec3 fullbrightShinyAtmosTransport(vec3 light); @@ -15,7 +14,7 @@ vec3 fullbrightScaleSoftClip(vec3 light); void fullbright_shiny_lighting() { - 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; |