Fix Legacy Specular Energy Conservation (#17008)

Co-authored-by: Gary Hsu <[email protected]>

Author: sebavan

packages/dev/core/src/Shaders/ShadersInclude/pbrBlockFinalUnlitComponents.fx

@@ -2,7 +2,7 @@
 vec3 finalDiffuse = diffuseBase;
 finalDiffuse *= surfaceAlbedo;
 
-#if defined(SS_REFRACTION) && !defined(UNLIT)
+#if defined(SS_REFRACTION) && !defined(UNLIT) && !defined(LEGACY_SPECULAR_ENERGY_CONSERVATION)
     finalDiffuse *= subSurfaceOut.refractionOpacity;
 #endif
 #if defined(SS_TRANSLUCENCY) && !defined(UNLIT)

packages/dev/core/src/Shaders/ShadersInclude/pbrBlockSubSurface.fx

@@ -439,12 +439,11 @@ struct subSurfaceOutParams
             environmentRefraction.rgb *= surfaceAlbedo.rgb;
         #endif
 
+        outParams.surfaceAlbedo = surfaceAlbedo;
+        outParams.refractionOpacity = 1. - refractionIntensity;
+
         #ifdef LEGACY_SPECULAR_ENERGY_CONSERVATION
-            outParams.surfaceAlbedo = surfaceAlbedo * (1.-refractionIntensity);
-            outParams.refractionOpacity = 1.0;
-        #else
-            outParams.surfaceAlbedo = surfaceAlbedo;
-            outParams.refractionOpacity = (1. - refractionIntensity);
+            outParams.surfaceAlbedo *= outParams.refractionOpacity;
         #endif
 
         #ifdef UNUSED_MULTIPLEBOUNCES

packages/dev/core/src/ShadersWGSL/ShadersInclude/pbrBlockFinalUnlitComponents.fx

@@ -1,7 +1,7 @@
 // _____________________________ Diffuse ________________________________________
 var finalDiffuse: vec3f = diffuseBase;
 finalDiffuse *= surfaceAlbedo;
-#if defined(SS_REFRACTION) && !defined(UNLIT)
+#if defined(SS_REFRACTION) && !defined(UNLIT) && !defined(LEGACY_SPECULAR_ENERGY_CONSERVATION)
     finalDiffuse *= subSurfaceOut.refractionOpacity;
 #endif
 #if defined(SS_TRANSLUCENCY) && !defined(UNLIT)

packages/dev/core/src/ShadersWGSL/ShadersInclude/pbrBlockSubSurface.fx

@@ -463,12 +463,11 @@ struct subSurfaceOutParams
             environmentRefraction = vec4f(environmentRefraction.rgb * surfaceAlbedo.rgb, environmentRefraction.a);
         #endif
 
+        outParams.surfaceAlbedo = surfaceAlbedo;
+        outParams.refractionOpacity = 1. - refractionIntensity;
+
         #ifdef LEGACY_SPECULAR_ENERGY_CONSERVATION
-            outParams.surfaceAlbedo = surfaceAlbedo * (1.-refractionIntensity);
-            outParams.refractionOpacity = 1.0;
-        #else
-            outParams.surfaceAlbedo = surfaceAlbedo;
-            outParams.refractionOpacity = (1. - refractionIntensity);
+            outParams.surfaceAlbedo *= outParams.refractionOpacity;
         #endif
 
         #ifdef UNUSED_MULTIPLEBOUNCES