misc bug fixes

mmikk · mmikk · commit 2bdf0c33abeb · 2016-12-06T12:30:35.000-08:00
misc bug fixes
diff --git a/Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/TilePass/Resources/lightlistbuild-bigtile.compute b/Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/TilePass/Resources/lightlistbuild-bigtile.compute
@@ -145,7 +145,7 @@ void BigTileLightListGen(uint threadID : SV_GroupIndex, uint3 u3GroupID : SV_Gro
 	int offs = tileIDX.y*nrBigTilesX + tileIDX.x;
 
 	for(i=t; i<(iNrCoarseLights+1); i+=NR_THREADS)
-		g_vLightList[MAX_NR_BIGTILE_LIGHTS_PLUSONE*offs + i] = t==0 ? iNrCoarseLights : lightsListLDS[i-1];
+		g_vLightList[MAX_NR_BIGTILE_LIGHTS_PLUSONE*offs + i] = i==0 ? iNrCoarseLights : lightsListLDS[i-1];
 }
 
 
diff --git a/Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/TilePass/Resources/lightlistbuild.compute b/Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/TilePass/Resources/lightlistbuild.compute
@@ -294,7 +294,7 @@ int SphericalIntersectionTests(uint threadID, int iNrCoarseLights, float2 screen
 	
 	for(l=threadID; l<iNrCoarseLights; l+=NR_THREADS)
 	{
-		SFiniteLightBound lightData = g_data[coarseList[l]];
+		SFiniteLightBound lightData = g_data[prunedList[l]];
 	
 		if( DoesSphereOverlapTile(V, halfTileSizeAtZDistOne, lightData.center.xyz, lightData.radius) )
 		{
diff --git a/Assets/ScriptableRenderLoop/fptl/lightlistbuild-bigtile.compute b/Assets/ScriptableRenderLoop/fptl/lightlistbuild-bigtile.compute
@@ -143,7 +143,7 @@ void BigTileLightListGen(uint threadID : SV_GroupIndex, uint3 u3GroupID : SV_Gro
 	int offs = tileIDX.y*nrBigTilesX + tileIDX.x;
 
 	for(int i=t; i<(iNrCoarseLights+1); i+=NR_THREADS)
-		g_vLightList[MAX_NR_BIGTILE_LIGHTS_PLUSONE*offs + i] = t==0 ? iNrCoarseLights : lightsListLDS[i-1];
+		g_vLightList[MAX_NR_BIGTILE_LIGHTS_PLUSONE*offs + i] = i==0 ? iNrCoarseLights : lightsListLDS[i-1];
 }
 
 
diff --git a/Assets/ScriptableRenderLoop/fptl/lightlistbuild.compute b/Assets/ScriptableRenderLoop/fptl/lightlistbuild.compute
@@ -294,7 +294,7 @@ int SphericalIntersectionTests(uint threadID, int iNrCoarseLights, float2 screen
 	
 	for(int l=threadID; l<iNrCoarseLights; l+=NR_THREADS)
 	{
-		SFiniteLightBound lightData = g_data[coarseList[l]];
+		SFiniteLightBound lightData = g_data[prunedList[l]];
 	
 		if( DoesSphereOverlapTile(V, halfTileSizeAtZDistOne, lightData.center.xyz, lightData.radius) )
 		{

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ void BigTileLightListGen(uint threadID : SV_GroupIndex, uint3 u3GroupID : SV_Gro`
`145`	`145`	`int offs = tileIDX.y*nrBigTilesX + tileIDX.x;`
`146`	`146`
`147`	`147`	`for(i=t; i<(iNrCoarseLights+1); i+=NR_THREADS)`
`148`		`- g_vLightList[MAX_NR_BIGTILE_LIGHTS_PLUSONE*offs + i] = t==0 ? iNrCoarseLights : lightsListLDS[i-1];`
	`148`	`+ g_vLightList[MAX_NR_BIGTILE_LIGHTS_PLUSONE*offs + i] = i==0 ? iNrCoarseLights : lightsListLDS[i-1];`
`149`	`149`	`}`
`150`	`150`
`151`	`151`
Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ int SphericalIntersectionTests(uint threadID, int iNrCoarseLights, float2 screen`
`294`	`294`
`295`	`295`	`for(l=threadID; l<iNrCoarseLights; l+=NR_THREADS)`
`296`	`296`	`{`
`297`		`- SFiniteLightBound lightData = g_data[coarseList[l]];`
	`297`	`+ SFiniteLightBound lightData = g_data[prunedList[l]];`
`298`	`298`
`299`	`299`	`if( DoesSphereOverlapTile(V, halfTileSizeAtZDistOne, lightData.center.xyz, lightData.radius) )`
`300`	`300`	`{`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ void BigTileLightListGen(uint threadID : SV_GroupIndex, uint3 u3GroupID : SV_Gro`
`143`	`143`	`int offs = tileIDX.y*nrBigTilesX + tileIDX.x;`
`144`	`144`
`145`	`145`	`for(int i=t; i<(iNrCoarseLights+1); i+=NR_THREADS)`
`146`		`- g_vLightList[MAX_NR_BIGTILE_LIGHTS_PLUSONE*offs + i] = t==0 ? iNrCoarseLights : lightsListLDS[i-1];`
	`146`	`+ g_vLightList[MAX_NR_BIGTILE_LIGHTS_PLUSONE*offs + i] = i==0 ? iNrCoarseLights : lightsListLDS[i-1];`
`147`	`147`	`}`
`148`	`148`
`149`	`149`