From 9702d38dea5e09a2813e54e05f5ebb2c3e746b10 Mon Sep 17 00:00:00 2001 From: Jonathan Bradley Date: Tue, 28 Jan 2025 10:52:04 -0500 Subject: pke: cleanup + vulkan validation errors --- src/window.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/window.cpp b/src/window.cpp index a06895c..57e773f 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -1,4 +1,3 @@ -#include "font.hpp" #define GLFW_INCLUDE_NONE #define GLFW_INCLUDE_VULKAN @@ -2761,14 +2760,18 @@ void DestroyWindow() { if (pkePipelines.vkSampler_Texture != VK_NULL_HANDLE) vkDestroySampler(vkDevice, pkePipelines.vkSampler_Texture, vkAllocator); - for (long i = 0; i < 2; ++i) { + for (long i = 0; i < 3; ++i) { if (pkePipelines.pipelines.arr[i] != VK_NULL_HANDLE) vkDestroyPipeline(vkDevice, pkePipelines.pipelines.arr[i], vkAllocator); } - if (pkePipelines.pipe_layouts.named.texture != VK_NULL_HANDLE) - vkDestroyPipelineLayout(vkDevice, pkePipelines.pipe_layouts.named.texture, vkAllocator); - if (pkePipelines.descr_layouts.named.texture != VK_NULL_HANDLE) - vkDestroyDescriptorSetLayout(vkDevice, pkePipelines.descr_layouts.named.texture, vkAllocator); + for (long i = 0; i < 2; ++i) { + if (pkePipelines.pipelines.arr[i] != VK_NULL_HANDLE) + vkDestroyPipelineLayout(vkDevice, pkePipelines.pipe_layouts.arr[i], vkAllocator); + } + for (long i = 0; i < 2; ++i) { + if (pkePipelines.pipelines.arr[i] != VK_NULL_HANDLE) + vkDestroyDescriptorSetLayout(vkDevice, pkePipelines.descr_layouts.arr[i], vkAllocator); + } for (long i = 0; i < MAX_FRAMES_IN_FLIGHT; ++i) { vkDestroyBuffer(vkDevice, UniformBuffers[i], vkAllocator); -- cgit v1.2.3