Reworking the render passes.

Author: psuong

Core/Components/Render/OrthographicRenderFeature.cs

@@ -1,74 +1,8 @@
-using System.Collections.Generic;
-using Unity.Entities;
-using UnityEngine;
 using UnityEngine.Rendering;
 using UnityEngine.Rendering.Universal;
 
 namespace UGUIDots.Render {
 
-    public unsafe class OrthographicRenderPass : ScriptableRenderPass {
-
-        public unsafe struct RenderInstruction {
-            public SubmeshKeyElement* Start;
-            public MaterialPropertyBatch Batch;
-            public Mesh Mesh;
-        };
-
-        public Queue<RenderInstruction> RenderInstructions { get; private set; }
-
-        private string profilerTag;
-        private ProfilingSampler sampler;
-
-        public OrthographicRenderPass(OrthographicRenderSettings settings) {
-            profilerTag          = settings.ProfilerTag;
-            base.renderPassEvent = settings.RenderPassEvt;
-            RenderInstructions   = new Queue<RenderInstruction>();
-            sampler              = new ProfilingSampler(settings.ProfilerTag);
-        }
-
-        public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData) {
-            // Skip attempting to render the context if the camera is a RT camera
-            if (RenderInstructions.Count <= 0 || renderingData.cameraData.targetTexture) {
-                return;
-            }
-
-            var cmd = CommandBufferPool.Get(profilerTag);
-
-            using (new ProfilingScope(cmd, sampler)) {
-                context.ExecuteCommandBuffer(cmd);
-                cmd.Clear();
-
-                // Set the projection view matrix
-                var proj = Matrix4x4.Ortho(0, Screen.width, 0, Screen.height, -100f, 100f);
-                var view = Matrix4x4.TRS(Vector3.zero, Quaternion.identity, Vector3.one);
-                cmd.SetViewProjectionMatrices(view, proj);
-
-                var mgr = World.DefaultGameObjectInjectionWorld.EntityManager;
-
-                while (RenderInstructions.Count > 0) {
-                    var dequed = RenderInstructions.Dequeue();
-                    var keys   = dequed.Start;
-                    var mesh   = dequed.Mesh;
-                    var batch  = dequed.Batch.Value;
-
-                    for (int i = 0; i < mesh.subMeshCount; i++) {
-                        var matEntity = keys[i].MaterialEntity;
-
-                        // TODO: I would like for the data to already be there without this check - need to revise soon
-                        if (mgr.HasComponent<SharedMaterial>(matEntity)) {
-                            var mat  = mgr.GetComponentData<SharedMaterial>(matEntity).Value;
-                            var prop = batch[i];
-                            cmd.DrawMesh(mesh, Matrix4x4.identity, mat, i, -1, prop);
-                        }
-                    }
-                }
-            }
-
-            context.ExecuteCommandBuffer(cmd);
-            CommandBufferPool.Release(cmd);
-        }
-    }
-
     [System.Serializable]
     public class OrthographicRenderSettings {
         public string ProfilerTag;
@@ -90,6 +24,18 @@ public override void Create() {
             Pass.renderPassEvent = Settings.RenderPassEvt;
         }
 
+        public CommandBuffer InitCommandBuffer() {
+            if (Pass == null) {
+                Create();
+            }
+
+            return Pass.Init();
+        }
+
+        public void ReleaseCommandBuffer() {
+            Pass.Release();
+        }
+
         public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingData renderingData) {
             renderer.EnqueuePass(Pass);
         }

Core/Components/Render/OrthographicRenderPass.cs

@@ -0,0 +1,47 @@
+using UnityEngine.Rendering;
+using UnityEngine.Rendering.Universal;
+using UnityEngine;
+
+namespace UGUIDots.Render {
+
+    public class OrthographicRenderPass : ScriptableRenderPass {
+
+        private string profilerTag;
+        private ProfilingSampler sampler;
+
+        private CommandBuffer cmd;
+
+        public OrthographicRenderPass(OrthographicRenderSettings settings) {
+            base.renderPassEvent = settings.RenderPassEvt;
+            profilerTag          = settings.ProfilerTag;
+            sampler              = new ProfilingSampler(settings.ProfilerTag);
+
+            Debug.Log("Created");
+        }
+
+        public CommandBuffer Init() {
+            if (cmd != null) {
+                return cmd;
+            }
+
+            cmd = CommandBufferPool.Get(profilerTag);
+
+            return cmd;
+        }
+
+        public void Release() {
+            if (cmd != null) {
+                CommandBufferPool.Release(cmd);
+            }
+        }
+
+        public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData) {
+#if UNITY_EDITOR
+            if (cmd == null) {
+                return;
+            }
+#endif
+            context.ExecuteCommandBuffer(cmd);
+        }
+    }
+}

Core/Components/Render/OrthographicRenderPass.cs.meta

