1 files changed, 7 insertions, 19 deletions
diff --git a/indra/newview/app_settings/shaders/class1/deferred/deferredUtil.glsl b/indra/newview/app_settings/shaders/class1/deferred/deferredUtil.glsl
index dba9c46332..63ab0b9b38 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/deferredUtil.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/deferredUtil.glsl
@@ -265,7 +265,7 @@ vec4 texture2DLodSpecular(vec2 tc, float lod)
     vec2 dist = vec2(0.5) - abs(tc-vec2(0.5));
     float det = min(lod/(proj_lod*0.5), 1.0);
     float d = min(dist.x, dist.y);
-    d *= min(1, d * (proj_lod - lod)); // BUG? extra factor compared to diffuse causes N repeats
+    d *= min(1.0, d * (proj_lod - lod)); // BUG? extra factor compared to diffuse causes N repeats
     float edge = 0.25*det;
     ret *= clamp(d/edge, 0.0, 1.0);
 
@@ -383,7 +383,7 @@ void pbrIbl(vec3 diffuseColor,
             out vec3 specularOut)
 {
     // retrieve a scale and bias to F0. See [1], Figure 3
-    vec2 brdf = BRDF(clamp(nv, 0, 1), 1.0-perceptualRough);
+    vec2 brdf = BRDF(clamp(nv, 0.0, 1.0), 1.0-perceptualRough);
     vec3 diffuseLight = irradiance;
     vec3 specularLight = radiance;
 
@@ -438,9 +438,10 @@ float geometricOcclusion(PBRInfo pbrInputs)
     float NdotL = pbrInputs.NdotL;
     float NdotV = pbrInputs.NdotV;
     float r = pbrInputs.alphaRoughness;
+    float r2 = r * r;
 
-    float attenuationL = 2.0 * NdotL / (NdotL + sqrt(r * r + (1.0 - r * r) * (NdotL * NdotL)));
-    float attenuationV = 2.0 * NdotV / (NdotV + sqrt(r * r + (1.0 - r * r) * (NdotV * NdotV)));
+    float attenuationL = 2.0 * NdotL / (NdotL + sqrt(r2 + (1.0 - r2) * (NdotL * NdotL)));
+    float attenuationV = 2.0 * NdotV / (NdotV + sqrt(r2 + (1.0 - r2) * (NdotV * NdotV)));
     return attenuationL * attenuationV;
 }
 
@@ -625,24 +626,11 @@ vec3 pbrBaseLight(vec3 diffuseColor, vec3 specularColor, float metallic, vec3 v,
 uniform vec4 waterPlane;
 uniform float waterSign;
 
-// discard if given position in eye space is on the wrong side of the waterPlane according to waterSign
 void waterClip(vec3 pos)
 {
-    // TODO: make this less branchy
-    if (waterSign > 0)
+    if (((dot(pos.xyz, waterPlane.xyz) + waterPlane.w) * waterSign) < 0.0)
     {
-        if ((dot(pos.xyz, waterPlane.xyz) + waterPlane.w) < 0.0)
-        {
-            discard;
-        }
-    }
-    else
-    {
-        if ((dot(pos.xyz, waterPlane.xyz) + waterPlane.w) > 0.0)
-        {
-            discard;
-        }
+        discard;
     }
-
 }