Merge pull request #35 from Unity-Technologies/Fix-Tiled-lighting

HDRenderLoop: Fix issue with tiled lighting, now working as before the refactor

Author: sebastienlagarde

Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.cs

@@ -685,7 +685,8 @@ public override void Render(Camera[] cameras, RenderLoop renderLoop)
                     }
                     RenderDeferredLighting(camera, renderLoop);
 
-                    RenderForward(cullResults, camera, renderLoop, true);
+                    // TODO: enable this for tile forward opaque
+               //     RenderForward(cullResults, camera, renderLoop, true);
 
                     RenderSky(camera, renderLoop);
 

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

@@ -149,7 +149,7 @@ public void Allocate()
             static int s_GenListPerTileKernel;
             static int s_GenListPerVoxelKernel;
             static int s_ClearVoxelAtomicKernel;
-            static ComputeBuffer s_LigthVolumeDataBuffer = null;
+            static ComputeBuffer s_LightVolumeDataBuffer = null;
             static ComputeBuffer s_ConvexBoundsBuffer = null;
             static ComputeBuffer s_AABBBoundsBuffer = null;
             static ComputeBuffer s_LightList = null;
@@ -235,11 +235,11 @@ public override void Rebuild(TextureSettings textureSettings)
                 s_GenListPerTileKernel = buildPerTileLightListShader.FindKernel(enableBigTilePrepass ? "TileLightListGen_SrcBigTile" : "TileLightListGen");
                 s_AABBBoundsBuffer = new ComputeBuffer(2 * k_MaxLightsOnSCreen, 3 * sizeof(float));
                 s_ConvexBoundsBuffer = new ComputeBuffer(k_MaxLightsOnSCreen, System.Runtime.InteropServices.Marshal.SizeOf(typeof(SFiniteLightBound)));
-                s_LigthVolumeDataBuffer = new ComputeBuffer(k_MaxLightsOnSCreen, System.Runtime.InteropServices.Marshal.SizeOf(typeof(LightVolumeData)));
+                s_LightVolumeDataBuffer = new ComputeBuffer(k_MaxLightsOnSCreen, System.Runtime.InteropServices.Marshal.SizeOf(typeof(LightVolumeData)));
 
                 buildScreenAABBShader.SetBuffer(s_GenAABBKernel, "g_data", s_ConvexBoundsBuffer);
                 buildPerTileLightListShader.SetBuffer(s_GenListPerTileKernel, "g_vBoundsBuffer", s_AABBBoundsBuffer);
-                buildPerTileLightListShader.SetBuffer(s_GenListPerTileKernel, "_LigthVolumeData", s_LigthVolumeDataBuffer);
+                buildPerTileLightListShader.SetBuffer(s_GenListPerTileKernel, "_LightVolumeData", s_LightVolumeDataBuffer);
                 buildPerTileLightListShader.SetBuffer(s_GenListPerTileKernel, "g_data", s_ConvexBoundsBuffer);
 
                 if (enableClustered)
@@ -248,7 +248,7 @@ public override void Rebuild(TextureSettings textureSettings)
                     s_GenListPerVoxelKernel = buildPerVoxelLightListShader.FindKernel(kernelName);
                     s_ClearVoxelAtomicKernel = buildPerVoxelLightListShader.FindKernel("ClearAtomic");
                     buildPerVoxelLightListShader.SetBuffer(s_GenListPerVoxelKernel, "g_vBoundsBuffer", s_AABBBoundsBuffer);
-                    buildPerVoxelLightListShader.SetBuffer(s_GenListPerVoxelKernel, "_LigthVolumeData", s_LigthVolumeDataBuffer);
+                    buildPerVoxelLightListShader.SetBuffer(s_GenListPerVoxelKernel, "_LightVolumeData", s_LightVolumeDataBuffer);
                     buildPerVoxelLightListShader.SetBuffer(s_GenListPerVoxelKernel, "g_data", s_ConvexBoundsBuffer);
 
                     s_GlobalLightListAtomic = new ComputeBuffer(1, sizeof(uint));
@@ -258,7 +258,7 @@ public override void Rebuild(TextureSettings textureSettings)
                 {
                     s_GenListPerBigTileKernel = buildPerBigTileLightListShader.FindKernel("BigTileLightListGen");
                     buildPerBigTileLightListShader.SetBuffer(s_GenListPerBigTileKernel, "g_vBoundsBuffer", s_AABBBoundsBuffer);
-                    buildPerBigTileLightListShader.SetBuffer(s_GenListPerBigTileKernel, "_LigthVolumeData", s_LigthVolumeDataBuffer);
+                    buildPerBigTileLightListShader.SetBuffer(s_GenListPerBigTileKernel, "_LightVolumeData", s_LightVolumeDataBuffer);
                     buildPerBigTileLightListShader.SetBuffer(s_GenListPerBigTileKernel, "g_data", s_ConvexBoundsBuffer);
                 }
 
