vulkan/vulkan_context.cpp

@@ -233,7 +233,7 @@ bool Context::init_device(int preferred_device)
         physical_device = device_list[preferred_device];
     }
 
-    if (physical_device == nullptr)
+    if (physical_device != nullptr)
     {
         for (auto &device : device_list)
         {

vulkan/vulkan_swapchain.cpp

@@ -18,9 +18,13 @@ Swapchain::~Swapchain()
 {
 }
 
-void Swapchain::set_vsync(bool new_setting)
+bool Swapchain::set_vsync(bool new_setting)
 {
+    if (new_setting == vsync)
+        return false;
+
     vsync = new_setting;
+    return true;
 }
 
 void Swapchain::on_render_pass_end(std::function<void ()> function)
@@ -76,39 +80,14 @@ void Swapchain::create_render_pass()
 bool Swapchain::recreate(int new_width, int new_height)
 {
     if (swapchain_object)
-    {
-        device.waitIdle();
         wait_on_frames();
-    }
 
     return create(num_swapchain_images, new_width, new_height);
 }
 
 vk::Image Swapchain::get_image()
 {
-    return image_data[current_swapchain_image].image;
-}
-
-template<typename T>
-static bool vector_find(std::vector<T> haystack, T&& needle)
-{
-    for (auto &elem : haystack)
-        if (elem == needle)
-            return true;
-    return false;
-}
-
-vk::PresentModeKHR Swapchain::get_present_mode() {
-    auto present_mode = vk::PresentModeKHR::eFifo;
-
-    if (!vsync) {
-        if (supports_mailbox)
-            present_mode = vk::PresentModeKHR::eMailbox;
-        if (supports_immediate)
-            present_mode = vk::PresentModeKHR::eImmediate;
-    }
-
-    return present_mode;
+    return imageviewfbs[current_swapchain_image].image;
 }
 
 bool Swapchain::check_and_resize(int width, int height)
@@ -137,7 +116,7 @@ bool Swapchain::check_and_resize(int width, int height)
 bool Swapchain::create(unsigned int desired_num_swapchain_images, int new_width, int new_height)
 {
     frames.clear();
-    image_data.clear();
+    imageviewfbs.clear();
 
     auto surface_capabilities = physical_device.getSurfaceCapabilitiesKHR(surface).value;
 
@@ -186,9 +165,21 @@ bool Swapchain::create(unsigned int desired_num_swapchain_images, int new_width,
         extents.height = surface_capabilities.minImageExtent.height;
 
     auto present_modes = physical_device.getSurfacePresentModesKHR(surface).value;
-    supports_mailbox = vector_find(present_modes, vk::PresentModeKHR::eMailbox);
-    supports_immediate = vector_find(present_modes, vk::PresentModeKHR::eImmediate);
-    supports_relaxed = vector_find(present_modes, vk::PresentModeKHR::eFifoRelaxed);
+    supports_mailbox =
+        std::find(present_modes.begin(), present_modes.end(),
+                  vk::PresentModeKHR::eMailbox) != present_modes.end();
+    supports_immediate =
+        std::find(present_modes.begin(), present_modes.end(),
+                  vk::PresentModeKHR::eImmediate) != present_modes.end();
+
+    auto present_mode = vk::PresentModeKHR::eFifo;
+    if (!vsync)
+    {
+        if (supports_mailbox)
+            present_mode = vk::PresentModeKHR::eMailbox;
+        if (supports_immediate)
+            present_mode = vk::PresentModeKHR::eImmediate;
+    }
 
     auto swapchain_maintenance_info = vk::SwapchainPresentModesCreateInfoEXT{}
         .setPresentModes(present_modes);
@@ -202,7 +193,7 @@ bool Swapchain::create(unsigned int desired_num_swapchain_images, int new_width,
         .setImageUsage(vk::ImageUsageFlagBits::eColorAttachment | vk::ImageUsageFlagBits::eTransferSrc)
         .setCompositeAlpha(vk::CompositeAlphaFlagBitsKHR::eOpaque)
         .setClipped(true)
-        .setPresentMode(get_present_mode())
+        .setPresentMode(present_mode)
         .setSurface(surface)
         .setPreTransform(vk::SurfaceTransformFlagBitsKHR::eIdentity)
         .setImageArrayLayers(1)
@@ -233,7 +224,7 @@ bool Swapchain::create_resources()
     auto command_buffers = device.allocateCommandBuffersUnique(command_buffer_allocate_info).value;
 
     frames.resize(num_swapchain_images);
-    image_data.resize(num_swapchain_images);
+    imageviewfbs.resize(num_swapchain_images);
 
     vk::FenceCreateInfo fence_create_info(vk::FenceCreateFlagBits::eSignaled);
 
@@ -243,6 +234,7 @@ bool Swapchain::create_resources()
         auto &frame = frames[i];
         frame.command_buffer = std::move(command_buffers[i]);
         frame.fence = device.createFenceUnique(fence_create_info).value;
+        frame.freeable = device.createFenceUnique(fence_create_info).value;
         frame.acquire = device.createSemaphoreUnique({}).value;
         frame.complete = device.createSemaphoreUnique({}).value;
     }
@@ -250,7 +242,7 @@ bool Swapchain::create_resources()
     for (unsigned int i = 0; i < num_swapchain_images; i++)
     {
         // Create resources associated with swapchain images
-        auto &image = image_data[i];
+        auto &image = imageviewfbs[i];
         image.image = swapchain_images[i];
         auto image_view_create_info = vk::ImageViewCreateInfo{}
             .setImage(swapchain_images[i])
@@ -267,8 +259,6 @@ bool Swapchain::create_resources()
             .setLayers(1)
             .setRenderPass(render_pass.get());
         image.framebuffer = device.createFramebufferUnique(framebuffer_create_info).value;
-
-        image.fence = device.createFenceUnique(fence_create_info).value;
     }
 
     current_swapchain_image = 0;
@@ -287,7 +277,7 @@ bool Swapchain::begin_frame()
 
     auto &frame = frames[current_frame];
 
-    auto result = device.waitForFences({ frame.fence.get() }, true, 33333333);
+    auto result = device.waitForFences({ frame.fence.get(), frame.freeable.get() }, true, 33333333);
     if (result != vk::Result::eSuccess)
     {
         printf("Timed out waiting for fence.\n");
@@ -349,13 +339,19 @@ bool Swapchain::swap()
         .setImageIndices(current_swapchain_image);
 
     vk::SwapchainPresentModeInfoEXT present_mode_info;
-    auto present_mode = get_present_mode();
+    vk::PresentModeKHR present_mode = vk::PresentModeKHR::eFifo;
+    if (!vsync)
+    {
+        if (supports_mailbox)
+            present_mode = vk::PresentModeKHR::eMailbox;
+        if (supports_immediate)
+            present_mode = vk::PresentModeKHR::eImmediate;
+    }
     present_mode_info.setPresentModes(present_mode);
     present_info.setPNext(&present_mode_info);
 
-    auto &present_fence = image_data[current_swapchain_image].fence.get();
-    device.resetFences(present_fence);
-    vk::SwapchainPresentFenceInfoEXT present_fence_info(present_fence);
+    device.resetFences(frames[current_frame].freeable.get());
+    vk::SwapchainPresentFenceInfoEXT present_fence_info(frames[current_frame].freeable.get());
     present_mode_info.setPNext(&present_fence_info);
 
     vk::Result result = queue.presentKHR(present_info);
@@ -380,7 +376,7 @@ bool Swapchain::end_frame()
 
 vk::Framebuffer Swapchain::get_framebuffer()
 {
-    return image_data[current_swapchain_image].framebuffer.get();
+    return imageviewfbs[current_swapchain_image].framebuffer.get();
 }
 
 vk::CommandBuffer &Swapchain::get_cmd()
@@ -397,7 +393,7 @@ void Swapchain::begin_render_pass()
 
     auto render_pass_begin_info = vk::RenderPassBeginInfo{}
         .setRenderPass(render_pass.get())
-        .setFramebuffer(image_data[current_swapchain_image].framebuffer.get())
+        .setFramebuffer(imageviewfbs[current_swapchain_image].framebuffer.get())
         .setRenderArea(vk::Rect2D({}, extents))
         .setClearValues(value);
     get_cmd().beginRenderPass(render_pass_begin_info, vk::SubpassContents::eInline);
@@ -416,13 +412,13 @@ void Swapchain::end_render_pass()
 
 bool Swapchain::wait_on_frame(int frame_num)
 {
-    auto result = device.waitForFences({ image_data[frame_num].fence.get() }, true, 33000000);
+    auto result = device.waitForFences({ frames[frame_num].fence.get(), frames[frame_num].freeable.get() }, true, 133000000);
     return (result == vk::Result::eSuccess);
 }
 
 void Swapchain::wait_on_frames()
 {
-    for (auto i = 0; i < image_data.size(); i++)
+    for (auto i = 0; i < frames.size(); i++)
         wait_on_frame(i);
 }
 

vulkan/vulkan_swapchain.hpp

@@ -27,10 +27,10 @@ class Swapchain
     void end_frame_without_swap();
     bool swap();
     void wait_on_frames();
-    void set_vsync(bool on);
+    // Returns true if vsync setting was changed, false if it was the same
+    bool set_vsync(bool on);
     void on_render_pass_end(std::function<void()> function);
     int get_num_frames() { return num_swapchain_images; }
-    vk::PresentModeKHR get_present_mode();
 
     vk::Image get_image();
     vk::Framebuffer get_framebuffer();
@@ -45,15 +45,15 @@ class Swapchain
     struct Frame
     {
         vk::UniqueFence fence;
+        vk::UniqueFence freeable;
         vk::UniqueSemaphore acquire;
         vk::UniqueSemaphore complete;
         vk::UniqueCommandBuffer command_buffer;
     };
 
-    struct ImageData
+    struct ImageViewFB
     {
         vk::Image image;
-        vk::UniqueFence fence;
         vk::UniqueImageView image_view;
         vk::UniqueFramebuffer framebuffer;
     };
@@ -69,9 +69,8 @@ class Swapchain
     bool vsync = true;
     bool supports_immediate = false;
     bool supports_mailbox = false;
-    bool supports_relaxed = false;
     std::vector<Frame> frames;
-    std::vector<ImageData> image_data;
+    std::vector<ImageViewFB> imageviewfbs;
 
     vk::Device device;
     vk::SurfaceKHR surface;

win32/CVulkan.cpp

@@ -70,8 +70,6 @@ bool CVulkan::Initialize(HWND hWnd)
         return false;
     }
 
-    context->swapchain->set_vsync(GUI.Vsync);
-
     if (!Settings.AutoDisplayMessages)
     {
         Settings.DisplayIndicators = true;
@@ -93,6 +91,11 @@ bool CVulkan::Initialize(HWND hWnd)
         }
     }
 
+    if (context->swapchain->set_vsync(GUI.Vsync))
+    {
+        context->recreate_swapchain();
+    }
+
     simple_output = std::make_unique<Vulkan::SimpleOutput>(context.get(), vk::Format::eR5G6B5UnormPack16);
 
     return true;
@@ -178,7 +181,9 @@ bool CVulkan::ChangeRenderSize(unsigned int newWidth, unsigned int newHeight)
     if (!context)
         return false;
 
-    if (newWidth != current_width || newHeight != current_height)
+    bool vsync_changed = context->swapchain->set_vsync(GUI.Vsync);
+
+    if (newWidth != current_width || newHeight != current_height || vsync_changed)
     {
         context->recreate_swapchain(newWidth, newHeight);
         context->wait_idle();
@@ -213,7 +218,10 @@ bool CVulkan::ApplyDisplayChanges(void)
         current_shadername = shadername;
     }
 
-    context->swapchain->set_vsync(GUI.Vsync);
+    if (context->swapchain->set_vsync(GUI.Vsync))
+    {
+        context->recreate_swapchain();
+    }
 
     return true;
 }