Trying to fix invalid descriptorlayout

2020-10-03 11:00:10 +02:00
parent 79388bf41a
commit ceee96b462
69 changed files with 1087 additions and 393 deletions
@@ -1,30 +1,14 @@
+import Common;
 import Material;
 import VERTEX_INPUT_IMPORT;
 import MATERIAL_IMPORT;
-
-struct ViewParams
-{
-	float4x4 viewMatrix;
-	float4x4 projectionMatrix;
-    float4 cameraPos_WS;
-};
-
-layout(set = 0, binding = 0)
-ParameterBlock<ViewParams> gViewParams;
-
-
-layout(set = 1)
-type_param TMaterial : IMaterial;
-ParameterBlock<TMaterial> gMaterial;
+import PrimitiveSceneData;

 struct ModelParameter
 {
 	float4x4 modelMatrix;
 }

-[[vk::push_constant]]
-ConstantBuffer<ModelParameter> gModelParams;
-
 struct VertexStageOutput
 {
 	float4 position : SV_Position;