[Fix 1351595] SDF Baker on PS4/5 failing due to explicit binding (#278)

* Actual number of RT offset for PS4/5 bindings

* Reactivate tests

* Adds a TODO for future unification of similar case

* reformat + changelog

Author: ludovic-theobald

TestProjects/VisualEffectGraph_HDRP/Assets/TestCaseFilters.asset

@@ -23,21 +23,3 @@ MonoBehaviour:
     XrSdk: 
     StereoModes: 0
     Reason: See https://jira.unity3d.com/browse/URP-723
-  - FilteredScene: {fileID: 0}
-    FilteredScenes:
-    - {fileID: 102900000, guid: ebaa785ec5cfd50448e6b1fca17c280f, type: 3}
-    ColorSpace: -1
-    BuildPlatform: 31
-    GraphicsDevice: 4
-    XrSdk: 
-    StereoModes: 0
-    Reason: See https://fogbugz.unity3d.com/f/cases/1351595/
-  - FilteredScene: {fileID: 0}
-    FilteredScenes:
-    - {fileID: 102900000, guid: ebaa785ec5cfd50448e6b1fca17c280f, type: 3}
-    ColorSpace: -1
-    BuildPlatform: 44
-    GraphicsDevice: 4
-    XrSdk: 
-    StereoModes: 0
-    Reason: See https://fogbugz.unity3d.com/f/cases/1351595/

com.unity.visualeffectgraph/CHANGELOG.md

@@ -3,6 +3,9 @@ All notable changes to this package will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+## [13.0.0] - 2021-09-01
+### Fixed
+- Fix SDF Baker fail on PS4 & PS5 [Case 1351595](https://fogbugz.unity3d.com/f/cases/1351595/)
 
 ## [12.0.0] - 2021-01-11
 ### Added

com.unity.visualeffectgraph/Runtime/Utilities/SDF/MeshToSDFBaker.cs

@@ -52,6 +52,13 @@ private GraphicsBuffer
 
         internal static uint kMaxGridSize = 1 << 24;
 
+        //TODO: Use PLATFORM_UAVS_SEPARATE_TO_RTS (or equivalent) when it will be available
+#if (UNITY_PS4 || UNITY_PS5) && (!UNITY_EDITOR)
+        private static int kNbActualRT = 1;
+#else
+        private static int kNbActualRT = 0;
+#endif
+
         internal VFXRuntimeResources m_RuntimeResources;
 
         private struct Triangle
@@ -739,10 +746,10 @@ private void SecondDraw()
             for (var i = 0; i < 3; i++)
             {
                 m_Cmd.SetRenderTarget(m_RenderTextureViews[i]);
-                m_Cmd.SetRandomWriteTarget(3, m_TrianglesInVoxels, false);
-                m_Cmd.SetRandomWriteTarget(2, m_AccumCounterBuffer, false);
-                m_Cmd.SetViewProjectionMatrices(m_ViewMat[i], m_ProjMat[i]);
                 m_Cmd.ClearRenderTarget(true, true, Color.black, 1.0f);
+                m_Cmd.SetRandomWriteTarget(3 + kNbActualRT, m_TrianglesInVoxels, false);
+                m_Cmd.SetRandomWriteTarget(2 + kNbActualRT, m_AccumCounterBuffer, false);
+                m_Cmd.SetViewProjectionMatrices(m_ViewMat[i], m_ProjMat[i]);
                 m_Cmd.DrawProcedural(Matrix4x4.identity, m_Material[i], 1, MeshTopology.Triangles, nTriangles * 3);
             }
 
@@ -767,11 +774,11 @@ private void FirstDraw()
             {
                 m_Cmd.ClearRandomWriteTargets();
                 m_Cmd.SetRenderTarget(m_RenderTextureViews[i]);
-                m_Cmd.SetRandomWriteTarget(4, m_AabbBuffer, false);
-                m_Cmd.SetRandomWriteTarget(1, m_bufferVoxel, false);
-                m_Cmd.SetRandomWriteTarget(2, m_CounterBuffer, false);
-                m_Cmd.SetViewProjectionMatrices(m_ViewMat[i], m_ProjMat[i]);
                 m_Cmd.ClearRenderTarget(true, true, Color.black, 1.0f);
+                m_Cmd.SetRandomWriteTarget(4 + kNbActualRT, m_AabbBuffer, false);
+                m_Cmd.SetRandomWriteTarget(1 + kNbActualRT, m_bufferVoxel, false);
+                m_Cmd.SetRandomWriteTarget(2 + kNbActualRT, m_CounterBuffer, false);
+                m_Cmd.SetViewProjectionMatrices(m_ViewMat[i], m_ProjMat[i]);
                 m_Cmd.DrawProcedural(Matrix4x4.identity, m_Material[i], 0, MeshTopology.Triangles, nTriangles * 3);
             }
 

com.unity.visualeffectgraph/Shaders/SDFBaker/RayMapVoxelize.shader

@@ -20,12 +20,14 @@ Shader "Hidden/VoxelizeShader"
         float4 position : SV_POSITION;
         uint triangleID : TEXCOORD0;
     };
-    RWStructuredBuffer<float4> voxels : register(u1);
     StructuredBuffer<float4> vertices;
     StructuredBuffer<int> coordFlip;
+
+    RWStructuredBuffer<float4> voxels : register(u1);
     RWStructuredBuffer<float4> aabb : register(u4);
     RWStructuredBuffer<uint> counter : register(u2);
     RWStructuredBuffer<uint> triangleIDs : register(u3);
+
     int currentAxis;
 
     int dimX, dimY, dimZ;