diff options
author | Oz Linden <oz@lindenlab.com> | 2013-06-03 18:06:45 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-06-03 18:06:45 -0400 |
commit | 9acabccdde5cff91cac3bae0502c8ff5b26cada6 (patch) | |
tree | b6fc95044fc41cdc43969195f9c1939e8ecb0158 /indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl | |
parent | dd2ede9991a9a31821fbe43a7fa17a5aafa19542 (diff) | |
parent | 7fa8c2313b47959ba8c0a40d92461f6892e0d0d3 (diff) |
merge changes for 3.6.0-materials-beta1
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl')
-rwxr-xr-x | indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl b/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl index 975180606a..5c164f7759 100755 --- a/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl @@ -31,6 +31,10 @@ out vec4 frag_color; #define frag_color gl_FragColor #endif +#if !HAS_DIFFUSE_LOOKUP +uniform sampler2D diffuseMap; +#endif + VARYING vec4 vertex_color; VARYING vec2 vary_texcoord0; @@ -40,9 +44,12 @@ vec3 fullbrightScaleSoftClip(vec3 light); void main() { - float shadow = 1.0; - +#if HAS_DIFFUSE_LOOKUP vec4 color = diffuseLookup(vary_texcoord0.xy)*vertex_color; +#else + vec4 color = texture2D(diffuseMap, vary_texcoord0.xy)*vertex_color; +#endif + color.rgb = pow(color.rgb,vec3(2.2f,2.2f,2.2f)); color.rgb = fullbrightAtmosTransport(color.rgb); |