diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2013-08-02 10:51:11 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2013-08-02 10:51:11 -0400 |
commit | acda43ed3881eeab60ee9edfdf76ac8eebd723cc (patch) | |
tree | f59c0d1a12f7a3b0dc14498a9a0f57e2a8f66ef5 /indra/newview/app_settings/shaders/class1/deferred/diffuseIndexedF.glsl | |
parent | 32a953f65eae51850bad1b2c4c2a63d3dff12a68 (diff) | |
parent | 0906d000b36d4da2116e0b9347a37598c918ce08 (diff) |
CHOP-959: merge --graphicslevel fix up to tip
Diffstat (limited to 'indra/newview/app_settings/shaders/class1/deferred/diffuseIndexedF.glsl')
-rwxr-xr-x | indra/newview/app_settings/shaders/class1/deferred/diffuseIndexedF.glsl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/diffuseIndexedF.glsl b/indra/newview/app_settings/shaders/class1/deferred/diffuseIndexedF.glsl index a2c3ec3355..adc361d7a2 100755 --- a/indra/newview/app_settings/shaders/class1/deferred/diffuseIndexedF.glsl +++ b/indra/newview/app_settings/shaders/class1/deferred/diffuseIndexedF.glsl @@ -43,10 +43,12 @@ vec2 encode_normal(vec3 n) void main() { vec3 col = vertex_color.rgb * diffuseLookup(vary_texcoord0.xy).rgb; + + vec3 spec; + spec.rgb = vec3(vertex_color.a); frag_data[0] = vec4(col, 0.0); - frag_data[1] = vertex_color.aaaa; // spec - frag_data[1] = vec4(vec3(vertex_color.a), vertex_color.a+(1.0-vertex_color.a)*vertex_color.a); // spec - from former class3 - maybe better, but not so well tested + frag_data[1] = vec4(spec, vertex_color.a); // spec vec3 nvn = normalize(vary_normal); frag_data[2] = vec4(encode_normal(nvn.xyz), vertex_color.a, 0.0); } |