Fix tessellation shadows, and potential lighting NaNs

1 files changed, 3 insertions, 2 deletions

diff --git a/brdf.cginc b/brdf.cginc
index 254adc3..2b1b754 100755
--- a/brdf.cginc
+++ b/brdf.cginc
@@ -135,7 +135,6 @@ float4 brdf(Pbr pbr, LightData data) {
     direct_specular *= data.direct.color * data.direct.NoL;
     direct_specular *= energy_comp;
     direct_specular *= remainder;
-    direct_specular = max(0, direct_specular);
     specular += direct_specular;
 
 #if defined(F_OREN_NAYAR)
@@ -149,6 +148,8 @@ float4 brdf(Pbr pbr, LightData data) {
     diffuse += direct_diffuse;
   }
 
+  return float4(specular + diffuse, 1);
+
   // Indirect
 #if !defined(FURNACE_TEST_DIRECT) && (defined(FORWARD_BASE_PASS) || defined(OUTLINES_PASS))
   {
@@ -184,7 +185,7 @@ float4 brdf(Pbr pbr, LightData data) {
 #endif
 
   diffuse  *= data.common.ao;
-  specular *= data.common.spec_ao;
+  //specular *= data.common.spec_ao;
 
 #if defined(_EMISSIONS) && defined(FORWARD_BASE_PASS)
   float3 emission = pbr.emission;