Minor refactoring in HDRenderLoop: Renamed light types are now referred to as volumes and light models are now referred to as light categories

Author: runes

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_MODELS; category++)
+                for(int category = 0; category < NR_LIGHT_CATEGORIES; category++)
                 {
                     uint mask = 1u << category;
                     uint start;

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

@@ -212,7 +212,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].lightType != SPHERE_LIGHT)		// don't bother doing edge tests for sphere lights since these have camera aligned bboxes.
+        [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.
 		{
 			SFiniteLightBound lgtDat = g_data[idxCoarse];
 

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

@@ -331,7 +331,7 @@ void LIGHTLISTGEN(uint threadID : SV_GroupIndex, uint3 u3GroupID : SV_GroupID)
 		InterlockedAdd(g_LayeredSingleIdxBuffer[0], (uint) iSpaceAvail, start);		// alloc list memory
 	}
 
-	int modelListCount[NR_LIGHT_MODELS]={0,0,0};		// direct light count and reflection lights
+	int categoryListCount[NR_LIGHT_CATEGORIES]={0,0,0};		// direct light count and reflection lights
 	uint offs = start;
 	for(int ll=0; ll<iNrCoarseLights; ll+=4)
 	{
@@ -347,7 +347,7 @@ void LIGHTLISTGEN(uint threadID : SV_GroupIndex, uint3 u3GroupID : SV_GroupID)
 			if(offs<(start+iSpaceAvail) && i<nrClusters && CheckIntersection(l, i, viTilLL.xy, viTilUR.xy, suggestedBase) )
 			{
                 uint lightCategory = _LightShapeData[coarseList[l]].lightCategory;
-                ++modelListCount[lightCategory == REFLECTION_LIGHT ? 1 : 0];
+                ++categoryListCount[lightCategory];
 				g_vLayeredLightList[offs++] = _LightShapeData[coarseList[l]].lightIndex;			// reflection lights will be last since we sorted
 			}
 		}
@@ -359,14 +359,14 @@ void LIGHTLISTGEN(uint threadID : SV_GroupIndex, uint3 u3GroupID : SV_GroupID)
 
 	uint localOffs=0;
 	offs = i*nrTilesX*nrTilesY + tileIDX.y*nrTilesX + tileIDX.x;
-	for(int m=0; m<NR_LIGHT_MODELS; m++)
+	for(int category=0; category<NR_LIGHT_CATEGORIES; category++)
 	{
-		int numLights = min(modelListCount[m],31);		// only allow 5 bits
+		int numLights = min(categoryListCount[category],31);		// only allow 5 bits
 		if(i<nrClusters)
 		{
 			g_LayeredOffset[offs] = (start+localOffs) | (((uint) numLights)<<27);
 			offs += (nrClusters*nrTilesX*nrTilesY);
-			localOffs += modelListCount[m];		// use unclamped count for localOffs
+			localOffs += categoryListCount[category];		// use unclamped count for localOffs
 		}
 	}
 
@@ -480,7 +480,7 @@ int CullByExactEdgeTests(uint threadID, int iNrCoarseLights, uint2 viTilLL, uint
 		GroupMemoryBarrierWithGroupSync();
 #endif
 		const int idxCoarse = coarseList[l];
-        [branch]if (_LightShapeData[idxCoarse].lightType != SPHERE_LIGHT)		// don't bother doing edge tests for sphere lights since these have camera aligned bboxes.
+        [branch]if (_LightShapeData[idxCoarse].lightVolume != SPHERE_VOLUME)		// don't bother doing edge tests for sphere lights since these have camera aligned bboxes.
 		{
 			SFiniteLightBound lgtDat = g_data[idxCoarse];
 

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

@@ -52,7 +52,7 @@ groupshared uint ldsDoesLightIntersect[2];
 #endif
 groupshared int ldsNrLightsFinal;
 
-groupshared int ldsModelListCount[NR_LIGHT_MODELS];		// since NR_LIGHT_MODELS is 3
+groupshared int ldsCategoryListCount[NR_LIGHT_CATEGORIES];		// since NR_LIGHT_CATEGORIES is 3
 
 #ifdef PERFORM_SPHERICAL_INTERSECTION_TESTS
 groupshared uint lightOffsSph;
@@ -222,7 +222,7 @@ void LIGHTLISTGEN(uint threadID : SV_GroupIndex, uint3 u3GroupID : SV_GroupID)
 #endif
 
 	//
-	if(t<NR_LIGHT_MODELS) ldsModelListCount[t]=0;
+	if(t<NR_LIGHT_CATEGORIES) ldsCategoryListCount[t]=0;
 
 #if !defined(SHADER_API_XBOXONE) && !defined(SHADER_API_PSSL)
 	GroupMemoryBarrierWithGroupSync();
@@ -232,7 +232,7 @@ void LIGHTLISTGEN(uint threadID : SV_GroupIndex, uint3 u3GroupID : SV_GroupID)
 	int nrLightsCombinedList = min(ldsNrLightsFinal,MAX_NR_COARSE_ENTRIES);
 	for(int i=t; i<nrLightsCombinedList; i+=NR_THREADS) 
 	{
-        InterlockedAdd(ldsModelListCount[_LightShapeData[prunedList[i]].lightCategory], 1);
+        InterlockedAdd(ldsCategoryListCount[_LightShapeData[prunedList[i]].lightCategory], 1);
 	}
 
 
@@ -246,9 +246,9 @@ void LIGHTLISTGEN(uint threadID : SV_GroupIndex, uint3 u3GroupID : SV_GroupID)
 	int localOffs=0;
 	int offs = tileIDX.y*nrTilesX + tileIDX.x;
 
-	for(int m=0; m<NR_LIGHT_MODELS; m++)
+	for(int category=0; category<NR_LIGHT_CATEGORIES; category++)
 	{
-		int nrLightsFinal = ldsModelListCount[ m ];
+		int nrLightsFinal = ldsCategoryListCount[category];
 		int nrLightsFinalClamped = nrLightsFinal<MAX_NR_PRUNED_ENTRIES ? nrLightsFinal : MAX_NR_PRUNED_ENTRIES;
 
 
@@ -330,10 +330,10 @@ void FinePruneLights(uint threadID, int iNrCoarseLights, uint2 viTilLL, float4 v
 	{
 		// fetch light
 		int idxCoarse = l<iNrCoarseLights ? coarseList[l] : 0;
-        uint uLgtType = l<iNrCoarseLights ? _LightShapeData[idxCoarse].lightType : 0;
+        uint uLightVolume = l<iNrCoarseLights ? _LightShapeData[idxCoarse].lightVolume : 0;
 
 		// spot
-		while(l<iNrCoarseLights && uLgtType==SPOT_LIGHT)
+		while(l<iNrCoarseLights && uLightVolume==SPOT_VOLUME)
 		{
             LightShapeData lightData = _LightShapeData[idxCoarse];
             // TODO: Change by SebL
@@ -361,11 +361,11 @@ void FinePruneLights(uint threadID, int iNrCoarseLights, uint2 viTilLL, float4 v
 
 			uLightsFlags[l<32 ? 0 : 1] |= (uVal<<(l&31));
 			++l; idxCoarse = l<iNrCoarseLights ? coarseList[l] : 0;
-            uLgtType = l<iNrCoarseLights ? _LightShapeData[idxCoarse].lightType : 0;
+            uLightVolume = l<iNrCoarseLights ? _LightShapeData[idxCoarse].lightVolume : 0;
 		}
 
 		// sphere
-		while(l<iNrCoarseLights && uLgtType==SPHERE_LIGHT)
+		while(l<iNrCoarseLights && uLightVolume==SPHERE_VOLUME)
 		{
             LightShapeData lightData = _LightShapeData[idxCoarse];
 
@@ -388,11 +388,11 @@ void FinePruneLights(uint threadID, int iNrCoarseLights, uint2 viTilLL, float4 v
 
 			uLightsFlags[l<32 ? 0 : 1] |= (uVal<<(l&31));
 			++l; idxCoarse = l<iNrCoarseLights ? coarseList[l] : 0;
-            uLgtType = l<iNrCoarseLights ? _LightShapeData[idxCoarse].lightType : 0;
+            uLightVolume = l<iNrCoarseLights ? _LightShapeData[idxCoarse].lightVolume : 0;
 		}
 
 		// Box
-		while(l<iNrCoarseLights && uLgtType==BOX_LIGHT)
+		while(l<iNrCoarseLights && uLightVolume==BOX_VOLUME)
 		{
             LightShapeData lightData = _LightShapeData[idxCoarse];
 
@@ -415,11 +415,11 @@ void FinePruneLights(uint threadID, int iNrCoarseLights, uint2 viTilLL, float4 v
 
 			uLightsFlags[l<32 ? 0 : 1] |= (uVal<<(l&31));
 			++l; idxCoarse = l<iNrCoarseLights ? coarseList[l] : 0;
-            uLgtType = l<iNrCoarseLights ? _LightShapeData[idxCoarse].lightType : 0;
+			uLightVolume = l<iNrCoarseLights ? _LightShapeData[idxCoarse].lightVolume : 0;
 		}
 
 		// in case we have some corrupt data make sure we terminate
-		if(uLgtType>=MAX_TYPES) ++l;
+		if(uLightVolume >=MAX_VOLUME_TYPES) ++l;
 	}
 
 	InterlockedOr(ldsDoesLightIntersect[0], uLightsFlags[0]);