Populate new neighbor axis lookups buffer and switch to reading from it.

Author: barbara-bonfire

com.unity.render-pipelines.high-definition/Runtime/Lighting/ProbeVolume/DynamicGI/ProbePropagationAxes.compute

@@ -267,16 +267,14 @@ void PropagateLight(uint3 id : SV_DispatchThreadID)
 
         for(int l=0; l < PROPAGATION_AXIS_AMOUNT; ++l)
         {
-            float4 neighborAxisLookup = _SortedNeighborAxis[neighborAxisIndexOffset + l];
-            int i = (int)neighborAxisLookup.y;
-            float sgWeight = neighborAxisLookup.x;
+            // float4 neighborAxisLookup = _SortedNeighborAxis[neighborAxisIndexOffset + l];
+            // int i = (int)neighborAxisLookup.y;
+            // float sgWeight = neighborAxisLookup.x;
 
-            /*NeighborAxisLookup neighborAxisLookup = _SortedNeighborAxisLookup[neighborAxisIndexOffset + l];
+            NeighborAxisLookup neighborAxisLookup = _SortedNeighborAxisLookup[neighborAxisIndexOffset + l];
             int i = neighborAxisLookup.index;
             float sgWeight = neighborAxisLookup.sgWeight;
-            float3 neighborDirection = neighborAxisLookup.neighborDirection;*/
 
-            float3 neighborDirection = _RayAxis[i].xyz;
             uint sampleAxis = i * _ProbeVolumeProbeCount + probeIndex;
             NeighborAxis neighbor = _ProbeVolumeNeighbors[sampleAxis];
 
@@ -313,6 +311,8 @@ void PropagateLight(uint3 id : SV_DispatchThreadID)
 #if defined(SAMPLE_NEIGHBORS_DIRECTION_ONLY) || defined(SAMPLE_NEIGHBORS_POSITION_AND_DIRECTION)
                 else
                 {
+                    float3 neighborDirection = neighborAxisLookup.neighborDirection;
+                    // float3 neighborDirection = _RayAxis[i].xyz;
                     float3 neighborWorldDirection = neighborDirection;
 
                     #if defined(SAMPLE_NEIGHBORS_POSITION_AND_DIRECTION)

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

@@ -74,6 +74,7 @@ public partial class ProbeVolumeDynamicGI
         private ComputeShader _PropagationCombineShader = null;
 
         private Vector4[] _sortedAxisLookups;
+        private NeighborAxisLookup[] _sortedAxisLookupsArray;
         private ComputeBuffer _sortedNeighborAxisLookups;
         private ProbeVolumeSimulationRequest[] _probeVolumeSimulationRequests;
 
@@ -131,9 +132,9 @@ public enum PropagationAxisAmount
                 new Vector4( 0, -s_2DDiagonal, -s_2DDiagonal, s_2DDiagonalDist),
             };
 
-            int sortedNeighborAxisLookupsCount = (s_NeighborAxis.Length * s_NeighborAxis.Length);
-            _sortedAxisLookups = new Vector4[sortedNeighborAxisLookupsCount];
-            ProbeVolume.EnsureBuffer<NeighborAxisLookup>(ref _sortedNeighborAxisLookups, sortedNeighborAxisLookupsCount);
+            _sortedAxisLookups = new Vector4[s_NeighborAxis.Length * s_NeighborAxis.Length];
+            _sortedAxisLookupsArray = new NeighborAxisLookup[s_NeighborAxis.Length * s_NeighborAxis.Length];
+
             _probeVolumeSimulationRequests = new ProbeVolumeSimulationRequest[MAX_SIMULATIONS_PER_FRAME];
         }
 
@@ -388,6 +389,8 @@ internal void Allocate(RenderPipelineResources resources)
             _PropagationAxesShader = resources.shaders.probePropagationAxesCS;
             _PropagationCombineShader = resources.shaders.probePropagationCombineCS;
 
+            ProbeVolume.EnsureBuffer<NeighborAxisLookup>(ref _sortedNeighborAxisLookups, _sortedAxisLookups.Length);
+
 #if UNITY_EDITOR
             _ProbeVolumeDebugNeighbors = resources.shaders.probeVolumeDebugNeighbors;
             dummyColor = RTHandles.Alloc(kDummyRTWidth, kDummyRTHeight, dimension: TextureDimension.Tex2D, colorFormat: GraphicsFormat.R8G8B8A8_UNorm, name: "Dummy color");
@@ -400,6 +403,7 @@ internal void Cleanup()
 #if UNITY_EDITOR
             RTHandles.Release(dummyColor);
 #endif
+            ProbeVolume.CleanupBuffer(_sortedNeighborAxisLookups);
         }
 
 
@@ -727,14 +731,22 @@ unsafe void PrecomputeAxisCacheLookup(float sgSharpness)
                         var sgWeight = SGEvaluateFromDirection(1, sgSharpness, neighborDirection, axis);
                         sgWeight /= neighborDirection.w * neighborDirection.w;
                         _sortedAxisLookups[sortedAxisStart + neighborIndex] = new Vector4(sgWeight, neighborIndex, 0, 0);
+                        _sortedAxisLookupsArray[sortedAxisStart + neighborIndex] = new NeighborAxisLookup(neighborIndex, sgWeight, neighborDirection);
                     }
 
                     fixed (Vector4* sortedAxisPtr = &_sortedAxisLookups[sortedAxisStart])
                     {
                         CoreUnsafeUtils.QuickSort<AxisVector4>(s_NeighborAxis.Length, sortedAxisPtr);
                     }
+
+                    fixed (NeighborAxisLookup* sortedAxisPtr = &_sortedAxisLookupsArray[sortedAxisStart])
+                    {
+                        CoreUnsafeUtils.QuickSort<NeighborAxisLookup>(s_NeighborAxis.Length, sortedAxisPtr);
+                    }
                 }
 
+                _sortedNeighborAxisLookups.SetData(_sortedAxisLookupsArray);
+
                 _sortedAxisSharpness = sgSharpness;
             }
         }