@@ -315,7 +315,7 @@ public override void Cleanup()
 
                 Utilities.SafeRelease(s_AABBBoundsBuffer);
                 Utilities.SafeRelease(s_ConvexBoundsBuffer);
-                Utilities.SafeRelease(s_LigthVolumeDataBuffer);
+                Utilities.SafeRelease(s_LightVolumeDataBuffer);
 
                 // enableClustered
                 Utilities.SafeRelease(s_GlobalLightListAtomic);
@@ -1140,7 +1140,7 @@ public override void PushGlobalParams(Camera camera, RenderLoop loop)
 
                 // These two buffers have been set in Rebuild()
                 s_ConvexBoundsBuffer.SetData(m_lightList.bounds.ToArray());
-                s_LigthVolumeDataBuffer.SetData(m_lightList.lightVolumes.ToArray());
+                s_LightVolumeDataBuffer.SetData(m_lightList.lightVolumes.ToArray());
 
                 Shader.SetGlobalBuffer("_DirectionalLightDatas", s_DirectionalLightDatas);
                 Shader.SetGlobalInt("_DirectionalLightCount", m_lightList.directionalLights.Count);
@@ -1259,7 +1259,7 @@ public override void RenderDeferredLighting(Camera camera, RenderLoop renderLoop
                         cmd.SetComputeTextureParam(deferredComputeShader, kernel, "_LightTextureB0", m_LightAttentuationTexture);
 
                         cmd.SetComputeBufferParam(deferredComputeShader, kernel, "g_vLightListGlobal", bUseClusteredForDeferred ? s_PerVoxelLightLists : s_LightList);
-                        cmd.SetComputeBufferParam(deferredComputeShader, kernel, "_LigthVolumeData", s_LigthVolumeDataBuffer);
+                        cmd.SetComputeBufferParam(deferredComputeShader, kernel, "_LightVolumeData", s_LightVolumeDataBuffer);
                         cmd.SetComputeBufferParam(deferredComputeShader, kernel, "g_dirLightData", s_DirLightList);
 
                         var defdecode = ReflectionProbe.GetDefaultTextureHDRDecodeValues();
@@ -1382,4 +1382,4 @@ public override void RenderForward(Camera camera, RenderLoop renderLoop, bool re
             }
         }
     }
-}
+}

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

@@ -199,9 +199,8 @@ void LightLoop( float3 V, float3 positionWS, Coordinate coord, PreLightData prel
     specularLighting += iblSpecularLighting;
 #endif
 
-    // TODO: HACK: to avoid the message Fragment program 'Frag': sampler 'sampler_PreIntegratedFGD' has no matching texture and will be undefined.
-    // we sample the GI during direct lighting, so FGD texture is used...
-#ifdef LIGHTLOOP_TILE_DIRECT
+    // TODO: currently apply GI at the same time as reflection
+#ifdef PROCESS_ENV_LIGHT
     // Add indirect diffuse + emissive (if any)
     diffuseLighting += bakeDiffuseLighting;
 #endif
@@ -299,4 +298,4 @@ void LightLoop( float3 V, float3 positionWS, Coordinate coord, PreLightData prel
     diffuseLighting += bakeDiffuseLighting;
 }
 
-#endif
+#endif

Assets/ScriptableRenderLoop/HDRenderLoop/Material/LayeredLit/LayeredLit.shader

@@ -467,7 +467,7 @@ Shader "HDRenderLoop/LayeredLit"
             #define SHADERPASS SHADERPASS_FORWARD
             // TEMP until pragma work in include
             // #include "../../Lighting/Forward.hlsl"
-            #pragma multi_compile LIGHTLOOP_SINGLE_PASS
+            #pragma multi_compile LIGHTLOOP_SINGLE_PASS LIGHTLOOP_TILE_PASS
             #define LAYERED_LIT_SHADER
             //#pragma multi_compile SHADOWFILTERING_FIXED_SIZE_PCF
 

Assets/ScriptableRenderLoop/HDRenderLoop/Material/Lit/Lit.hlsl

@@ -40,7 +40,9 @@
 
 // TODO: I haven't configure this sampler in the code, we should be able to do it (but Unity don't allow it for now...)
 // By default Unity provide MIG_MAG_LINEAR_POINT sampler, so it fit with our need.
-#ifdef LIT_DISPLAY_REFERENCE_IBL
+// TODO: to avoid the message Fragment program 'Frag' : sampler 'sampler_PreIntegratedFGD' has no matching texture and will be undefined.
+// We need to test this define LIGHTLOOP_TILE_DIRECT, this is a bad workaround but no alternative until we can setup sampler correctly...
+#if defined(LIT_DISPLAY_REFERENCE_IBL) || defined(LIGHTLOOP_TILE_DIRECT)
 // When reference mode is enabled, then we need to chose another sampler not related to cubemap code...
 SAMPLER2D(sampler_LtcGGXMatrix);
 #define SRL_BilinearSampler sampler_LtcGGXMatrix // Used for all textures