Merge pull request #1774 from secondlife/marchcat/b-merge

Release (Materials featurette) -> Maint B sync

1 files changed, 5 insertions, 3 deletions

diff --git a/indra/newview/app_settings/shaders/class1/deferred/diffuseF.glsl b/indra/newview/app_settings/shaders/class1/deferred/diffuseF.glsl
index d3d375b20a..7f056a51e8 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/diffuseF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/diffuseF.glsl
@@ -32,17 +32,19 @@ uniform sampler2D diffuseMap;
 in vec3 vary_normal;
 in vec4 vertex_color;
 in vec2 vary_texcoord0;
+in vec3 vary_position;
 
-vec2 encode_normal(vec3 n);
+void mirrorClip(vec3 pos);
 
 void main()
 {
+    mirrorClip(vary_position);
     vec3 col = vertex_color.rgb * texture(diffuseMap, vary_texcoord0.xy).rgb;
     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
     vec3 nvn = normalize(vary_normal);
-    frag_data[2] = vec4(encode_normal(nvn.xyz), vertex_color.a, GBUFFER_FLAG_HAS_ATMOS);
-    frag_data[3] = vec4(0);
+    frag_data[2] = vec4(nvn.xyz, GBUFFER_FLAG_HAS_ATMOS);
+    frag_data[3] = vec4(vertex_color.a, 0, 0, 0);
 }