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

Author: JulienIgnace-Unity

Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.cs

@@ -1,6 +1,3 @@
-// Must be in sync with ShaderConfig.cs
-//#define VELOCITY_IN_GBUFFER
-
 using UnityEngine.Rendering;
 using UnityEngine.Experimental.Rendering;
 using System.Collections.Generic;
@@ -136,7 +133,6 @@ public void BindBuffers(Material mat)
         TextureSettings m_TextureSettings = TextureSettings.Default;
 
         // Various set of material use in render loop
-        Material m_DeferredMaterial;
         Material m_FinalPassMaterial;
         Material m_DebugViewMaterialGBuffer;
 
@@ -150,8 +146,7 @@ public void BindBuffers(Material mat)
         RenderTargetIdentifier m_CameraDepthBufferRT;
         RenderTargetIdentifier m_VelocityBufferRT;
         RenderTargetIdentifier m_DistortionBufferRT;
-
-
+		
         public class LightList
         {
             public List<DirectionalLightData> directionalLights;
@@ -237,8 +232,7 @@ public override void Rebuild()
 
             m_SkyRenderer = new SkyRenderer();
             m_SkyRenderer.Rebuild();
-        
-            m_DeferredMaterial   = Utilities.CreateEngineMaterial("Hidden/HDRenderLoop/Deferred");
+
             m_FinalPassMaterial  = Utilities.CreateEngineMaterial("Hidden/HDRenderLoop/FinalPass");
             m_DebugViewMaterialGBuffer = Utilities.CreateEngineMaterial("Hidden/HDRenderLoop/DebugViewMaterialGBuffer");
 
@@ -295,7 +289,6 @@ void OnDisable()
             m_SinglePassLightLoop.OnDisable();
             m_TilePassLightLoop.OnDisable();
 
-            Utilities.Destroy(m_DeferredMaterial);
             Utilities.Destroy(m_FinalPassMaterial);
             Utilities.Destroy(m_DebugViewMaterialGBuffer);
 
@@ -341,6 +334,7 @@ void InitAndClearBuffer(Camera camera, RenderLoop renderLoop)
                 Utilities.SetRenderTarget(renderLoop, m_CameraColorBufferRT, m_CameraDepthBufferRT, ClearFlag.ClearDepth);
             }
 
+
             // TEMP: As we are in development and have not all the setup pass we still clear the color in emissive buffer and gbuffer, but this will be removed later.
 
             // Clear HDR target
@@ -392,10 +386,10 @@ void RenderDepthPrepass(CullResults cull, Camera camera, RenderLoop renderLoop)
             if (!debugParameters.useDepthPrepass)
                 return;
 
-              // TODO: Must do opaque then alpha masked for performance! 
+            // TODO: Must do opaque then alpha masked for performance! 
             // TODO: front to back for opaque and by materal for opaque tested when we split in two
             Utilities.SetRenderTarget(renderLoop, m_CameraDepthBufferRT, "Depth Prepass");
-			RenderOpaqueRenderList(cull, camera, renderLoop, "DepthOnly");
+            RenderOpaqueRenderList(cull, camera, renderLoop, "DepthOnly");
         }
 
         void RenderGBuffer(CullResults cull, Camera camera, RenderLoop renderLoop)
