Probe Volumes:

Probe Volumes: Delete meta file for empty folder accidentially created a while back. Cleans up a warning when the project is first imported (#34)

Co-authored-by: pastasfuture <[email protected]>

 Probe Volumes: Cleanup the state when HDRP has Probe Volumes disabled in the HDRenderPipelineAsset or FrameSettings. Previously we would hit some null reference errors because the disabled paths were not well tested. These fixes should improve the process of setting up Probe Volumes / Mask Volumes in a new project

Probe Volumes: Upadte ProbeVolumeAtlasKey to additionally unique on volume position if the volume is simulating dynamic GI. If dynamic GI is enabled, two probe volumes that point to the same asset, streamed in at different locations need unique space in the atlas (because their dynamic GI component is different). If dynamic GI is disabled, two probe volumes that point to the same asset, streamed in at different locations should share space in the atlas, since their baked data is identical.

Probe Volume:

VolumeGlobalUniqueID and atlas allocation stats

Probe Volumes:

Probe Volumes: Remove Ambient Sky fallback which was used when accumulated probe volume weight was < 1. In our project we never want to fall back to the ambient sky, we want to fallback to black. (#40)

Co-authored-by: pastasfuture <[email protected]>

Probe Volumes: Fix bug where tiles would receive no probe volume lighting if they contained no direct light sources, and if compute based deferred was enabled. (#41)

Co-authored-by: pastasfuture <[email protected]>

Probe Volume: Fix Probe Volume Visibility API

Probe Volume: Fixed compilation error when Probe Volumes are not encoded with SHL2.

Author: pastasfuture

com.unity.render-pipelines.high-definition/Runtime/Lighting/AdditionalGIBakeRequestsManager.cs

@@ -5,6 +5,7 @@
 using UnityEngine.SceneManagement;
 using Unity.Collections;
 using UnityEditor;
+using static UnityEngine.Rendering.HighDefinition.VolumeGlobalUniqueIDUtils;
 
 namespace UnityEngine.Rendering.HighDefinition
 {
@@ -55,11 +56,11 @@ private AdditionalGIBakeRequestsManager()
 
         // Lightmapper API uses ints as keys, but we want to use full, stable, GlobalObjectIds as keys.
         // Rather than hashing and hoping we don't collide, lets handle this robustly by
-        // keeping a dictionary of ProbeVolumeGlobalUniqueID->int bit keys.
-        private Dictionary<ProbeVolumeGlobalUniqueID, int> lightmapperBakeIDFromBakeID = new Dictionary<ProbeVolumeGlobalUniqueID, int>(32);
+        // keeping a dictionary of VolumeGlobalUniqueID->int bit keys.
+        private Dictionary<VolumeGlobalUniqueID, int> lightmapperBakeIDFromBakeID = new Dictionary<VolumeGlobalUniqueID, int>(32);
         private int lightmapperBakeIDNext = s_LightmapperBakeIDStart;
 
-        internal void SetAdditionalBakedProbes(ProbeVolumeGlobalUniqueID bakeID, Vector3[] positions)
+        internal void SetAdditionalBakedProbes(VolumeGlobalUniqueID bakeID, Vector3[] positions)
         {
             if (TryGetLightmapperBakeIDFromBakeID(bakeID, out int lightmapperBakeID))
             {
@@ -82,7 +83,7 @@ internal void SetAdditionalBakedProbes(ProbeVolumeGlobalUniqueID bakeID, Vector3
             }
         }
 
-        internal bool GetAdditionalBakedProbes(ProbeVolumeGlobalUniqueID bakeID, NativeArray<SphericalHarmonicsL2> outBakedProbeSH, NativeArray<float> outBakedProbeValidity, NativeArray<float> outBakedProbeOctahedralDepth)
+        internal bool GetAdditionalBakedProbes(VolumeGlobalUniqueID bakeID, NativeArray<SphericalHarmonicsL2> outBakedProbeSH, NativeArray<float> outBakedProbeValidity, NativeArray<float> outBakedProbeOctahedralDepth)
         {
             bool success = false;
             if (TryGetLightmapperBakeIDFromBakeID(bakeID, out int lightmapperBakeID))
@@ -92,7 +93,7 @@ internal bool GetAdditionalBakedProbes(ProbeVolumeGlobalUniqueID bakeID, NativeA
             return success;
         }
 
-        private bool TryGetLightmapperBakeIDFromBakeID(ProbeVolumeGlobalUniqueID bakeID, out int lightmapperBakeID)
+        private bool TryGetLightmapperBakeIDFromBakeID(VolumeGlobalUniqueID bakeID, out int lightmapperBakeID)
         {
             bool success = false;
             if (lightmapperBakeIDFromBakeID.TryGetValue(bakeID, out lightmapperBakeID))
@@ -117,7 +118,7 @@ private bool TryGetLightmapperBakeIDFromBakeID(ProbeVolumeGlobalUniqueID bakeID,
             return success;
         }
 
-        private void IncrementLightmapperBakeIDGeneration(ProbeVolumeGlobalUniqueID bakeID, out int lightmapperBakeID)
+        private void IncrementLightmapperBakeIDGeneration(VolumeGlobalUniqueID bakeID, out int lightmapperBakeID)
         {
             lightmapperBakeID = -1;
             if (lightmapperBakeIDFromBakeID.TryGetValue(bakeID, out lightmapperBakeID))

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

@@ -2227,8 +2227,7 @@ bool PrepareLightsForGPU(CommandBuffer cmd, HDCamera hdCamera, CullingResults cu
 
                     for (int i = 0, n = m_ProbeVolumeCount; i < n; i++)
                     {
-                        // Probe volumes are not lights and therefore should not affect light classification.
-                        LightFeatureFlags featureFlags = 0;
+                        LightFeatureFlags featureFlags = LightFeatureFlags.ProbeVolume;
                         float probeVolumeMaxBiasWS = probeVolumeNormalBiasEnabled ? (probeVolumes.data[i].normalBiasWS + probeVolumes.data[i].viewBiasWS) : 0.0f;
                         CreateBoxVolumeDataAndBound(probeVolumes.bounds[i], LightCategory.ProbeVolume, featureFlags, worldToViewCR, probeVolumeMaxBiasWS, out LightVolumeData volumeData, out SFiniteLightBound bound);
                         if (ShaderConfig.s_ProbeVolumesEvaluationMode == ProbeVolumesEvaluationModes.MaterialPass)
@@ -2599,16 +2598,6 @@ static void BuildPerTileLightList(in BuildGPULightListParameters parameters, in
                         baseFeatureFlags |= LightDefinitions.s_MaterialFeatureMaskFlags;
                     }
 
-                    if (parameters.probeVolumeEnabled)
-                    {
-                        // If probe volume feature is enabled, we toggle this feature on for all tiles.
-                        // This is necessary because all tiles must sample ambient probe fallback.
-                        // It is possible we could save a little bit of work by having 2x feature flags for probe volumes:
-                        // one specifiying which tiles contain probe volumes,
-                        // and another triggered for all tiles to handle fallback.
-                        baseFeatureFlags |= (uint)LightFeatureFlags.ProbeVolume;
-                    }
-
                     localLightListCB.g_BaseFeatureFlags = baseFeatureFlags;
 
                     cmd.SetComputeBufferParam(parameters.buildPerTileLightListShader, parameters.buildPerTileLightListKernel, HDShaderIDs.g_TileFeatureFlags, resources.tileFeatureFlags);
@@ -2672,11 +2661,6 @@ static void BuildDispatchIndirectArguments(in BuildGPULightListParameters parame
                     {
                         baseFeatureFlags |= LightDefinitions.s_LightFeatureMaskFlags;
                     }
-                    if (parameters.probeVolumeEnabled)
-                    {
-                        // TODO: Verify that we should be globally enabling ProbeVolume feature for all tiles here, or if we should be using per-tile culling.
-                        baseFeatureFlags |= (uint)LightFeatureFlags.ProbeVolume;
-                    }
 
                     // If we haven't run the light list building, we are missing some basic lighting flags.
                     if (!tileFlagsWritten)

com.unity.render-pipelines.high-definition/Runtime/Lighting/ProbeVolume/DynamicGI/ProbeVolumeDynamicGIEditor.cs

@@ -122,7 +122,7 @@ internal void DebugDrawNeighborhood(ProbeVolumeHandle probeVolume, Camera camera
                     if (hdrp != null)
                     {
                         var obb = probeVolume.ConstructOBBEngineData( Vector3.zero);
-                        var data = probeVolume.parameters.ConvertToEngineData(hdrp.GetProbeVolumeAtlasSHRTDepthSliceCount());
+                        var data = probeVolume.parameters.ConvertToEngineData(hdrp.GetProbeVolumeAtlasSHRTDepthSliceCount(), probeVolume.parameters.distanceFadeStart, probeVolume.parameters.distanceFadeEnd);
 
                         Shader.SetGlobalFloat("_ProbeVolumeDGIMaxNeighborDistance", data.maxNeighborDistance);
                         Shader.SetGlobalInt("_ProbeVolumeDGIResolutionXY", (int)data.resolutionXY);

com.unity.render-pipelines.high-definition/Runtime/Lighting/ProbeVolume/IProbeVolumeList.cs

@@ -1,3 +1,5 @@
+using static UnityEngine.Rendering.HighDefinition.VolumeGlobalUniqueIDUtils;
+
 namespace UnityEngine.Rendering.HighDefinition
 {
     interface IProbeVolumeList
@@ -15,7 +17,7 @@ interface IProbeVolumeList
 
         ref ProbeVolumeArtistParameters GetParameters(int i);
 
-        ProbeVolumeGlobalUniqueID GetAtlasID(int i);
+        VolumeGlobalUniqueID GetAtlasID(int i);
         ProbeVolume.ProbeVolumeAtlasKey ComputeProbeVolumeAtlasKey(int i);
         ProbeVolume.ProbeVolumeAtlasKey GetProbeVolumeAtlasKeyPrevious(int i);
         void SetProbeVolumeAtlasKeyPrevious(int i, ProbeVolume.ProbeVolumeAtlasKey key);