Dev aov light decomposition

com.unity.render-pipelines.high-definition/CHANGELOG.md

@@ -88,6 +88,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Added support for fog attenuation in path tracing.
 - Added a new debug panel for volumes
 - Added XR setting to control camera jitter for temporal effects
+- Added Light decomposition lighting debugging modes
 - Added an error message in the DrawRenderers custom pass when rendering opaque objects with an HDRP asset in DeferredOnly mode.
 - Added API to enable proper recording of path traced scenes (with the Unity recorder or other tools).
 - Added support for fog in Recursive rendering, ray traced reflections and ray traced indirect diffuse.
@@ -103,6 +104,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Added a frame setting for alpha to mask.
 - Added support for custom passes in the AOV API
 
+
 ### Fixed
 - Fix when rescale probe all direction below zero (1219246)
 - Update documentation of HDRISky-Backplate, precise how to have Ambient Occlusion on the Backplate

com.unity.render-pipelines.high-definition/Documentation~/Render-Pipeline-Debug-Window.md

@@ -115,7 +115,7 @@ The **Lighting** panel has tools that you can use to visualize various component
 | **- Punctual Lights**                | Enable the checkbox to see [Punctual Lights](Glossary.html#PunctualLight) in your Scene. Disable this checkbox to remove Punctual Lights from your Scene's lighting. |
 | **- Area Lights**                    | Enable the checkbox to see Area Lights in your Scene. Disable this checkbox to remove Aera Lights from your Scene's lighting. |
 | **- Reflection Probes**              | Enable the checkbox to see Reflection Probes in your Scene. Disable this checkbox to remove Reflection Probes from your Scene's lighting. |
-| **Debug Mode**                       | Use the drop-down to select a lighting mode to debug. For example, you can visualize diffuse lighting, specular lighting, and Directional Light shadow cascades. |
+| **Debug Mode**                       | Use the drop-down to select a lighting mode to debug. For example, you can visualize diffuse lighting, specular lighting, direct diffuse lighting, direct specular lighting, indirect diffuse lighting, reflection, refraction, transmittance, emissive and Directional Light shadow cascades. |
 | **Hierarchy Debug Mode**             | Use the drop-down to select a light type to show the direct lighting for or a Reflection Probe type to show the indirect lighting for. |
 | **Light Layers Visualization**       | Enable the checkbox to visualize light layers of objects in your Scene. |
 | **- Use Selected Light**             | Enable the checkbox to visualize objects affected by the selected light. |

com.unity.render-pipelines.high-definition/Runtime/Debug/DebugDisplay.cs

@@ -567,6 +567,24 @@ public void SetDebugLightingMode(DebugLightingMode value)
                 data.mipMapDebugSettings.debugMipMapMode = DebugMipMapMode.None;
                 data.lightingDebugSettings.debugLightLayers = false;
             }
+            if (value == DebugLightingMode.Emissive || value == DebugLightingMode.IndirectDiffuse)
+            {
+                HDRenderPipelineAsset hdrpAsset = (HDRenderPipelineAsset)GraphicsSettings.renderPipelineAsset;
+                if (hdrpAsset.currentPlatformRenderPipelineSettings.supportedLitShaderMode != RenderPipelineSettings.SupportedLitShaderMode.ForwardOnly)
+                {
+                    Debug.LogWarning("Beware DebugLightingMode.Emissive/DebugLightingMode.IndirectDiffuse is only correct when in forward-only mode");
+                }
+            }
+
+            if (value == DebugLightingMode.Refraction || value == DebugLightingMode.Transmittance)
+            {
+                HDRenderPipelineAsset hdrpAsset = (HDRenderPipelineAsset)GraphicsSettings.renderPipelineAsset;
+                if (hdrpAsset.currentPlatformRenderPipelineSettings.supportedLitShaderMode != RenderPipelineSettings.SupportedLitShaderMode.ForwardOnly)
+                {
+                    Debug.LogWarning("Beware DebugLightingMode.Refraction/DebugLightingMode.Transmittance is only correct when in forward-only mode");
+                }
+            }
+
             data.lightingDebugSettings.debugLightingMode = value;
         }
 