@@ -437,11 +431,11 @@ void RenderDebugViewMaterial(CullResults cull, Camera camera, RenderLoop renderL
             // Render GBuffer opaque
             if (!debugParameters.useForwardRenderingOnly)
             {
-                Vector4 screenSize = ComputeScreenSize(camera);
+                Vector4 screenSize = Utilities.ComputeScreenSize(camera);
                 m_DebugViewMaterialGBuffer.SetVector("_ScreenSize", screenSize);
                 m_DebugViewMaterialGBuffer.SetFloat("_DebugViewMaterial", (float)debugParameters.debugViewMaterial);
 
-                // m_gbufferManager.BindBuffers(m_DeferredMaterial);
+                // m_gbufferManager.BindBuffers(m_DebugViewMaterialGBuffer);
                 // TODO: Bind depth textures
                 var cmd = new CommandBuffer { name = "GBuffer Debug Pass" };
                 cmd.Blit(null, m_CameraColorBufferRT, m_DebugViewMaterialGBuffer, 0);
@@ -463,21 +457,6 @@ void RenderDebugViewMaterial(CullResults cull, Camera camera, RenderLoop renderL
             }
         }
 
-        Matrix4x4 GetViewProjectionMatrix(Camera camera)
-        {
-            // The actual projection matrix used in shaders is actually massaged a bit to work across all platforms
-            // (different Z value ranges etc.)
-            var gpuProj = GL.GetGPUProjectionMatrix(camera.projectionMatrix, false);
-            var gpuVP = gpuProj * camera.worldToCameraMatrix;
-
-            return gpuVP;
-        }
-
-        Vector4 ComputeScreenSize(Camera camera)
-        {
-            return new Vector4(camera.pixelWidth, camera.pixelHeight, 1.0f / camera.pixelWidth, 1.0f / camera.pixelHeight);
-        }
-
         void RenderDeferredLighting(Camera camera, RenderLoop renderLoop)
         {
             if (debugParameters.useForwardRenderingOnly)
@@ -488,24 +467,14 @@ void RenderDeferredLighting(Camera camera, RenderLoop renderLoop)
             // Bind material data
             m_LitRenderLoop.Bind();
 
-            var invViewProj = GetViewProjectionMatrix(camera).inverse;
-            m_DeferredMaterial.SetMatrix("_InvViewProjMatrix", invViewProj);
-
-            var screenSize = ComputeScreenSize(camera);
-            m_DeferredMaterial.SetVector("_ScreenSize", screenSize);
-
-            // m_gbufferManager.BindBuffers(m_DeferredMaterial);
-            // TODO: Bind depth textures
-            var cmd = new CommandBuffer { name = "Deferred Ligthing Pass" };
-            cmd.Blit(null, m_CameraColorBufferRT, m_DeferredMaterial, 0);
-            renderLoop.ExecuteCommandBuffer(cmd);
-            cmd.Dispose();
+            m_SinglePassLightLoop.RenderDeferredLighting(camera, renderLoop, m_CameraColorBuffer);
+           // m_TilePassLightLoop.RenderDeferredLighting(camera, renderLoop, );
         }
 
         void RenderSky(Camera camera, RenderLoop renderLoop)
         {
             m_SkyRenderer.RenderSky(camera, m_SkyParameters, m_CameraColorBufferRT, m_CameraDepthBufferRT, renderLoop);
-            }
+        }
 
         void RenderForward(CullResults cullResults, Camera camera, RenderLoop renderLoop)
         {
@@ -683,10 +652,10 @@ void PrepareLightsForGPU(CullResults cullResults, Camera camera, ref ShadowOutpu
 
                     if (additionalData.archetype == LightArchetype.Rectangle)
                     {
-                    lightData.lightType = GPULightType.Rectangle;
-                }
-                else
-                {
+                        lightData.lightType = GPULightType.Rectangle;
+                    }
+                    else
+                    {
                         lightData.lightType = GPULightType.Line;
                     }
                 }
@@ -926,8 +895,6 @@ public override void Render(Camera[] cameras, RenderLoop renderLoop)
 
                     PushGlobalParams(camera, renderLoop, m_lightList);
 
-                    
-
                     RenderDeferredLighting(camera, renderLoop);
 
                     RenderSky(camera, renderLoop);

Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/Resources/Deferred.shader

@@ -19,6 +19,10 @@ Shader "Hidden/HDRenderLoop/Deferred"
             #pragma multi_compile LIGHTLOOP_SINGLE_PASS
             //#pragma multi_compile SHADOWFILTERING_FIXED_SIZE_PCF 
 
+        // TODO: This must be on lightloop side and include here....
+#pragma multi_compile USE_FPTL_LIGHTLIST    USE_CLUSTERED_LIGHTLIST
+#pragma multi_compile __ ENABLE_DEBUG
+
             //-------------------------------------------------------------------------------------
             // Include
             //-------------------------------------------------------------------------------------
@@ -71,7 +75,7 @@ Shader "Hidden/HDRenderLoop/Deferred"
                 Coordinate coord = GetCoordinate(unPositionSS.xy, _ScreenSize.zw);
 
                 // No need to manage inverse depth, this is handled by the projection matrix
-                float depth = _CameraDepthTexture.Load(uint3(coord.unPositionSS, 0)).x;
+                float depth = LOAD_TEXTURE2D(_CameraDepthTexture, uint3(coord.unPositionSS, 0)).x;
                 float3 positionWS = UnprojectToWorld(depth, coord.positionSS, _InvViewProjMatrix);
                 float3 V = GetWorldSpaceNormalizeViewDir(positionWS);
 

Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/SinglePass/SinglePass.cs

@@ -1,4 +1,5 @@
 using UnityEngine;
+using UnityEngine.Rendering;
 using UnityEngine.Experimental.Rendering;
 using System;
 
@@ -25,6 +26,8 @@ string GetKeyword()
             static ComputeBuffer s_PunctualShadowList;
             static ComputeBuffer s_DirectionalShadowList;
 
+            Material m_DeferredMaterial;
+
             void ClearComputeBuffers()
             {
                 if (s_DirectionalLights != null)
@@ -56,6 +59,8 @@ public void Rebuild()
                 s_AreaLightList = new ComputeBuffer(HDRenderLoop.k_MaxAreaLightsOnSCreen, System.Runtime.InteropServices.Marshal.SizeOf(typeof(LightData)));
                 s_EnvLightList = new ComputeBuffer(HDRenderLoop.k_MaxEnvLightsOnSCreen, System.Runtime.InteropServices.Marshal.SizeOf(typeof(EnvLightData)));
                 s_PunctualShadowList = new ComputeBuffer(HDRenderLoop.k_MaxShadowOnScreen, System.Runtime.InteropServices.Marshal.SizeOf(typeof(PunctualShadowData)));
+
+                m_DeferredMaterial = Utilities.CreateEngineMaterial("Hidden/HDRenderLoop/Deferred");
             }
 
             public void OnDisable()
@@ -72,6 +77,8 @@ public void OnDisable()
                 s_EnvLightList = null;
                 s_PunctualShadowList.Release();
                 s_PunctualShadowList = null;
+
+                Utilities.Destroy(m_DeferredMaterial);
             }
 
             public void PrepareLightsForGPU(CullResults cullResults, Camera camera, HDRenderLoop.LightList lightList) {}
