From 0df4d53756a27aa2b3847318fb17700c1849dd42 Mon Sep 17 00:00:00 2001 From: Eleni Maria Stea Date: Sat, 20 Nov 2021 17:29:35 +0200 Subject: [PATCH] Replaced FRAME_LAG with swapchain.num_images - 1 to be generic The frame lag is equal to the num of remaining frames (in case of 3ple buffering it's 2, if we use double buffering it's 1) so, I am not defining it anymore. --- src/main.cc | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main.cc b/src/main.cc index bcbc2ac..6c3d70d 100644 --- a/src/main.cc +++ b/src/main.cc @@ -19,7 +19,6 @@ #include "camera.h" /* defines */ -#define FRAME_LAG 2 #define FENCE_TIMEOUT UINT64_MAX /**************************/ @@ -100,7 +99,7 @@ static std::vectorvk_framebuffers; /* for the moment: one cmd buffer per swapchain image */ static std::vectorvk_cmd_buffers; static std::vectorvk_fences; -static struct vk_semaphores vk_semas[FRAME_LAG]; +static struct vk_semaphores *vk_semas; /* FIXME make them part of each object's functions/params */ static struct vk_renderer vk_rnd; @@ -387,7 +386,7 @@ display() abort(); } - vk_frame_idx = (vk_frame_idx + 1) % FRAME_LAG; + vk_frame_idx = (vk_frame_idx + 1) % (vk_chain.num_images - 1); printf("display %d\n", count++); printf("current image %u\n", vk_current_image); @@ -397,6 +396,8 @@ display() static void vk_cleanup() { + int num_images = vk_chain.num_images - 1; + vk_destroy_image(&vk_core, &vk_depth_att.obj); vk_destroy_renderer(&vk_core, &vk_rnd); @@ -421,8 +422,9 @@ vk_cleanup() vk_destroy_fences(&vk_core, vk_fences.size(), vk_fences.data()); vk_fences.clear(); - for (int i = 0; i < FRAME_LAG; i++) + for (int i = 0; i < num_images; i++) vk_destroy_semaphores(&vk_core, &vk_semas[i]); + free(vk_semas); for (size_t i = 0; i < vk_cmd_buffers.size(); i++) vk_destroy_cmd_buffers(&vk_core, vk_cmd_buffers.size(), vk_cmd_buffers.data()); @@ -445,9 +447,10 @@ vk_create_sync_objects() memset(&sinfo, 0, sizeof sinfo); sinfo.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO; - vk_fences.resize(FRAME_LAG, VK_NULL_HANDLE); + vk_fences.resize(vk_chain.num_images - 1, VK_NULL_HANDLE); - for (int i = 0; i < FRAME_LAG; i++) { + vk_semas = (vk_semaphores *)malloc(sizeof(vk_semaphores) * (vk_chain.num_images - 1)); + for (uint32_t i = 0; i < (vk_chain.num_images - 1); i++) { if (vkCreateFence(vk_core.dev, &finfo, 0, &vk_fences[i]) != VK_SUCCESS) { fprintf(stderr, "Failed to create fence: %d\n", i); return false; -- 1.7.10.4