@@ -1538,7 +1556,8 @@ internal bool DebugNeedsExposure()
             DebugLightingMode debugLighting = data.lightingDebugSettings.debugLightingMode;
             DebugViewGbuffer debugGBuffer = (DebugViewGbuffer)data.materialDebugSettings.debugViewGBuffer;
             ProbeVolumeDebugMode debugProbeVolume = data.lightingDebugSettings.probeVolumeDebugMode;
-            return (debugLighting == DebugLightingMode.DiffuseLighting || debugLighting == DebugLightingMode.SpecularLighting || debugLighting == DebugLightingMode.VisualizeCascade) ||
+
+            return (debugLighting == DebugLightingMode.DirectDiffuse || debugLighting == DebugLightingMode.DirectSpecular  || debugLighting == DebugLightingMode.IndirectDiffuse || debugLighting == DebugLightingMode.Reflection || debugLighting == DebugLightingMode.Refraction ||debugLighting == DebugLightingMode.DiffuseLighting || debugLighting == DebugLightingMode.SpecularLighting || debugLighting == DebugLightingMode.VisualizeCascade) ||
                 (data.lightingDebugSettings.overrideAlbedo || data.lightingDebugSettings.overrideNormal || data.lightingDebugSettings.overrideSmoothness || data.lightingDebugSettings.overrideSpecularColor || data.lightingDebugSettings.overrideEmissiveColor || data.lightingDebugSettings.overrideAmbientOcclusion) ||
                 (debugGBuffer == DebugViewGbuffer.BakeDiffuseLightingWithAlbedoPlusEmissive) || (data.lightingDebugSettings.debugLightFilterMode != DebugLightFilterMode.None) ||
                 (data.fullScreenDebugMode == FullScreenDebugMode.PreRefractionColorPyramid || data.fullScreenDebugMode == FullScreenDebugMode.FinalColorPyramid || data.fullScreenDebugMode == FullScreenDebugMode.ScreenSpaceReflections || data.fullScreenDebugMode == FullScreenDebugMode.LightCluster || data.fullScreenDebugMode == FullScreenDebugMode.ScreenSpaceShadows || data.fullScreenDebugMode == FullScreenDebugMode.NanTracker || data.fullScreenDebugMode == FullScreenDebugMode.ColorLog) || data.fullScreenDebugMode == FullScreenDebugMode.RayTracedGlobalIllumination ||

com.unity.render-pipelines.high-definition/Runtime/Debug/LightingDebug.cs

@@ -29,7 +29,21 @@ public enum DebugLightingMode
         /// <summary>Display indirect specular occlusion.</summary>
         IndirectSpecularOcclusion,
         /// <summary>Display Probe Volumes.</summary>
-        ProbeVolume
+        ProbeVolume,        
+        /// <summary>Display only direct diffuse lighting.</summary>
+        DirectDiffuse,
+        /// <summary>Display only direct specular lighting.</summary>
+        DirectSpecular,
+        /// <summary>Display only indirect diffuse lighting.</summary>
+        IndirectDiffuse,
+        /// <summary>Display only reflection lighting.</summary>
+        Reflection,
+        /// <summary>Display only refraction lighting.</summary>
+        Refraction,
+        /// <summary>Display only Transmittance lighting.</summary>
+        Transmittance,
+        /// <summary>Display only Emissive lighting.</summary>
+        Emissive
     }
 
     /// <summary>

com.unity.render-pipelines.high-definition/Runtime/Debug/LightingDebug.cs.hlsl

@@ -18,6 +18,13 @@
 #define DEBUGLIGHTINGMODE_INDIRECT_DIFFUSE_OCCLUSION (8)
 #define DEBUGLIGHTINGMODE_INDIRECT_SPECULAR_OCCLUSION (9)
 #define DEBUGLIGHTINGMODE_PROBE_VOLUME (10)
