pke: CompGrBinds sub-structs

1 files changed, 5 insertions, 17 deletions

diff --git a/src/components.hpp b/src/components.hpp
index 6b99a8b..eb891a4 100644
--- a/src/components.hpp
+++ b/src/components.hpp
@@ -1,7 +1,6 @@
 #ifndef PKE_COMPONENTS_HPP
 #define PKE_COMPONENTS_HPP
 
-#include "dynamic-array.hpp"
 #include "pk.h"
 #include "physics.hpp"
 #include "plugin-types.hpp"
@@ -39,27 +38,16 @@ struct CompGrBinds {
 	VkPipelineLayout vkPipelineLayout = VK_NULL_HANDLE;
 	VkPipeline graphicsPipeline = VK_NULL_HANDLE;
 	VkDescriptorSet *vkDescriptorSets = nullptr;
-	VkBuffer vertexBuffer = VK_NULL_HANDLE;
-	uint32_t vertexFirstBinding = 0;
-	uint32_t vertexBindingCount = 0;
-	VkDeviceSize vertexOffsets = 0;
-	VkBuffer normalsBuffer = VK_NULL_HANDLE;
-	uint32_t normalsFirstBinding = 0;
-	uint32_t normalsBindingCount = 0;
-	VkDeviceSize normalsOffsets = 0;
-	VkBuffer uvBuffer = VK_NULL_HANDLE;
-	uint32_t uvFirstBinding = 0;
-	uint32_t uvBindingCount = 0;
-	VkDeviceSize uvOffsets = 0;
-	VkBuffer indexBuffer = VK_NULL_HANDLE;
-	uint32_t indexBindingCount = 0;
-	VkDeviceSize indexOffsets = 0;
-	VkDeviceSize indexCount = 0;
+	BufferBindingDetails vertexBD;
+	BufferBindingDetails normalsBD;
+	BufferBindingDetails uvBD;
+	BufferBindingDetails indexBD;
 	BufferBindingDetails physVertBD;
 	BufferBindingDetails physNormBD;
 	BufferBindingDetails physUvBD;
 	BufferBindingDetails physIndxBD;
 	VkBuffer instanceBuffer = VK_NULL_HANDLE;
+	uint32_t indexCount;
 	uint32_t instanceFirstBinding = 0;
 	uint32_t instanceBindingCount = 0;
 	uint32_t instanceCounter = 0;