@@ -96,8 +103,23 @@ public void PushGlobalParams(Camera camera, RenderLoop loop, HDRenderLoop.LightL
                 Shader.SetGlobalBuffer("_EnvLightList", s_EnvLightList);
                 Shader.SetGlobalInt("_EnvLightCount", lightList.envLights.Count);
 
-                Shader.SetGlobalVectorArray("_DirShadowSplitSpheres", lightList.directionalShadowSplitSphereSqr);
-                
+                Shader.SetGlobalVectorArray("_DirShadowSplitSpheres", lightList.directionalShadowSplitSphereSqr);      
+            }
+
+            public void RenderDeferredLighting(Camera camera, RenderLoop renderLoop, RenderTargetIdentifier colorBuffer)
+            {
+                var invViewProj = Utilities.GetViewProjectionMatrix(camera).inverse;
+                m_DeferredMaterial.SetMatrix("_InvViewProjMatrix", invViewProj);
+
+                var screenSize = Utilities.ComputeScreenSize(camera);
+                m_DeferredMaterial.SetVector("_ScreenSize", screenSize);
+
+                // m_gbufferManager.BindBuffers(m_DeferredMaterial);
+                // TODO: Bind depth textures
+                var cmd = new CommandBuffer { name = "Single Pass - Deferred Ligthing Pass" };
+                cmd.Blit(null, colorBuffer, m_DeferredMaterial, 0);
+                renderLoop.ExecuteCommandBuffer(cmd);
+                cmd.Dispose();
             }
         }
     }

Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/SinglePass/SinglePassLoop.hlsl

