From 37347bf7811a5fa42c98e2a19adfee15252ee479 Mon Sep 17 00:00:00 2001 From: Jonathan Bradley Date: Fri, 28 Feb 2025 22:33:58 -0500 Subject: pke: checkpoint: vk renames + first-pass ui Renamed pipeline and descriptor names to be more self-descriptive. UI work is not done, and will not record. Needs vulkan items created (buffers). --- src/window.hpp | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'src/window.hpp') diff --git a/src/window.hpp b/src/window.hpp index 48da3c9..de1a2ac 100644 --- a/src/window.hpp +++ b/src/window.hpp @@ -66,21 +66,27 @@ extern DebugHitbox pkeDebugHitbox; struct ImplementedPKVK { struct ImplementedDescrSetLayouts { struct ImplementedDescrSetLayoutsByName { - VkDescriptorSetLayout texture; - VkDescriptorSetLayout glyph; + // 0 bindings + VkDescriptorSetLayout base; + // 1 binding, texture sampler + VkDescriptorSetLayout txtr; + // 2 bindings, ubo + texture sampler + VkDescriptorSetLayout ubo_txtr; } named; } descr_layouts; struct ImplementedPipelineLayouts { struct ImplementedPipelineLayoutsByName { - VkPipelineLayout texture; - VkPipelineLayout glyph; + VkPipelineLayout base; + VkPipelineLayout txtr; + VkPipelineLayout ubo_txtr; } named; } pipe_layouts; struct ImplementedPipelines { struct ImplementedPipelinesByName { - VkPipeline texture; - VkPipeline texture_wireframe; - VkPipeline glyph; + VkPipeline entity_standard; + VkPipeline entity_wireframe; + VkPipeline font_glyph; + VkPipeline ui_base; } named; } pipelines; }; -- cgit v1.2.3