compiles again

res/shaders/lib/LightEnv.slang

@@ -70,12 +70,3 @@ struct LightEnv
 };
 
 ParameterBlock<LightEnv> gLightEnv;
-
-//layout(set = INDEX_LIGHT_ENV, binding = 0, std430)
-//ShaderBuffer<DirectionalLight> directionalLights;
-//layout(set = INDEX_LIGHT_ENV, binding = 1, std430)
-//ConstantBuffer<uint> numDirectionalLights;
-//layout(set = INDEX_LIGHT_ENV, binding = 2, std430)
-//ShaderBuffer<PointLight> pointLights;
-//layout(set = INDEX_LIGHT_ENV, binding = 3, std430)
-//ConstantBuffer<uint> numPointLights;

res/shaders/lib/Material.slang

@@ -1,12 +1,11 @@
 import Common;
 import BRDF;
+import MaterialParameter;
 
 interface IMaterial
 {
 	associatedtype BRDF : IBRDF;
-	BRDF prepare(MaterialFragmentParameter input);
-
+	BRDF prepare(MaterialParameter input);
 };
 
-layout(set = INDEX_MATERIAL)
 ParameterBlock<IMaterial> gMaterial;

res/shaders/lib/Meshlet.slang

@@ -37,6 +37,5 @@ struct Scene
 	StructuredBuffer<uint32_t> vertexIndices;
 };
 
-layout(set = INDEX_SCENE_DATA)
 ParameterBlock<Scene> scene;
 

res/shaders/lib/SkinnedMeshVertexData.slang

@@ -63,5 +63,3 @@ struct SkinnedMeshVertexData : VertexData
 	StructuredBuffer<float4> boneWeights;
 	StructuredBuffer<float4x4> bones;
 }
-layout(set = INDEX_VERTEX_DATA)
-ParameterBlock<SkinnedMeshVertexData> vertexData;

res/shaders/lib/StaticMeshVertexData.slang

@@ -54,6 +54,4 @@ struct StaticMeshVertexData : VertexData
 	StructuredBuffer<float3> normals;
 	StructuredBuffer<float3> tangents;
 	StructuredBuffer<float3> biTangents;
-}
-layout(set = INDEX_VERTEX_DATA)
-ParameterBlock<StaticMeshVertexData> vertexData;
+}

res/shaders/lib/VertexData.slang

@@ -12,4 +12,5 @@ interface VertexAttributes
 interface VertexData
 {
 	VertexAttributes getAttributes(uint index, float4x4 transform);
-};
+};
+ParameterBlock<VertexData> vertexData;