DOTS compatible error/loading shaders GFXHYR-308

TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BRGGameObjects/RenderBRG.cs

@@ -1,3 +1,8 @@
+#if UNITY_EDITOR
+//#define ENABLE_PICKING
+#endif
+//#define ENABLE_ERROR_LOADING_MATERIALS
+
 using System;
 using System.Collections.Generic;
 using Unity.Burst;
@@ -32,16 +37,21 @@ public struct DrawKey : IEquatable<DrawKey>
     public uint submeshIndex;
     public BatchMaterialID material;
     public ShadowCastingMode shadows;
+
+#if ENABLE_PICKING
     public int pickableObjectInstanceID;
+#endif
 
     public bool Equals(DrawKey other)
     {
         return
+#if ENABLE_PICKING
+            pickableObjectInstanceID == other.pickableObjectInstanceID &&
+#endif
             meshID == other.meshID &&
             submeshIndex == other.submeshIndex &&
             material == other.material &&
-            shadows == other.shadows &&
-            pickableObjectInstanceID == other.pickableObjectInstanceID;
+            shadows == other.shadows;
     }
 }
 
@@ -103,6 +113,8 @@ static float4 GetSHC(SphericalHarmonicsL2 sh)
 
 public unsafe class RenderBRG : MonoBehaviour
 {
+    public bool SetFallbackMaterialsOnStart = true;
+
     private BatchRendererGroup m_BatchRendererGroup;
     private GraphicsBuffer m_GPUPersistentInstanceData;
 
@@ -270,12 +282,12 @@ public void Execute()
                             flags = BatchDrawCommandFlags.None,
                             sortingPosition = 0
                         };
-
+#if ENABLE_PICKING
                         if (draws.drawCommandPickingInstanceIDs != null)
                         {
                             draws.drawCommandPickingInstanceIDs[outBatch] = drawBatches[remappedIndex].key.pickableObjectInstanceID;
                         }
-
+#endif
                         outBatch++;
                     }
 
@@ -330,6 +342,10 @@ public JobHandle OnPerformCulling(BatchRendererGroup rendererGroup, BatchCulling
             return new JobHandle();
         }
 
+#if ENABLE_PICKING
+        bool isPickingCulling = cullingContext.viewType == BatchCullingViewType.Picking;
+#endif
+
         var splitCounts = new NativeArray<int>(cullingContext.cullingSplits.Length, Allocator.TempJob, NativeArrayOptions.UninitializedMemory);
         for (int i = 0; i < splitCounts.Length; ++i)
         {
@@ -344,8 +360,10 @@ public JobHandle OnPerformCulling(BatchRendererGroup rendererGroup, BatchCulling
         drawCommands.drawCommands = Malloc<BatchDrawCommand>(m_drawBatches.Length *
             splitCounts.Length * 10); // TODO: Multiplying the DrawCommand count by splitCount*10 is NOT an conservative upper bound. But in practice is enough. Sorting would give us a real conservative bound...
 
-        drawCommands.drawCommandPickingInstanceIDs = Malloc<int>(m_drawBatches.Length);
         drawCommands.visibleInstances = Malloc<int>(m_instanceIndices.Length);
+#if ENABLE_PICKING
+        drawCommands.drawCommandPickingInstanceIDs = isPickingCulling ? Malloc<int>(m_drawBatches.Length) : null;
+#endif
 
         // Zero init: Culling job sets the values!
         drawCommands.drawRangeCount = 0;
@@ -385,10 +403,9 @@ public JobHandle OnPerformCulling(BatchRendererGroup rendererGroup, BatchCulling
         return jobHandleOutput;
     }
 
-#if UNITY_EDITOR
-    public static Material LoadPickingMaterial()
+    static Material LoadMaterialWithHideAndDontSave(string name)
     {
-        Shader shader = Shader.Find("Hidden/HDRP/BRGPicking");
+        Shader shader = Shader.Find(name);
 
         if (shader == null) return null;
 
@@ -400,18 +417,29 @@ public static Material LoadPickingMaterial()
         return material;
     }
 
-    Material m_pickingMaterial;
-#endif
-
+    Material m_PickingMaterial;
+    Material m_ErrorMaterial;
+    Material m_LoadingMaterial;
 
     // Start is called before the first frame update
     void Start()
     {
         m_BatchRendererGroup = new BatchRendererGroup(this.OnPerformCulling, IntPtr.Zero);
 
-#if UNITY_EDITOR
-        m_pickingMaterial = LoadPickingMaterial();
-        m_BatchRendererGroup.SetPickingMaterial(m_pickingMaterial);
+#if ENABLE_PICKING
+        m_PickingMaterial = LoadMaterialWithHideAndDontSave("Hidden/HDRP/BRGPicking");
+        m_BatchRendererGroup.SetPickingMaterial(m_PickingMaterial);
+#endif
+
+#if ENABLE_ERROR_LOADING_MATERIALS
+        if (SetFallbackMaterialsOnStart)
+        {
+            m_ErrorMaterial = LoadMaterialWithHideAndDontSave("Hidden/HDRP/MaterialError");
+            m_BatchRendererGroup.SetErrorMaterial(m_ErrorMaterial);
+
+            m_LoadingMaterial = LoadMaterialWithHideAndDontSave("Hidden/HDRP/MaterialLoading");
+            m_BatchRendererGroup.SetLoadingMaterial(m_LoadingMaterial);
+        }
 #endif
 
         // Create a batch...
@@ -502,13 +530,17 @@ void Start()
             renderer.GetSharedMaterials(sharedMaterials);
 
             var shadows = renderer.shadowCastingMode;
-            int instanceID = renderer.gameObject.GetInstanceID();
 
             for (int matIndex = 0; matIndex < sharedMaterials.Count; matIndex++)
             {
                 var material = m_BatchRendererGroup.RegisterMaterial(sharedMaterials[matIndex]);
 
-                var key = new DrawKey { material = material, meshID = mesh, submeshIndex = (uint)matIndex, shadows = shadows, pickableObjectInstanceID = instanceID };
+                var key = new DrawKey { material = material, meshID = mesh, submeshIndex = (uint)matIndex, shadows = shadows };
+
+#if ENABLE_PICKING
+                key.pickableObjectInstanceID = renderer.gameObject.GetInstanceID();
+#endif
+
                 var drawBatch = new DrawBatch
                 {
                     key = key,
@@ -681,9 +713,11 @@ private void OnDestroy()
             m_instanceIndices.Dispose();
             m_drawIndices.Dispose();
 
-#if UNITY_EDITOR
-            DestroyImmediate(m_pickingMaterial);
+#if ENABLE_PICKING
+            DestroyImmediate(m_PickingMaterial);
 #endif
+            DestroyImmediate(m_ErrorMaterial);
+            DestroyImmediate(m_LoadingMaterial);
         }
     }
 }