+#define DEBUGLIGHTINGMODE_DIRECT_DIFFUSE (11)
+#define DEBUGLIGHTINGMODE_DIRECT_SPECULAR (12)
+#define DEBUGLIGHTINGMODE_INDIRECT_DIFFUSE (13)
+#define DEBUGLIGHTINGMODE_REFLECTION (14)
+#define DEBUGLIGHTINGMODE_REFRACTION (15)
+#define DEBUGLIGHTINGMODE_TRANSMITTANCE (16)
+#define DEBUGLIGHTINGMODE_EMISSIVE (17)
 
 //
 // UnityEngine.Rendering.HighDefinition.DebugLightFilterMode:  static fields

com.unity.render-pipelines.high-definition/Runtime/Lighting/Deferred.shader

@@ -137,7 +137,13 @@ Shader "Hidden/HDRP/Deferred"
 
                 float3 diffuseLighting;
                 float3 specularLighting;
-                LightLoop(V, posInput, preLightData, bsdfData, builtinData, LIGHT_FEATURE_MASK_FLAGS_OPAQUE, diffuseLighting, specularLighting);
+                DecomposedLighting decomposedLighting;
+                LightLoop(V, posInput, preLightData, bsdfData, builtinData, LIGHT_FEATURE_MASK_FLAGS_OPAQUE, diffuseLighting, specularLighting, decomposedLighting);
+
+#ifdef DEBUG_DISPLAY
+                PostLightLoopDebugDisplay(V, posInput, preLightData, bsdfData, builtinData,
+                    decomposedLighting, diffuseLighting, specularLighting, builtinData.opacity);
+#endif
 
                 diffuseLighting *= GetCurrentExposureMultiplier();
                 specularLighting *= GetCurrentExposureMultiplier();

com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/Deferred.compute

