From 762651db7a37b386e50586ede2c8c6db67a0b262 Mon Sep 17 00:00:00 2001 From: Jonathan Bradley Date: Fri, 7 Feb 2025 06:49:32 -0500 Subject: pke: FontType minor restructure --- src/font.hpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'src/font.hpp') diff --git a/src/font.hpp b/src/font.hpp index fc9c909..5b3646c 100644 --- a/src/font.hpp +++ b/src/font.hpp @@ -24,13 +24,6 @@ struct FontType : public Entity_Base { pk_cstr title; AssetHandle fontTextureAssetHandle; AssetHandle glyphDetailsAssetHandle; - VkDeviceMemory deviceMemoryVert = VK_NULL_HANDLE; - VkDeviceMemory deviceMemoryTexture = VK_NULL_HANDLE; - VkDeviceMemory deviceMemoryInst = VK_NULL_HANDLE; - VkImage textureImage = VK_NULL_HANDLE; - VkImageView textureImageView = VK_NULL_HANDLE; - VkDescriptorPool vkDescriptorPool = VK_NULL_HANDLE; - VkDescriptorSet *vkDescriptorSets = nullptr; FontGlyphChar *glyphs; FontRender *renders = nullptr; glm::vec2 atlas_size; @@ -38,6 +31,15 @@ struct FontType : public Entity_Base { FontRenderIndex n_render = FontRenderIndex{0}; FontRenderIndex h_render = FontRenderIndex{0}; FontTypeIndex index_ft = FontTypeIndex{0}; + struct FontTypeGraphics { + VkDeviceMemory deviceMemoryVert = VK_NULL_HANDLE; + VkDeviceMemory deviceMemoryTexture = VK_NULL_HANDLE; + VkDeviceMemory deviceMemoryInst = VK_NULL_HANDLE; + VkImage textureImage = VK_NULL_HANDLE; + VkImageView textureImageView = VK_NULL_HANDLE; + VkDescriptorPool vkDescriptorPool = VK_NULL_HANDLE; + VkDescriptorSet *vkDescriptorSets = nullptr; + } gr; struct FontTypeBindings { BufferBindingDetails vertexBD; BufferBindingDetails uvBD; -- cgit v1.2.3