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/lightFullbrightF.glsl | |
parent | 20100ba38c6d3fa16ab11be2ed326ab0964c4c21 (diff) | |
parent | ede3b577d8cebd5065514bb485e2cbd93dd5b05a (diff) |
Merge
Diffstat (limited to 'indra/newview/app_settings/shaders/class2/lighting/lightFullbrightF.glsl')
-rw-r--r-- | indra/newview/app_settings/shaders/class2/lighting/lightFullbrightF.glsl | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/app_settings/shaders/class2/lighting/lightFullbrightF.glsl b/indra/newview/app_settings/shaders/class2/lighting/lightFullbrightF.glsl index dad18b5883..95bd052b5d 100644 --- a/indra/newview/app_settings/shaders/class2/lighting/lightFullbrightF.glsl +++ b/indra/newview/app_settings/shaders/class2/lighting/lightFullbrightF.glsl @@ -5,16 +5,14 @@ * $/LicenseInfo$ */ -#version 120 -uniform sampler2D diffuseMap; vec3 fullbrightAtmosTransport(vec3 light); vec3 fullbrightScaleSoftClip(vec3 light); void fullbright_lighting() { - vec4 color = texture2D(diffuseMap, gl_TexCoord[0].xy) * gl_Color; + vec4 color = diffuseLookup(gl_TexCoord[0].xy) * gl_Color; color.rgb = fullbrightAtmosTransport(color.rgb); |