@@ -165,7 +165,13 @@ void SHADE_OPAQUE_ENTRY(uint3 dispatchThreadId : SV_DispatchThreadID, uint2 grou
 
     float3 diffuseLighting;
     float3 specularLighting;
-    LightLoop(V, posInput, preLightData, bsdfData, builtinData, featureFlags, diffuseLighting, specularLighting);
+    DecomposedLighting decomposedLighting;
+    LightLoop(V, posInput, preLightData, bsdfData, builtinData, featureFlags, diffuseLighting, specularLighting, decomposedLighting);
+
+#ifdef DEBUG_DISPLAY
+    PostLightLoopDebugDisplay(V, posInput, preLightData, bsdfData, builtinData,
+        decomposedLighting, diffuseLighting, specularLighting, builtinData.opacity);
+#endif
 
     diffuseLighting *= GetCurrentExposureMultiplier();
     specularLighting *= GetCurrentExposureMultiplier();

com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/DeferredTile.shader

@@ -244,7 +244,13 @@ Shader "Hidden/HDRP/DeferredTile"
 
                 float3 diffuseLighting;
                 float3 specularLighting;
-                LightLoop(V, posInput, preLightData, bsdfData, builtinData, featureFlags, diffuseLighting, specularLighting);
+                DecomposedLighting decomposedLighting;
+                LightLoop(V, posInput, preLightData, bsdfData, builtinData, featureFlags, diffuseLighting, specularLighting, decomposedLighting);
+
+#ifdef DEBUG_DISPLAY
+                PostLightLoopDebugDisplay(V, posInput, preLightData, bsdfData, builtinData,
+                    decomposedLighting, diffuseLighting, specularLighting, builtinData.opacity);
+#endif
 
                 diffuseLighting *= GetCurrentExposureMultiplier();
                 specularLighting *= GetCurrentExposureMultiplier();
@@ -405,7 +411,13 @@ Shader "Hidden/HDRP/DeferredTile"
 
                 float3 diffuseLighting;
                 float3 specularLighting;
-                LightLoop(V, posInput, preLightData, bsdfData, builtinData, LIGHT_FEATURE_MASK_FLAGS_OPAQUE, diffuseLighting, specularLighting);
+                DecomposedLighting decomposedLighting;
+
+                LightLoop(V, posInput, preLightData, bsdfData, builtinData, LIGHT_FEATURE_MASK_FLAGS_OPAQUE, diffuseLighting, specularLighting, decomposedLighting);
+#ifdef DEBUG_DISPLAY
+                PostLightLoopDebugDisplay(V, posInput, preLightData, bsdfData, builtinData,
+                    decomposedLighting, diffuseLighting, specularLighting, builtinData.opacity);
+#endif
 
                 diffuseLighting *= GetCurrentExposureMultiplier();
                 specularLighting *= GetCurrentExposureMultiplier();

com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.hlsl

@@ -111,7 +111,8 @@ void ApplyDebug(LightLoopContext context, PositionInputs posInput, BSDFData bsdf
 
 void LightLoop( float3 V, PositionInputs posInput, PreLightData preLightData, BSDFData bsdfData, BuiltinData builtinData, uint featureFlags,
                 out float3 diffuseLighting,
-                out float3 specularLighting)
+                out float3 specularLighting,
+                out DecomposedLighting decomposedLighting)
 {
     LightLoopContext context;
 
@@ -483,7 +484,7 @@ void LightLoop( float3 V, PositionInputs posInput, PreLightData preLightData, BS
     // Also Apply indiret diffuse (GI)
     // PostEvaluateBSDF will perform any operation wanted by the material and sum everything into diffuseLighting and specularLighting
     PostEvaluateBSDF(   context, V, posInput, preLightData, bsdfData, builtinData, aggregateLighting,
-                        diffuseLighting, specularLighting);
+                        diffuseLighting, specularLighting, decomposedLighting);
 
     ApplyDebug(context, posInput, bsdfData, diffuseLighting, specularLighting);
 }

com.unity.render-pipelines.high-definition/Runtime/Material/AxF/AxF.hlsl

@@ -2584,7 +2584,7 @@ IndirectLighting EvaluateBSDF_Env(  LightLoopContext lightLoopContext,
 void PostEvaluateBSDF(  LightLoopContext lightLoopContext,
                         float3 V, PositionInputs posInput,
                         PreLightData preLightData, BSDFData bsdfData, BuiltinData builtinData, AggregateLighting lighting,
-                        out float3 diffuseLighting, out float3 specularLighting)
+                        out float3 diffuseLighting, out float3 specularLighting, out DecomposedLighting decomposedLighting)
 {
     // There is no AmbientOcclusion from data with AxF, but let's apply our SSAO
     AmbientOcclusionFactor aoFactor;
@@ -2603,6 +2603,14 @@ void PostEvaluateBSDF(  LightLoopContext lightLoopContext,
     diffuseLighting = 10 * float3(1, 0.3, 0.01);
 #endif
 
+    decomposedLighting.directDiffuse = bsdfData.diffuseColor * lighting.direct.diffuse;
+    decomposedLighting.directSpecular = lighting.direct.specular;
+    decomposedLighting.indirectDiffuse = builtinData.bakeDiffuseLighting;
+    decomposedLighting.reflection = lighting.indirect.specularReflected;
+    decomposedLighting.refraction = 0;
+    decomposedLighting.transmittance = 0;
+    decomposedLighting.emissive = 0;
+
 #ifdef DEBUG_DISPLAY
     PostEvaluateBSDFDebugDisplay(aoFactor, builtinData, lighting, bsdfData.diffuseColor, diffuseLighting, specularLighting);
 #endif

com.unity.render-pipelines.high-definition/Runtime/Material/Eye/Eye.hlsl

@@ -820,7 +820,7 @@ IndirectLighting EvaluateBSDF_Env(  LightLoopContext lightLoopContext,
 void PostEvaluateBSDF(  LightLoopContext lightLoopContext,
                         float3 V, PositionInputs posInput,
                         PreLightData preLightData, BSDFData bsdfData, BuiltinData builtinData, AggregateLighting lighting,
-                        out float3 diffuseLighting, out float3 specularLighting)
+                        out float3 diffuseLighting, out float3 specularLighting, out DecomposedLighting decomposedLighting)
 {
     AmbientOcclusionFactor aoFactor;
     GetScreenSpaceAmbientOcclusionMultibounce(posInput.positionSS, preLightData.NdotV, bsdfData.perceptualRoughness, bsdfData.ambientOcclusion, bsdfData.specularOcclusion, bsdfData.diffuseColor, bsdfData.fresnel0, aoFactor);
@@ -834,6 +834,14 @@ void PostEvaluateBSDF(  LightLoopContext lightLoopContext,
     diffuseLighting = modifiedDiffuseColor * lighting.direct.diffuse + builtinData.bakeDiffuseLighting + builtinData.emissiveColor;
     specularLighting = lighting.direct.specular + lighting.indirect.specularReflected;
 
+    decomposedLighting.directDiffuse = modifiedDiffuseColor * lighting.direct.diffuse;
+    decomposedLighting.directSpecular = lighting.direct.specular;
+    decomposedLighting.indirectDiffuse = builtinData.bakeDiffuseLighting;
+    decomposedLighting.reflection = lighting.indirect.specularReflected;
+    decomposedLighting.refraction = 0;
+    decomposedLighting.transmittance = 0;
+    decomposedLighting.emissive = builtinData.emissiveColor;
+
 #ifdef DEBUG_DISPLAY
     PostEvaluateBSDFDebugDisplay(aoFactor, builtinData, lighting, bsdfData.diffuseColor, diffuseLighting, specularLighting);
 #endif

com.unity.render-pipelines.high-definition/Runtime/Material/Fabric/Fabric.hlsl

@@ -651,7 +651,7 @@ IndirectLighting EvaluateBSDF_Env(  LightLoopContext lightLoopContext,
 void PostEvaluateBSDF(  LightLoopContext lightLoopContext,
                         float3 V, PositionInputs posInput,
                         PreLightData preLightData, BSDFData bsdfData, BuiltinData builtinData, AggregateLighting lighting,
-                        out float3 diffuseLighting, out float3 specularLighting)
+                        out float3 diffuseLighting, out float3 specularLighting, out DecomposedLighting decomposedLighting)
 {
     AmbientOcclusionFactor aoFactor;
     GetScreenSpaceAmbientOcclusionMultibounce(posInput.positionSS, preLightData.NdotV, bsdfData.perceptualRoughness, bsdfData.ambientOcclusion, bsdfData.specularOcclusion, bsdfData.diffuseColor, bsdfData.fresnel0, aoFactor);
@@ -667,6 +667,14 @@ void PostEvaluateBSDF(  LightLoopContext lightLoopContext,
 
     // TODO: Multiscattering for cloth?
 
+    decomposedLighting.directDiffuse = modifiedDiffuseColor * lighting.direct.diffuse;
+    decomposedLighting.directSpecular = lighting.direct.specular;
+    decomposedLighting.indirectDiffuse = builtinData.bakeDiffuseLighting;
+    decomposedLighting.reflection = lighting.indirect.specularReflected;
+    decomposedLighting.refraction = 0;
+    decomposedLighting.transmittance = 0;
+    decomposedLighting.emissive = builtinData.emissiveColor;
+
 #ifdef DEBUG_DISPLAY
     PostEvaluateBSDFDebugDisplay(aoFactor, builtinData, lighting, bsdfData.diffuseColor, diffuseLighting, specularLighting);
 #endif

com.unity.render-pipelines.high-definition/Runtime/Material/Hair/Hair.hlsl

@@ -593,7 +593,7 @@ IndirectLighting EvaluateBSDF_Env(  LightLoopContext lightLoopContext,
 void PostEvaluateBSDF(  LightLoopContext lightLoopContext,
                         float3 V, PositionInputs posInput,
                         PreLightData preLightData, BSDFData bsdfData, BuiltinData builtinData, AggregateLighting lighting,
-                        out float3 diffuseLighting, out float3 specularLighting)
+                        out float3 diffuseLighting, out float3 specularLighting, out DecomposedLighting decomposedLighting)
 {
     AmbientOcclusionFactor aoFactor;
     GetScreenSpaceAmbientOcclusionMultibounce(posInput.positionSS, preLightData.NdotV, bsdfData.perceptualRoughness, bsdfData.ambientOcclusion, bsdfData.specularOcclusion, bsdfData.diffuseColor, bsdfData.fresnel0, aoFactor);
@@ -604,6 +604,14 @@ void PostEvaluateBSDF(  LightLoopContext lightLoopContext,
     diffuseLighting = bsdfData.diffuseColor * lighting.direct.diffuse + builtinData.bakeDiffuseLighting + builtinData.emissiveColor;
     specularLighting = lighting.direct.specular + lighting.indirect.specularReflected;
 
+    decomposedLighting.directDiffuse = modifiedDiffuseColor * lighting.direct.diffuse;
+    decomposedLighting.directSpecular = lighting.direct.specular;
+    decomposedLighting.indirectDiffuse = builtinData.bakeDiffuseLighting;
+    decomposedLighting.reflection = lighting.indirect.specularReflected;
+    decomposedLighting.refraction = 0;
+    decomposedLighting.transmittance = 0;
+    decomposedLighting.emissive = builtinData.emissiveColor;
+
 #ifdef DEBUG_DISPLAY
     PostEvaluateBSDFDebugDisplay(aoFactor, builtinData, lighting, bsdfData.diffuseColor, diffuseLighting, specularLighting);
 #endif

com.unity.render-pipelines.high-definition/Runtime/Material/Lit/Lit.hlsl

@@ -1952,7 +1952,7 @@ IndirectLighting EvaluateBSDF_Env(  LightLoopContext lightLoopContext,
 void PostEvaluateBSDF(  LightLoopContext lightLoopContext,
                         float3 V, PositionInputs posInput,
                         PreLightData preLightData, BSDFData bsdfData, BuiltinData builtinData, AggregateLighting lighting,
-                        out float3 diffuseLighting, out float3 specularLighting)
+                        out float3 diffuseLighting, out float3 specularLighting, out DecomposedLighting decomposedLighting)
 {
     AmbientOcclusionFactor aoFactor;
     // Use GTAOMultiBounce approximation for ambient occlusion (allow to get a tint from the baseColor)
@@ -1985,6 +1985,14 @@ void PostEvaluateBSDF(  LightLoopContext lightLoopContext,
     // Rescale the GGX to account for the multiple scattering.
     specularLighting *= 1.0 + bsdfData.fresnel0 * preLightData.energyCompensation;
 
+    decomposedLighting.directDiffuse = modifiedDiffuseColor * lighting.direct.diffuse;
+    decomposedLighting.directSpecular = lighting.direct.specular * (1.0 + bsdfData.fresnel0 * preLightData.energyCompensation);
+    decomposedLighting.indirectDiffuse = builtinData.bakeDiffuseLighting;
+    decomposedLighting.reflection = lighting.indirect.specularReflected * (1.0 + bsdfData.fresnel0 * preLightData.energyCompensation);
+    decomposedLighting.refraction = lighting.indirect.specularTransmitted;
+    decomposedLighting.transmittance = bsdfData.transmittanceMask * _EnableSSRefraction;
+    decomposedLighting.emissive = builtinData.emissiveColor;
+
 #ifdef DEBUG_DISPLAY
     PostEvaluateBSDFDebugDisplay(aoFactor, builtinData, lighting, bsdfData.diffuseColor, diffuseLighting, specularLighting);
 #endif