From 2eb22f8debec811cdea32ed7b8cf3ec98c752f7c Mon Sep 17 00:00:00 2001 From: Jonathan Bradley Date: Thu, 14 Sep 2023 19:24:43 -0400 Subject: Load model textures checkpoint. Refactors some Vulkan items related to CompGrBinds and EntityTypes. Adds some Vulkan globals related to textures. Adds a number of placeholder items: - Iffy use of setting Vulkan globals on instanced structs. - Unimplemented and inaccurate shaders - Iffy gltf sub-buffer logic (ignores vertex color data) - MipMap TODOs - TextureArray TODOs --- src/components.hpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/components.hpp') diff --git a/src/components.hpp b/src/components.hpp index ce5f0f2..76dd7fc 100644 --- a/src/components.hpp +++ b/src/components.hpp @@ -31,8 +31,8 @@ struct InstPos { struct CompGrBinds { EntityHandle entHandle = EntityHandle_MAX; GrBindsHandle grBindsHandle = GrBindsHandle_MAX; - VkDeviceMemory deviceMemoryVert = VK_NULL_HANDLE; - VkDeviceMemory deviceMemoryInst = VK_NULL_HANDLE; + VkPipelineLayout vkPipelineLayout = VK_NULL_HANDLE; + VkDescriptorSet vkDescriptorSet = VK_NULL_HANDLE; VkBuffer vertexBuffer = VK_NULL_HANDLE; uint32_t vertexFirstBinding = 0; uint32_t vertexCount = 0; @@ -54,8 +54,6 @@ struct CompGrBinds { uint32_t instanceCount = 0; VkDeviceSize instanceOffsets = 0; DynArray instances{0}; - VkPipelineLayout vkPipelineLayout = VK_NULL_HANDLE; - VkDescriptorSet vkDescriptorSet = VK_NULL_HANDLE; }; struct CompInstance { -- cgit v1.2.3