It finally works

This commit is contained in:
Dynamitos
2024-04-23 19:11:06 +02:00
parent 80963edfd4
commit 72336aa64f
15 changed files with 31 additions and 74 deletions
+1 -1
View File
@@ -22,7 +22,7 @@ struct CullingParams
RWTexture2D<uint2> oLightGrid;
RWTexture2D<uint2> tLightGrid;
};
layout(set=2)
ParameterBlock<CullingParams> pCullingParams;
// Debug
//Texture2D lightCountHeatMap;
-6
View File
@@ -65,12 +65,6 @@ struct PrimitiveAttributes
uint cull: SV_CullPrimitive;
};
uint unpackPrimitiveIndices(uint index)
{
uint32_t packed = pScene.primitiveIndices[index / 4];
return (packed >> (index % 4)) & 0xff;
}
[numthreads(MESH_GROUP_SIZE, 1, 1)]
[outputtopology("triangle")]
[shader("mesh")]
+1 -1
View File
@@ -10,7 +10,7 @@ struct ViewParameter
float4 cameraPos_WS;
float2 screenDimensions;
}
uniform ParameterBlock<ViewParameter> pViewParams;
ParameterBlock<ViewParameter> pViewParams;
float4 clipToView(float4 clip)
{
-1
View File
@@ -8,5 +8,4 @@ struct DispatchParams
uint pad1;
RWStructuredBuffer<Frustum> frustums;
}
layout(set=1)
ParameterBlock<DispatchParams> pDispatchParams;
-1
View File
@@ -63,5 +63,4 @@ struct LightEnv
StructuredBuffer<PointLight> pointLights;
uint numPointLights;
};
layout(set=3)
ParameterBlock<LightEnv> pLightEnv;
-1
View File
@@ -8,5 +8,4 @@ interface IMaterial
BRDF prepare(MaterialParameter input);
};
layout(set=4)
ParameterBlock<IMaterial> pMaterial;
+2 -3
View File
@@ -38,9 +38,8 @@ struct Scene
StructuredBuffer<InstanceData> instances;
StructuredBuffer<MeshData> meshData;
StructuredBuffer<MeshletDescription> meshletInfos;
// uint8_t is not valid in DXIL
StructuredBuffer<uint32_t> primitiveIndices;
StructuredBuffer<uint8_t> primitiveIndices;
StructuredBuffer<uint32_t> vertexIndices;
};
uniform ParameterBlock<Scene> pScene;
ParameterBlock<Scene> pScene;