From b1410c8b679c14432038a62bff2de772f490bc4a Mon Sep 17 00:00:00 2001
From: RunitaiLinden <davep@lindenlab.com>
Date: Thu, 1 Feb 2024 14:00:40 -0600
Subject: #677 WIP -- fix PBR and avatar mirror clipping.

---
 indra/newview/app_settings/shaders/class1/deferred/avatarF.glsl | 4 ++++
 indra/newview/app_settings/shaders/class1/deferred/avatarV.glsl | 2 ++
 indra/newview/llfetchedgltfmaterial.cpp                         | 1 -
 indra/newview/llviewershadermgr.cpp                             | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/indra/newview/app_settings/shaders/class1/deferred/avatarF.glsl b/indra/newview/app_settings/shaders/class1/deferred/avatarF.glsl
index 6ebe4ce251..c0607d0149 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/avatarF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/avatarF.glsl
@@ -33,11 +33,15 @@ uniform float minimum_alpha;
 
 in vec3 vary_normal;
 in vec2 vary_texcoord0;
+in vec3 vary_position;
 
 vec2 encode_normal(vec3 n);
+void mirrorClip(vec3 pos);
 
 void main() 
 {
+    mirrorClip(vary_position);
+
 	vec4 diff = texture(diffuseMap, vary_texcoord0.xy);
 	
 	if (diff.a < minimum_alpha)
diff --git a/indra/newview/app_settings/shaders/class1/deferred/avatarV.glsl b/indra/newview/app_settings/shaders/class1/deferred/avatarV.glsl
index bc0c11ec46..5cc2846156 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/avatarV.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/avatarV.glsl
@@ -35,6 +35,7 @@ in vec4 weight;
 
 out vec3 vary_normal;
 out vec2 vary_texcoord0;
+out vec3 vary_position;
 
 void main()
 {
@@ -57,6 +58,7 @@ void main()
 	
 	vary_normal = norm;
 	
+    vary_position = pos.xyz;
 	gl_Position = projection_matrix * pos;
 }
 
diff --git a/indra/newview/llfetchedgltfmaterial.cpp b/indra/newview/llfetchedgltfmaterial.cpp
index 6bd613622e..97b959e5cb 100644
--- a/indra/newview/llfetchedgltfmaterial.cpp
+++ b/indra/newview/llfetchedgltfmaterial.cpp
@@ -128,7 +128,6 @@ void LLFetchedGLTFMaterial::bind(LLViewerTexture* media_tex)
         shader->uniform1f(LLShaderMgr::ROUGHNESS_FACTOR, mRoughnessFactor);
         shader->uniform1f(LLShaderMgr::METALLIC_FACTOR, mMetallicFactor);
         shader->uniform3fv(LLShaderMgr::EMISSIVE_COLOR, 1, mEmissiveColor.mV);
-        shader->uniform1f(LLShaderMgr::MIRROR_FLAG, 0);
 
         F32 normal_packed[8];
         mTextureTransform[GLTF_TEXTURE_INFO_NORMAL].getPacked(normal_packed);
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp
index 7dbfad4b82..bb60ceed2a 100644
--- a/indra/newview/llviewershadermgr.cpp
+++ b/indra/newview/llviewershadermgr.cpp
@@ -296,6 +296,7 @@ LLViewerShaderMgr::LLViewerShaderMgr() :
     mShaderList.push_back(&gDeferredBumpProgram);
     mShaderList.push_back(&gDeferredPBROpaqueProgram);
     mShaderList.push_back(&gDeferredPBRAlphaProgram);
+    mShaderList.push_back(&gDeferredAvatarProgram);
 }
 
 LLViewerShaderMgr::~LLViewerShaderMgr()
-- 
cgit v1.2.3