[APV] Fix baking when there is no geometry in the scene

When forcing the minimal baking possible by ebaling force and having no geometry in the scene, a nullref was generated.
Unity-Technologies · May 23, 2024 · 7df3d9e · 7df3d9e
1 parent ebfd28f
commit 7df3d9e
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeBrickPool.cs b/Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeBrickPool.cs
@@ -116,6 +116,9 @@ internal void Cleanup()
 
         internal static void Initialize()
         {
+            if (!SystemInfo.supportsComputeShaders)
+                return;
+
             s_DataUploadCS = GraphicsSettings.GetRenderPipelineSettings<ProbeVolumeRuntimeResources>()?.probeVolumeUploadDataCS;
             s_DataUploadL2CS = GraphicsSettings.GetRenderPipelineSettings<ProbeVolumeRuntimeResources>()?.probeVolumeUploadDataL2CS;
 

diff --git a/...m.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeBakingSet.Editor.cs b/...m.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeBakingSet.Editor.cs
@@ -422,9 +422,9 @@ static internal int MaxSubdivLevelInProbeVolume(Vector3 volumeSize, int maxSubdi
         {
             float maxSizedDim = Mathf.Max(volumeSize.x, Mathf.Max(volumeSize.y, volumeSize.z));
             float maxSideInBricks = maxSizedDim / ProbeReferenceVolume.instance.MinDistanceBetweenProbes();
-            int subdiv = Mathf.FloorToInt(Mathf.Log(maxSideInBricks, 3));
+            int subdiv = Mathf.FloorToInt(Mathf.Log(maxSideInBricks, 3)) - 1;
 
-            return Mathf.Max(subdiv, maxSubdiv) - 1;
+            return Mathf.Max(subdiv, maxSubdiv);
         }
 
         static void InflateBound(ref Bounds bounds, ProbeVolume pv)
@@ -446,7 +446,7 @@ static void InflateBound(ref Bounds bounds, ProbeVolume pv)
             maxPadding = cellSizeVector - new Vector3(Mathf.Abs(maxPadding.x), Mathf.Abs(maxPadding.y), Mathf.Abs(maxPadding.z));
 
             // Find the size of the brick we can put for every axis given the padding size
-            int maxSubdiv = ProbeReferenceVolume.instance.GetMaxSubdivision();
+            int maxSubdiv = ProbeReferenceVolume.instance.GetMaxSubdivision() - 1;
             if (pv.overridesSubdivLevels) maxSubdiv = Mathf.Min(pv.highestSubdivLevelOverride, maxSubdiv);
 
             float rightPaddingSubdivLevel = ProbeReferenceVolume.instance.BrickSize(MaxSubdivLevelInProbeVolume(new Vector3(maxPadding.x, originalBounds.size.y, originalBounds.size.z), maxSubdiv));
@@ -554,7 +554,7 @@ internal SceneBakeData GetSceneBakeData(string sceneGUID)
         internal static bool SceneHasProbeVolumes(string sceneGUID)
         {
             var bakingSet = GetBakingSetForScene(sceneGUID);
-            return bakingSet.GetSceneBakeData(sceneGUID)?.hasProbeVolume ?? false;
+            return bakingSet?.GetSceneBakeData(sceneGUID)?.hasProbeVolume ?? false;
         }
 
 		internal bool DialogNoProbeVolumeInSetShown()

diff --git a/...m.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeBlendStates.compute b/...m.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeBlendStates.compute
@@ -1,4 +1,4 @@
-#pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch webgpu
+#pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch webgpu gles3
 //#pragma enable_d3d11_debug_symbols
 
 #pragma kernel BlendScenarios

diff --git a/...om.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeUploadData.compute b/...om.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeUploadData.compute
@@ -1,4 +1,4 @@
-#pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch webgpu
+#pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch webgpu gles3
 //#pragma enable_d3d11_debug_symbols
 
 #include "Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeUploadDataCommon.hlsl"

diff --git a/....unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeUploadDataL2.compute b/....unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeUploadDataL2.compute
@@ -1,4 +1,4 @@
-#pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch webgpu
+#pragma only_renderers d3d11 playstation xboxone xboxseries vulkan metal switch webgpu gles3
 //#pragma enable_d3d11_debug_symbols
 
 #include "Packages/com.unity.render-pipelines.core/Runtime/Lighting/ProbeVolume/ProbeVolumeUploadDataCommon.hlsl"

diff --git a/...nder-pipelines.high-definition/Runtime/Lighting/VolumetricClouds/VolumetricClouds.compute b/...nder-pipelines.high-definition/Runtime/Lighting/VolumetricClouds/VolumetricClouds.compute
@@ -126,7 +126,7 @@ void REPROJECT_CLOUDS(uint3 dispatchThreadId : SV_DispatchThreadID,
         {
             finalColor = previousColor;
             finalCloudDepth = previousCloudDepth;
-            finalSampleCount = validityFactor * previousSampleCount * _CloudHistoryInvalidation;
+            finalSampleCount = max(1, validityFactor * previousSampleCount * _CloudHistoryInvalidation);
         }
     }
     else if (!validTracing)