checkpoint - EntityType descriptor pool and descriptor sets

1 files changed, 7 insertions, 6 deletions

diff --git a/src/components.hpp b/src/components.hpp
index 70c36d5..40c8aae 100644
--- a/src/components.hpp
+++ b/src/components.hpp
@@ -32,26 +32,27 @@ struct CompGrBinds {
 	EntityHandle entHandle = EntityHandle_MAX;
 	GrBindsHandle grBindsHandle = GrBindsHandle_MAX;
 	VkPipelineLayout vkPipelineLayout = VK_NULL_HANDLE;
-	VkDescriptorSet vkDescriptorSet = VK_NULL_HANDLE;
+	VkDescriptorSet *vkDescriptorSets = nullptr;
 	VkBuffer vertexBuffer = VK_NULL_HANDLE;
 	uint32_t vertexFirstBinding = 0;
-	uint32_t vertexCount = 0;
+	uint32_t vertexBindingCount = 0;
 	VkDeviceSize vertexOffsets = 0;
 	VkBuffer normalsBuffer = VK_NULL_HANDLE;
 	uint32_t normalsFirstBinding = 0;
-	uint32_t normalsCount = 0;
+	uint32_t normalsBindingCount = 0;
 	VkDeviceSize normalsOffsets = 0;
 	VkBuffer uvBuffer = VK_NULL_HANDLE;
 	uint32_t uvFirstBinding = 0;
-	uint32_t uvCount = 0;
+	uint32_t uvBindingCount = 0;
 	VkDeviceSize uvOffsets = 0;
 	VkBuffer indexBuffer = VK_NULL_HANDLE;
 	uint32_t indexFirstBinding = 0;
-	uint32_t indexCount = 0;
+	uint32_t indexBindingCount = 0;
 	VkDeviceSize indexOffsets = 0;
+	VkDeviceSize indexCount = 0;
 	VkBuffer instanceBuffer = VK_NULL_HANDLE;
 	uint32_t instanceFirstBinding = 0;
-	uint32_t instanceCount = 0;
+	uint32_t instanceBindingCount = 0;
 	VkDeviceSize instanceOffsets = 0;
 	DynArray<InstPos> instances{0};
 	bool isInstanceBufferNeedingUpdated = false;