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/entities.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/entities.cpp') diff --git a/src/entities.cpp b/src/entities.cpp index 10a1168..10974f8 100644 --- a/src/entities.cpp +++ b/src/entities.cpp @@ -198,7 +198,7 @@ void EntityType_Inner_UpdateDescriptorSets(EntityType *et) { VkDescriptorSetLayout *descriptorSets = pk_new(swapchainLength, pkeSettings.mem.bkt); for (long i = 0; i < swapchainLength; ++i) { - descriptorSets[i] = pkePipelines.descr_layouts.named.texture; + descriptorSets[i] = pkePipelines.descr_layouts.named.ubo_txtr; } VkDescriptorSetAllocateInfo vkDescriptorSetAllocateInfo; @@ -1096,8 +1096,8 @@ void EntityType_Load(EntityType &et) { * I don't like that we're just copying this. * This should be moved to window.cpp. */ - etdHelper.etd->grBinds->vkPipelineLayout = pkePipelines.pipe_layouts.named.texture; - etdHelper.etd->grBinds->graphicsPipeline = pkePipelines.pipelines.named.texture; + etdHelper.etd->grBinds->vkPipelineLayout = pkePipelines.pipe_layouts.named.ubo_txtr; + etdHelper.etd->grBinds->graphicsPipeline = pkePipelines.pipelines.named.entity_standard; // handle texture EntityType_LoadTexture(helper, i); -- cgit v1.2.3