Fixing basepass light culling data

This commit is contained in:
Dynamitos
2024-02-21 10:30:04 +01:00
parent 99ee991bf5
commit 15813ba612
9 changed files with 43 additions and 54 deletions
+5 -7
View File
@@ -5,11 +5,9 @@ import MaterialParameter;
struct LightCullingData
{
RWStructuredBuffer<uint> oLightIndexList;
RWStructuredBuffer<uint> tLightIndexList;
RWStructuredBuffer<uint> lightIndexList;
RWTexture2D<uint2> oLightGrid;
RWTexture2D<uint2> tLightGrid;
RWTexture2D<uint2> lightGrid;
};
layout(set=5)
ParameterBlock<LightCullingData> pLightCullingData;
@@ -21,8 +19,8 @@ float4 fragmentMain(in FragmentParameter params) : SV_Target
MaterialParameter materialParams = params.getMaterialParameter();
let brdf = pMaterial.prepare(materialParams);
uint2 tileIndex = uint2(floor(params.position_CS.xy / BLOCK_SIZE));
uint startOffset = pLightCullingData.oLightGrid[tileIndex].x;
uint lightCount = pLightCullingData.oLightGrid[tileIndex].y;
uint startOffset = pLightCullingData.lightGrid[tileIndex].x;
uint lightCount = pLightCullingData.lightGrid[tileIndex].y;
float3 result = float3(0, 0, 0);
for(int i = 0; i < pLightEnv.numDirectionalLights; ++i)
{
@@ -30,7 +28,7 @@ float4 fragmentMain(in FragmentParameter params) : SV_Target
}
for(uint i = 0; i < lightCount; ++i)
{
uint lightIndex = pLightCullingData.oLightIndexList[startOffset + lightCount];
uint lightIndex = pLightCullingData.lightIndexList[startOffset + i];
result += pLightEnv.pointLights[lightIndex].illuminate(lightingParams, brdf);
}
return float4(result, 1.0f);