@@ -4,6 +4,7 @@
 namespace UGUIDots.Render {
 
     public class RenderCommand : IComponentData, IEquatable<RenderCommand> {
+
         public OrthographicRenderFeature RenderFeature;
 
         public bool Equals(RenderCommand other) {

Core/Components/Render/RenderCommand.cs

@@ -1,33 +1,42 @@
 using Unity.Entities;
 using Unity.Jobs;
 using UnityEngine;
-using static UGUIDots.Render.OrthographicRenderPass;
+using UnityEngine.Rendering;
 
 namespace UGUIDots.Render.Systems {
 
     [UpdateInGroup(typeof(MeshRenderGroup))]
     public class OrthographicRenderSystem : SystemBase {
 
-        private EntityQuery renderQuery, renderCommandQuery;
-        private OrthographicRenderFeature renderFeature;
-
-        protected override void OnCreate() {
-            renderQuery = GetEntityQuery(new EntityQueryDesc {
-                All = new [] { ComponentType.ReadOnly<SubmeshKeyElement>(), ComponentType.ReadOnly<Mesh>() }
-            });
-
-            renderCommandQuery = GetEntityQuery(new EntityQueryDesc {
-                All = new [] { ComponentType.ReadOnly<RenderCommand>() }
-            });
-        }
+#pragma warning disable 649
+        private CommandBuffer cmd;
+#pragma warning restore 649
 
         protected override void OnStartRunning() {
-            Entities.WithStoreEntityQueryInField(ref renderCommandQuery).ForEach((RenderCommand cmd) => {
-                renderFeature = cmd.RenderFeature;
+            Entities.ForEach((RenderCommand cmd) => {
+                this.cmd = cmd.RenderFeature.InitCommandBuffer();
             }).WithoutBurst().Run();
         }
 
         protected unsafe override void OnUpdate() {
+            cmd?.Clear();
+            Entities.ForEach((Mesh mesh, MaterialPropertyBatch batch, DynamicBuffer<SubmeshKeyElement> keys) => {
+                if (keys.Length == 0) { 
+                    return; 
+                }
+
+                for (int i = 0; i < mesh.subMeshCount; i++) {
+                    var materialKey = keys[i].MaterialEntity;
+                    var prop        = batch.Value[i];
+                    var mat         = EntityManager.GetComponentData<SharedMaterial>(materialKey).Value;
+
+                    // Debug.Log($"{cmd == null}, {mesh == null}, {batch.Value == null}, {keys.IsCreated}");
+
+                    cmd.DrawMesh(mesh, Matrix4x4.identity, mat, i, -1, prop);
+                }
+            }).WithoutBurst().Run();
+
+            /*
             Entities.WithStoreEntityQueryInField(ref renderQuery).
                 ForEach((Mesh mesh, MaterialPropertyBatch batch, DynamicBuffer<SubmeshKeyElement> keys) => {
                     renderFeature.Pass.RenderInstructions.Enqueue(new RenderInstruction {
@@ -37,6 +46,7 @@ protected unsafe override void OnUpdate() {
                     }
                 );
             }).WithoutBurst().Run();
+            */
         }
     }
 }

Core/Systems/Render/OrthographicRenderSystem.cs

@@ -10,14 +10,14 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3}
-  m_Name: URP Asset
+  m_Name: Default URP Pipeline
   m_EditorClassIdentifier: 
   k_AssetVersion: 5
   k_AssetPreviousVersion: 5
   m_RendererType: 1
   m_RendererData: {fileID: 0}
   m_RendererDataList:
-  - {fileID: 11400000, guid: 95c9b70d328f84047a847a2d7d71a924, type: 2}
+  - {fileID: 11400000, guid: e338f2be5c0c93840adc956486c9f34c, type: 2}
   m_DefaultRendererIndex: 0
   m_RequireDepthTexture: 0
   m_RequireOpaqueTexture: 0
@@ -44,6 +44,7 @@ MonoBehaviour:
   m_SupportsDynamicBatching: 0
   m_MixedLightingSupported: 1
   m_DebugLevel: 0
+  m_UseAdaptivePerformance: 1
   m_ColorGradingMode: 0
   m_ColorGradingLutSize: 32
   m_ShadowType: 1

Prefabs/2DRenderer_URP.asset

@@ -1,20 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!114 &-1372306941258236212
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ac620f9bc3a53f2478bc078f9d7082bd, type: 3}
-  m_Name: Orthographic Render Feature
-  m_EditorClassIdentifier: 
-  Settings:
-    ProfilerTag: Orthographic Render Pass
-    RenderPassEvt: 600
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -25,10 +10,11 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3}
-  m_Name: ForwardRenderer
+  m_Name: Default URP Pipeline_Renderer
   m_EditorClassIdentifier: 
   m_RendererFeatures:
-  - {fileID: -1372306941258236212}
+  - {fileID: 5773635822035489810}
+  m_RendererFeatureMap: 1254e5aa30132050
   postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
   shaders:
     blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3}
@@ -50,3 +36,20 @@ MonoBehaviour:
     passOperation: 0
     failOperation: 0
     zFailOperation: 0
+  m_ShadowTransparentReceive: 1
+--- !u!114 &5773635822035489810
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ac620f9bc3a53f2478bc078f9d7082bd, type: 3}
+  m_Name: UI Pass
+  m_EditorClassIdentifier: 
+  m_Active: 1
+  Settings:
+    ProfilerTag: Orthographic Render Pass
+    RenderPassEvt: 600