Fixing some import problems

This commit is contained in:
Dynamitos
2024-04-24 23:25:34 +02:00
parent 6b91568423
commit 541b12aa5d
20 changed files with 75 additions and 69 deletions
+1 -1
View File
@@ -31,5 +31,5 @@ float4 fragmentMain(in FragmentParameter params) : SV_Target
//uint lightIndex = pLightCullingData.lightIndexList[startOffset + i];
result += pLightEnv.pointLights[i].illuminate(lightingParams, brdf);
}
return float4(1.0f, 0.1f, 0.5f, 1.0f);
return float4(result, 1.0f);
}
+1 -1
View File
@@ -47,7 +47,7 @@ void taskMain(
{
uint m = mesh.meshletOffset + i;
MeshletDescription meshlet = pScene.meshletInfos[m];
if(meshlet.bounding.insideFrustum(localToView, viewFrustum))
//if(meshlet.bounding.insideFrustum(localToView, viewFrustum))
{
uint index;
InterlockedAdd(head, 1, index);
+1
View File
@@ -10,6 +10,7 @@ struct ViewParameter
float4 cameraPos_WS;
float2 screenDimensions;
}
layout(set=0)
ParameterBlock<ViewParameter> pViewParams;
float4 clipToView(float4 clip)
+1
View File
@@ -63,4 +63,5 @@ struct LightEnv
StructuredBuffer<PointLight> pointLights;
uint numPointLights;
};
layout(set=3)
ParameterBlock<LightEnv> pLightEnv;
+1 -1
View File
@@ -7,5 +7,5 @@ interface IMaterial
associatedtype BRDF : IBRDF;
BRDF prepare(MaterialParameter input);
};
layout(set=4)
ParameterBlock<IMaterial> pMaterial;
+3 -3
View File
@@ -22,8 +22,8 @@ struct MeshData
uint32_t pad0[3];
};
static const uint MAX_VERTICES = 64;
static const uint MAX_PRIMITIVES = 126;
static const uint MAX_VERTICES = 256;
static const uint MAX_PRIMITIVES = 256;
static const uint TASK_GROUP_SIZE = 128;
static const uint MESH_GROUP_SIZE = 32;
static const uint MAX_MESHLETS_PER_MESH = 512;
@@ -41,6 +41,6 @@ struct Scene
StructuredBuffer<uint8_t> primitiveIndices;
StructuredBuffer<uint32_t> vertexIndices;
};
layout(set=1)
layout(set=2)
ParameterBlock<Scene> pScene;
+1 -1
View File
@@ -11,5 +11,5 @@ interface IVertexData
VertexAttributes getAttributes(uint index);
};
layout(set=2)
layout(set=1)
ParameterBlock<IVertexData> pVertexData;