HDRenderLoop: Version that compile and display something

Author: sebastienlagarde

Assets/ScriptableRenderLoop/HDRenderLoop/Debug/Resources/DebugViewTiles.shader

@@ -101,7 +101,7 @@ Shader "Hidden/HDRenderLoop/DebugViewTiles"
                 #endif
 
                 int n = 0;
-                for(int category = 0; category < NR_LIGHT_CATEGORIES; category++)
+                for(int category = 0; category < LIGHTCATEGORY_COUNT; category++)
                 {
                     uint mask = 1u << category;
                     uint start;

Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.asset

@@ -28,3 +28,4 @@ MonoBehaviour:
     spotCookieSize: 128
     pointCookieSize: 512
     reflectionCubemapSize: 128
+  m_Dirty: 0

Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.asset.meta

@@ -17,11 +17,9 @@
 #define HAS_LIGHTLOOP // Allow to not define LightLoop related function in Material.hlsl
 
 #include "Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/LightDefinition.cs.hlsl"
-
-#ifdef LIGHTLOOP_SINGLE_PASS
-#include "Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/SinglePass/SinglePass.hlsl"
 #include "Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/LightUtilities.hlsl"
-#elif defined(LIGHTLOOP_TILE_PASS)
+
+#if defined(LIGHTLOOP_SINGLE_PASS) || defined(LIGHTLOOP_TILE_PASS)
 #include "Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/TilePass/TilePass.hlsl"
 #endif
 
@@ -30,9 +28,7 @@
 #include "Assets/ScriptableRenderLoop/HDRenderLoop/Material/Material.hlsl"
 
 // LightLoop use evaluation BSDF function for light type define in Material.hlsl
-#ifdef LIGHTLOOP_SINGLE_PASS 
-#include "Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/SinglePass/SinglePassLoop.hlsl"
-#elif defined(LIGHTLOOP_TILE_PASS)
+#if defined(LIGHTLOOP_SINGLE_PASS) || defined(LIGHTLOOP_TILE_PASS)
 #include "Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/TilePass/TilePassLoop.hlsl"
 #endif
 

Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/Lighting.hlsl

@@ -19,9 +19,10 @@ uniform float4x4 g_mInvScrProjection;
 uniform float4x4 g_mScrProjection;
 uniform float g_fNearPlane;
 uniform float g_fFarPlane;
+uniform int _EnvLightIndexShift;
 
 StructuredBuffer<float3> g_vBoundsBuffer : register( t1 );
-StructuredBuffer<LightShapeData> _LightShapeData : register(t2);
+StructuredBuffer<LightVolumeData> _LightVolumeData : register(t2);
 StructuredBuffer<SFiniteLightBound> g_data : register( t3 );
 
 
@@ -212,7 +213,7 @@ void CullByExactEdgeTests(uint threadID, int iNrCoarseLights, uint2 viTilLL, uin
 	for(int l=0; l<iNrCoarseLights; l++)
 	{
 		const uint idxCoarse = lightsListLDS[l];
-        [branch]if (idxCoarse<(uint)g_iNrVisibLights && _LightShapeData[idxCoarse].lightVolume != SPHERE_VOLUME)		// don't bother doing edge tests for sphere lights since these have camera aligned bboxes.
+        [branch]if (idxCoarse<(uint)g_iNrVisibLights && _LightVolumeData[idxCoarse].lightVolume != LIGHTVOLUMETYPE_SPHERE)		// don't bother doing edge tests for sphere lights since these have camera aligned bboxes.
 		{
 			SFiniteLightBound lgtDat = g_data[idxCoarse];