From d98e234048b22f05955c2421d7e78cb5c62de72f Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@bred.dog>
Date: Sat, 10 Aug 2019 16:27:06 -0400
Subject: [PATCH] Small shader opt and cleanup
---
.../app_settings/shaders/class1/avatar/objectSkinV.glsl | 3 ---
.../newview/app_settings/shaders/class1/deferred/alphaF.glsl | 5 +++--
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl b/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
index b4f055d3f6..8eae3f9c03 100644
--- a/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
+++ b/indra/newview/app_settings/shaders/class1/avatar/objectSkinV.glsl
@@ -24,9 +24,6 @@
ATTRIBUTE vec4 weight4;
-/* BENTO JOINT COUNT LIMITS
- * Note that the value in the next line also needs to be updated to value-1 several places below.
- */
uniform mat3x4 matrixPalette[MAX_JOINTS_PER_MESH_OBJECT];
mat4 getObjectSkinnedTransform()
diff --git a/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl b/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl
index d363d1abc6..9c049e6083 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl
@@ -526,14 +526,15 @@ void main()
float final_alpha = diff.a;
#endif
#ifdef FOR_IMPOSTOR
- vec4 color = vec4(diff.rgb,final_alpha);
-
+
// Insure we don't pollute depth with invis pixels in impostor rendering
//
if (final_alpha < minimum_alpha)
{
discard;
}
+
+ vec4 color = vec4(diff.rgb,final_alpha);
#else
vec4 gamma_diff = diff;
--
GitLab