2023.2/graphics/hd/fix/clouds debug mode

Reported here https://unity.slack.com/archives/C6Y79CZM0/p1696952455221199 Fixed error in the console when enbling a debug mode and volumetric clouds are on This acutally fixes a more serious issue where volumetric clouds shadow would be computed on all directional lights introduced by https://github.cds.internal.unity3d.com/unity/unity/pull/19281
Unity-Technologies · Nov 15, 2023 · 3d760ab · 3d760ab
1 parent cc2608f
commit 3d760ab
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightEvaluation.hlsl b/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightEvaluation.hlsl
@@ -265,12 +265,6 @@ float4 EvaluateLight_Directional(LightLoopContext lightLoopContext, PositionInpu
     }
 #endif
 
-#ifndef LIGHT_EVALUATION_NO_CLOUDS_SHADOWS
-    // Apply the volumetric cloud shadow if relevant
-    if (_VolumetricCloudsShadowOriginToggle.w == 1.0)
-        color.rgb *= EvaluateVolumetricCloudsShadows(lightLoopContext, light, posInput.positionWS);
-#endif
-
     return color;
 }
 

diff --git a/...ages/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.hlsl b/...ages/com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.hlsl
@@ -233,6 +233,12 @@ void LightLoop( float3 V, PositionInputs posInput, PreLightData preLightData, BS
                     context.shadowValue = GetDirectionalShadowAttenuation(context.shadowContext,
                                                                           posInput.positionSS, posInput.positionWS, GetNormalForShadowBias(bsdfData),
                                                                           light.shadowIndex, L);
+
+                    #ifndef LIGHT_EVALUATION_NO_CLOUDS_SHADOWS
+                    // Apply the volumetric cloud shadow if relevant
+                    if (_VolumetricCloudsShadowOriginToggle.w == 1.0)
+                        context.shadowValue *= EvaluateVolumetricCloudsShadows(light, posInput.positionWS);
+                    #endif
                 }
             }
         }

diff --git a/...-pipelines.high-definition/Runtime/Lighting/LightLoop/VolumetricCloudsShadowSampling.hlsl b/...-pipelines.high-definition/Runtime/Lighting/LightLoop/VolumetricCloudsShadowSampling.hlsl
@@ -1,7 +1,7 @@
 #ifndef VOLUMETRIC_CLOUDS_SHADOW_SAMPLING
 #define VOLUMETRIC_CLOUDS_SHADOW_SAMPLING
 
-float EvaluateVolumetricCloudsShadows(LightLoopContext lightLoopContext, DirectionalLightData light, float3 positionWS)
+float EvaluateVolumetricCloudsShadows(DirectionalLightData light, float3 positionWS)
 {
     // Compute the vector from the shadow origin to the point to shade
     float3 shadowOriginVec = positionWS - _VolumetricCloudsShadowOriginToggle.xyz;

diff --git a/...-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricLighting.compute b/...-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricLighting.compute
@@ -213,6 +213,10 @@ VoxelLighting EvaluateVoxelLightingDirectional(LightLoopContext context, uint fe
             context.shadowValue = GetDirectionalShadowAttenuation(context.shadowContext,
                                                                   posInput.positionSS, posInput.positionWS, shadowN,
                                                                   light.shadowIndex, L);
+
+            // Apply the volumetric cloud shadow if relevant
+            if (_VolumetricCloudsShadowOriginToggle.w == 1.0)
+                context.shadowValue *= EvaluateVolumetricCloudsShadows(light, posInput.positionWS);
         }
     }
     else