Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop

Author: sebastienlagarde

Assets/BasicRenderLoopTutorial/BasicRenderLoop.cs

@@ -1,7 +1,6 @@
 using UnityEngine;
 using UnityEngine.Rendering;
 using UnityEngine.Experimental.Rendering;
-using UnityEngine.Experimental.ScriptableRenderLoop;
 
 // Very basic scriptable rendering loop example:
 // - Use with BasicRenderLoopShader.shader (the loop expects "BasicPass" pass type to exist)
@@ -11,7 +10,7 @@
 // - This loop also does not setup lightmaps, light probes, reflection probes or light cookies
 
 [ExecuteInEditMode]
-public class BasicRenderLoop : ScriptableRenderLoop
+public class BasicRenderLoop : RenderPipeline
 {
 
 #if UNITY_EDITOR

Assets/Editor/Tests/RenderloopTests/RenderloopTestFixture.cs

@@ -8,7 +8,7 @@
 using UnityEngine.Rendering;
 
 [ExecuteInEditMode]
-public class RenderLoopTestFixture : ScriptableRenderLoop
+public class RenderLoopTestFixture : RenderPipeline
 {
     public delegate void TestDelegate(Camera camera, CullResults cullResults, RenderLoop renderLoop);
     private static TestDelegate s_Callback;
@@ -42,7 +42,7 @@ public static void Run(TestDelegate renderCallback)
         var sceneCamera = Camera.main;
         var camObject = sceneCamera.gameObject;
 
-        GraphicsSettings.SetScriptableRenderLoop(m_Instance);
+        GraphicsSettings.SetRenderPipeline(m_Instance);
         s_Callback = renderCallback;
         Transform t = camObject.transform;
 
@@ -53,6 +53,6 @@ public static void Run(TestDelegate renderCallback)
         SceneView.lastActiveSceneView.LookAtDirect(t.position + t.forward * camDist, t.rotation, size);
 
         sceneCamera.Render();
-        GraphicsSettings.SetScriptableRenderLoop(null);
+        GraphicsSettings.SetRenderPipeline(null);
     }
 }

Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.cs

@@ -7,7 +7,7 @@ namespace UnityEngine.Experimental.ScriptableRenderLoop
 {
     [ExecuteInEditMode]
     // This HDRenderLoop assume linear lighting. Don't work with gamma.
-    public partial class HDRenderLoop : ScriptableRenderLoop
+    public partial class HDRenderLoop : RenderPipeline
     {
         const string k_HDRenderLoopPath = "Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.asset";
 
@@ -226,17 +226,9 @@ public TilePass.LightLoop tilePassLightLoop
         TextureCache2D m_CookieTexArray;
         TextureCacheCubemap m_CubeCookieTexArray;
 
-        private void OnEnable()
+        private void OnValidate()
         {
-            // TODO: Design workaround for OnValidate being missing on ScriptableObject
             m_Dirty = true;
-            Rebuild();
-        }
-
-        private void OnDisable()
-        {
-            // TODO: Rework ScriptableRenderLoop Lifecycle 
-            //CleanUp();
         }
 
         public override void Rebuild()
@@ -314,7 +306,7 @@ public override void Initialize()
             Rebuild();
         }
 
-        public override void CleanUp()
+        public override void Cleanup()
         {
             m_LitRenderLoop.OnDisable();
             m_SinglePassLightLoop.OnDisable();

Assets/ScriptableRenderLoop/fptl/FptlLighting.cs

@@ -6,7 +6,7 @@
 namespace UnityEngine.Experimental.ScriptableRenderLoop
 {
     [ExecuteInEditMode]
-    public class FptlLighting : ScriptableRenderLoop
+    public class FptlLighting : RenderPipeline
     {
 #if UNITY_EDITOR
         [UnityEditor.MenuItem("Renderloop/CreateRenderLoopFPTL")]
@@ -113,23 +113,17 @@ static void CreateRenderLoopFPTL()
         private Texture2D m_LightAttentuationTexture;
         private int m_shadowBufferID;
 
-        public override void Initialize()
+        private void OnValidate()
         {
             Rebuild();
         }
 
-        private void OnEnable()
+        public override void Initialize()
         {
             Rebuild();
         }
 
-        private void OnDisable()
-        {
-            // TODO: Rework ScriptableRenderLoop Lifecycle
-            //CleanUp();
-        }
-
-        public override void CleanUp()
+        public override void Cleanup()
         {
             // RenderLoop.renderLoopDelegate -= ExecuteRenderLoop;
             if (m_DeferredMaterial) DestroyImmediate(m_DeferredMaterial);