Merge pull request #37 from Unity-Technologies/scriptablerenderloop-graphicssettings

Scriptablerenderloop graphicssettings

Author: phi-lira

Assets/BasicRenderLoopTutorial/BasicRenderLoop.cs

@@ -24,14 +24,12 @@ static void CreateBasicRenderLoop()
 
     private ShaderPassName shaderPassBasic;
 
-    public void OnEnable()
+    public override void Build()
     {
-        Rebuild();
     }
 
-    public override void Initialize()
+    public override void Cleanup()
     {
-        shaderPassBasic = new ShaderPassName("BasicPass");
     }
 
     // Main entry point for our scriptable render loop
@@ -59,7 +57,7 @@ public override void Render(Camera[] cameras, RenderLoop loop)
             SetupLightShaderVariables (cull.visibleLights, loop);
 
             // Draw opaque objects using BasicPass shader pass
-            var settings = new DrawRendererSettings (cull, camera, shaderPassBasic);
+            var settings = new DrawRendererSettings (cull, camera, new ShaderPassName("BasicPass"));
             settings.sorting.flags = SortFlags.CommonOpaque;
             settings.inputFilter.SetQueuesOpaque ();
             loop.DrawRenderers (ref settings);

Assets/Editor/Tests/RenderloopTests/RenderloopTestFixture.cs

@@ -32,6 +32,16 @@ public override void Render(Camera[] cameras, RenderLoop renderLoop)
         renderLoop.Submit();
     }
 
+    public override void Build()
+    {
+        
+    }
+
+    public override void Cleanup()
+    {
+        
+    }
+
     public static void Run(TestDelegate renderCallback)
     {
         if (m_Instance == null)

Assets/ScriptableRenderLoop/HDRenderLoop/Editor/HDRenderLoopInspector.cs

@@ -287,8 +287,8 @@ private void TilePassUI(HDRenderLoop renderLoop)
                 {
                     EditorUtility.SetDirty(renderLoop); // Repaint
 
-                    // If something is chanage regarding tile/cluster rendering we need to force a OnValidate() OnHDRenderLoop, else change Rebuild() will not be call
-                    renderLoop.OnValidate();
+                    // SetAssetDirty will tell renderloop to rebuild
+                    renderLoop.SetAssetDirty();
                 }
 
                 EditorGUI.BeginChangeCheck();

Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.cs

@@ -146,8 +146,6 @@ public TextureSettings textureSettings
         int m_VelocityBuffer;
         int m_DistortionBuffer;
 
-        public bool m_Dirty = false;
-
         RenderTargetIdentifier m_CameraColorBufferRT;
         RenderTargetIdentifier m_CameraDepthBufferRT;
         RenderTargetIdentifier m_VelocityBufferRT;
@@ -169,19 +167,14 @@ public BaseLightLoop lightLoop
         // TODO TO CHECK: SebL I move allocation from Rebuild() to here, but there was a comment "// Our object can be garbage collected, so need to be allocate here", it is still true ?
         Lit.RenderLoop m_LitRenderLoop = new Lit.RenderLoop();
 
-        public void OnValidate()
-        {
-            // Calling direction Rebuild() here cause this warning:
-            // "SendMessage cannot be called during Awake, CheckConsistency, or OnValidate UnityEngine.Experimental.ScriptableRenderLoop.HDRenderLoop:OnValidate()"
-            // Workaround is to declare this dirty flag and call REbuild in Render()
-            m_Dirty = true;
-        }
-
-        public override void Rebuild()
+        public override void Build()
         {
-            // We call Cleanup() here because Rebuild() can be call by OnValidate(), i.e when inspector is touch
-            // Note that module don't need to do the same as the call here is propagated correctly
-            Cleanup();
+#if UNITY_EDITOR
+            UnityEditor.SupportedRenderingFeatures.active = new UnityEditor.SupportedRenderingFeatures
+            {
+                reflectionProbe = UnityEditor.SupportedRenderingFeatures.ReflectionProbe.Rotation
+            };
+#endif
 
             m_CameraColorBuffer = Shader.PropertyToID("_CameraColorTexture");
             m_CameraDepthBuffer  = Shader.PropertyToID("_CameraDepthTexture");
@@ -224,20 +217,6 @@ public override void Rebuild()
 
             m_LitRenderLoop.Rebuild();
             m_lightLoop.Rebuild(m_TextureSettings);
-
-            m_Dirty = false;
-        }
-
-        public override void Initialize()
-        {
-#if UNITY_EDITOR
-            UnityEditor.SupportedRenderingFeatures.active = new UnityEditor.SupportedRenderingFeatures
-            {
-                reflectionProbe = UnityEditor.SupportedRenderingFeatures.ReflectionProbe.Rotation
-            };
-#endif
-
-            Rebuild();
         }
 
         public override void Cleanup()
@@ -615,11 +594,6 @@ public void PushGlobalParams(Camera camera, RenderLoop renderLoop)
 
         public override void Render(Camera[] cameras, RenderLoop renderLoop)
         {
-            if (m_Dirty)
-            {
-                Rebuild();
-            }
-
             if (!m_LitRenderLoop.isInit)
             {
                 m_LitRenderLoop.RenderInit(renderLoop);

Assets/ScriptableRenderLoop/fptl/FptlLighting.cs

@@ -113,19 +113,8 @@ static void CreateRenderLoopFPTL()
         private Texture2D m_LightAttentuationTexture;
         private int m_shadowBufferID;
 
-        private void OnValidate()
-        {
-            Rebuild();
-        }
-
-        public override void Initialize()
-        {
-            Rebuild();
-        }
-
         public override void Cleanup()
         {
-            // RenderLoop.renderLoopDelegate -= ExecuteRenderLoop;
             if (m_DeferredMaterial) DestroyImmediate(m_DeferredMaterial);
             if (m_DeferredReflectionMaterial) DestroyImmediate(m_DeferredReflectionMaterial);
             if (m_BlitMaterial) DestroyImmediate(m_BlitMaterial);
@@ -174,10 +163,8 @@ void ClearComputeBuffers()
             }
         }
 
-        public override void Rebuild()
+        public override void Build()
         {
-            ClearComputeBuffers();
-
             s_GBufferAlbedo = Shader.PropertyToID("_CameraGBufferTexture0");
             s_GBufferSpecRough = Shader.PropertyToID("_CameraGBufferTexture1");
             s_GBufferNormal = Shader.PropertyToID("_CameraGBufferTexture2");