HDRenderLoop: Enable linearLighting and CCT + rename rebuild to build

Author: sebastienlagarde

Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.cs

@@ -152,10 +152,14 @@ public TextureSettings textureSettings
         RenderTargetIdentifier m_DistortionBufferRT;
 
         // Detect when windows size is changing
-        int m_WidthOnRecord;
-        int m_HeightOnRecord;
+        int m_currentWidth;
+        int m_currentHeight;
 
-        // This must be allocate outside of Rebuild() else the option in the class can't be set in the inspector (as it will in this case recreate the class with default value)
+        // Keep these settings safe to recover when leaving the render pipeline
+        bool previousLightsUseLinearIntensity;
+        bool previousLightsUseCCT;
+
+        // This must be allocate outside of Build() else the option in the class can't be set in the inspector (as it will in this case recreate the class with default value)
         BaseLightLoop m_lightLoop = new TilePass.LightLoop();
 
         public BaseLightLoop lightLoop
@@ -164,7 +168,7 @@ public BaseLightLoop lightLoop
         }
 
         // TODO: Find a way to automatically create/iterate through deferred material
-        // 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 ?
+        // TODO TO CHECK: SebL I move allocation from Build() 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 override void Build()
@@ -175,6 +179,10 @@ public override void Build()
                 reflectionProbe = UnityEditor.SupportedRenderingFeatures.ReflectionProbe.Rotation
             };
 #endif
+            previousLightsUseLinearIntensity = UnityEngine.Rendering.GraphicsSettings.lightsUseLinearIntensity;
+            previousLightsUseCCT = UnityEngine.Rendering.GraphicsSettings.lightsUseCCT;
+            UnityEngine.Rendering.GraphicsSettings.lightsUseLinearIntensity = true;
+            UnityEngine.Rendering.GraphicsSettings.lightsUseCCT = true;
 
             m_CameraColorBuffer = Shader.PropertyToID("_CameraColorTexture");
             m_CameraDepthBuffer  = Shader.PropertyToID("_CameraDepthTexture");
@@ -183,7 +191,7 @@ public override void Build()
             m_CameraDepthBufferRT = new RenderTargetIdentifier(m_CameraDepthBuffer);
 
             m_SkyRenderer = new SkyRenderer();
-            m_SkyRenderer.Rebuild();
+            m_SkyRenderer.Build();
 
             m_FinalPassMaterial  = Utilities.CreateEngineMaterial("Hidden/HDRenderLoop/FinalPass");
             m_DebugViewMaterialGBuffer = Utilities.CreateEngineMaterial("Hidden/HDRenderLoop/DebugViewMaterialGBuffer");
@@ -215,15 +223,15 @@ public override void Build()
             m_DistortionBuffer = Shader.PropertyToID("_DistortionTexture");
             m_DistortionBufferRT = new RenderTargetIdentifier(m_DistortionBuffer);
 
-            m_LitRenderLoop.Rebuild();
-            m_lightLoop.Rebuild(m_TextureSettings);
+            m_LitRenderLoop.Build();
+            m_lightLoop.Build(m_TextureSettings);
         }
 
         public override void Cleanup()
         {
-            m_LitRenderLoop.Cleanup();
             m_lightLoop.Cleanup();
-
+            m_LitRenderLoop.Cleanup();
+ 
             Utilities.Destroy(m_FinalPassMaterial);
             Utilities.Destroy(m_DebugViewMaterialGBuffer);
 
@@ -235,6 +243,8 @@ public override void Cleanup()
 #if UNITY_EDITOR
             UnityEditor.SupportedRenderingFeatures.active = UnityEditor.SupportedRenderingFeatures.Default;
 #endif
+            UnityEngine.Rendering.GraphicsSettings.lightsUseLinearIntensity = previousLightsUseLinearIntensity;
+            UnityEngine.Rendering.GraphicsSettings.lightsUseCCT = previousLightsUseCCT;
         }
 
         void InitAndClearBuffer(Camera camera, RenderLoop renderLoop)
@@ -562,18 +572,18 @@ void Resize(Camera camera)
             // For now consider we have only one camera that go to this code, the main one.
             m_SkyRenderer.Resize(m_SkyParameters); // TODO: Also a bad naming, here we just want to realloc texture if skyparameters change (usefull for lookdev)
 