@@ -41,8 +41,16 @@ void LightLoop(	float3 V, float3 positionWS, PreLightData prelightData, BSDFData
     {
         float3 localDiffuseLighting, localSpecularLighting;
 
-        EvaluateBSDF_Area(context, V, positionWS, prelightData, _AreaLightList[i], bsdfData,
-                          localDiffuseLighting, localSpecularLighting);
+        if (_AreaLightList[i].lightType == GPULIGHTTYPE_LINE)
+        {
+            EvaluateBSDF_Line(context, V, positionWS, prelightData, _AreaLightList[i], bsdfData,
+                              localDiffuseLighting, localSpecularLighting);
+        }
+        else
+        {
+            EvaluateBSDF_Area(context, V, positionWS, prelightData, _AreaLightList[i], bsdfData,
+                              localDiffuseLighting, localSpecularLighting);
+        }
 
         diffuseLighting  += localDiffuseLighting;
         specularLighting += localSpecularLighting;

Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/TilePass/Resources/lightlistbuild-bigtile.compute

@@ -1,5 +1,6 @@
 #pragma kernel BigTileLightListGen
 
+#include "common.hlsl"
 #include "../TilePass.cs.hlsl"
 #include "../LightingConvexHullUtils.hlsl"
 #if !defined(SHADER_API_XBOXONE) && !defined(SHADER_API_PSSL)

Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/TilePass/Resources/lightlistbuild-clustered.compute

@@ -6,6 +6,7 @@
 #pragma kernel TileLightListGen_DepthRT_MSAA_SrcBigTile		LIGHTLISTGEN=TileLightListGen_DepthRT_MSAA_SrcBigTile		ENABLE_DEPTH_TEXTURE_BACKPLANE		MSAA_ENABLED		USE_TWO_PASS_TILED_LIGHTING
 #pragma kernel ClearAtomic
 
+#include "common.hlsl"
 #include "../ShaderBase.hlsl"
 #include "../TilePass.cs.hlsl"
 #include "../LightingConvexHullUtils.hlsl"

Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/TilePass/Resources/lightlistbuild.compute

@@ -4,6 +4,7 @@
 #pragma kernel TileLightListGen					LIGHTLISTGEN=TileLightListGen
 #pragma kernel TileLightListGen_SrcBigTile		LIGHTLISTGEN=TileLightListGen_SrcBigTile		USE_TWO_PASS_TILED_LIGHTING
 
+#include "common.hlsl"
 #include "../ShaderBase.hlsl"
 #include "../TilePass.cs.hlsl"
 #include "../LightingConvexHullUtils.hlsl"

Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/TilePass/Resources/scrbound.compute

@@ -3,6 +3,7 @@
 
 #pragma kernel ScreenBoundsAABB
 
+#include "common.hlsl"
 #include "../TilePass.cs.hlsl"
 
 uniform int g_iNrVisibLights;

Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/TilePass/ShaderBase.hlsl

@@ -19,12 +19,12 @@
 
 float FetchDepth(Texture2D depthTexture, uint2 pixCoord)
 {
-    return 1 - depthTexture.Load(uint3(pixCoord.xy, 0)).x;
+    return 1 - LOAD_TEXTURE2D(depthTexture, uint3(pixCoord.xy, 0)).x;
 }
 
 float FetchDepthMSAA(Texture2DMS<float> depthTexture, uint2 pixCoord, uint sampleIdx)
 {
-    return 1 - depthTexture.Load(uint3(pixCoord.xy, 0), sampleIdx).x;
+    return 1 - LOAD_TEXTURE2D_MSAA(depthTexture, uint3(pixCoord.xy, 0), sampleIdx).x;
 }
 
 #endif