-            if (camera.pixelWidth != m_WidthOnRecord || camera.pixelHeight != m_HeightOnRecord || m_lightLoop.NeedResize())
+            if (camera.pixelWidth != m_currentWidth || camera.pixelHeight != m_currentHeight || m_lightLoop.NeedResize())
             {
-                if (m_WidthOnRecord > 0 && m_HeightOnRecord > 0)
+                if (m_currentWidth > 0 && m_currentHeight > 0)
                 {
                     m_lightLoop.ReleaseResolutionDependentBuffers();
                 }
 
                 m_lightLoop.AllocResolutionDependentBuffers(camera.pixelWidth, camera.pixelHeight);
 
                 // update recorded window resolution
-                m_WidthOnRecord = camera.pixelWidth;
-                m_HeightOnRecord = camera.pixelHeight;
+                m_currentWidth = camera.pixelWidth;
+                m_currentHeight = camera.pixelHeight;
             }
         }
 

Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/LightLoop.cs

@@ -8,7 +8,7 @@ namespace UnityEngine.Experimental.ScriptableRenderLoop
     public class BaseLightLoop
     {
         // TODO: We should rather put the texture settings in LightLoop, but how do we serialize it ?
-        public virtual void Rebuild(TextureSettings textureSettings) {}
+        public virtual void Build(TextureSettings textureSettings) {}
 
         public virtual void Cleanup() {}
 
@@ -22,7 +22,7 @@ public virtual void NewFrame() {}
 
         public virtual void PrepareLightsForGPU(CullResults cullResults, Camera camera, ref ShadowOutput shadowOutput) { }
 
-        // TODO: this should not be aprt of the interface but for now make something working
+        // TODO: this should not be part of the interface but for now make something working
         public virtual void BuildGPULightLists(Camera camera, RenderLoop loop, RenderTargetIdentifier cameraDepthBufferRT) { }
 
         public virtual void PushGlobalParams(Camera camera, RenderLoop loop) {}

Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/TilePass/TilePass.cs

@@ -166,7 +166,7 @@ public void Allocate()
             public int debugViewTilesFlags = 0;
             public bool enableClustered = false;
             public bool disableFptlWhenClustered = true;    // still useful on opaques. Should be false by default to force tile on opaque.
-            public bool enableBigTilePrepass = true;
+            public bool enableBigTilePrepass = false;
             const bool k_UseDepthBuffer = true;      // only has an impact when EnableClustered is true (requires a depth-prepass)
             const bool k_UseAsyncCompute = true;        // should not use on mobile
 
@@ -209,7 +209,7 @@ int GetNumTileY(Camera camera)
                 return (camera.pixelHeight + (k_TileSize - 1)) / k_TileSize;
             }
 
-            public override void Rebuild(TextureSettings textureSettings)
+            public override void Build(TextureSettings textureSettings)
             {
                 m_lightList = new LightList();
                 m_lightList.Allocate();

Assets/ScriptableRenderLoop/HDRenderLoop/Material/Lit/Lit.cs

@@ -242,7 +242,7 @@ Texture2D LoadLUT(TextureFormat format, float[] LtcGGXMagnitudeData,
                 return CreateLUT(k_LtcLUTResolution, k_LtcLUTResolution, format, pixels);
             }            
 
-            public void Rebuild()
+            public void Build()
             {
                 m_InitPreFGD = CreateEngineMaterial("Hidden/HDRenderLoop/PreIntegratedFGD");
                 m_PreIntegratedFGD = new RenderTexture(128, 128, 0, RenderTextureFormat.ARGBHalf);
@@ -260,7 +260,7 @@ public void Cleanup()
             {
                 Utilities.Destroy(m_InitPreFGD);
 
-                // TODO: how to delete RenderTexture ?
+                // TODO: how to delete RenderTexture ? or do we need to do it ?
                 isInit = false;
             }
 

Assets/ScriptableRenderLoop/HDRenderLoop/Sky/SkyRenderer.cs

@@ -140,7 +140,7 @@ public void Resize(SkyParameters skyParameters)
             RebuildTextures(skyParameters);
         }
 
-        public void Rebuild()
+        public void Build()
         {
             // TODO: We need to have an API to send our sky information to Enlighten. For now use a workaround through skybox/cubemap material...
             m_StandardSkyboxMaterial = Utilities.CreateEngineMaterial("Skybox/Cubemap");