ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GS/Vulkan: Work around validation layer semaphore error

This commit is contained in:
Stenzek 2024-05-25 02:22:59 +10:00 committed by Connor McLaughlin
parent c7a21a60cf
commit 3928014e5c
2 changed files with 17 additions and 15 deletions
pcsx2/GS/Renderers/Vulkan
VKSwapChain.cppVKSwapChain.h

22
pcsx2/GS/Renderers/Vulkan/VKSwapChain.cpp
View File

@ -18,6 +18,8 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#endif #endif
static_assert(VKSwapChain::NUM_SEMAPHORES == (GSDeviceVK::NUM_COMMAND_BUFFERS + 1));
VKSwapChain::VKSwapChain(const WindowInfo& wi, VkSurfaceKHR surface, VkPresentModeKHR present_mode, VKSwapChain::VKSwapChain(const WindowInfo& wi, VkSurfaceKHR surface, VkPresentModeKHR present_mode,
std::optional<bool> exclusive_fullscreen_control) std::optional<bool> exclusive_fullscreen_control)
: m_window_info(wi) : m_window_info(wi)
@ -455,15 +457,10 @@ bool VKSwapChain::CreateSwapChain()
m_images.push_back(std::move(texture)); m_images.push_back(std::move(texture));
} }
// We don't actually need +1 semaphores, or, more than one really.
// But, the validation layer gets cranky if we don't fence wait before the next image acquire.
// So, add an additional semaphore to ensure that we're never acquiring before fence waiting.
const u32 semaphore_count = (image_count + 1);
m_semaphores.reserve(semaphore_count);
m_current_semaphore = 0; m_current_semaphore = 0;
for (u32 i = 0; i < semaphore_count; i++) for (u32 i = 0; i < NUM_SEMAPHORES; i++)
{ {
ImageSemaphores sema; ImageSemaphores& sema = m_semaphores[i];
const VkSemaphoreCreateInfo semaphore_info = {VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO, nullptr, 0}; const VkSemaphoreCreateInfo semaphore_info = {VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO, nullptr, 0};
res = vkCreateSemaphore( res = vkCreateSemaphore(
@ -480,10 +477,9 @@ bool VKSwapChain::CreateSwapChain()
{ {
LOG_VULKAN_ERROR(res, "vkCreateSemaphore failed: "); LOG_VULKAN_ERROR(res, "vkCreateSemaphore failed: ");
vkDestroySemaphore(GSDeviceVK::GetInstance()->GetDevice(), sema.available_semaphore, nullptr); vkDestroySemaphore(GSDeviceVK::GetInstance()->GetDevice(), sema.available_semaphore, nullptr);
sema.available_semaphore = VK_NULL_HANDLE;
return false; return false;
} }
m_semaphores.push_back(sema);
} }
return true; return true;
@ -499,10 +495,12 @@ void VKSwapChain::DestroySwapChainImages()
m_images.clear(); m_images.clear();
for (auto& it : m_semaphores) for (auto& it : m_semaphores)
{ {
vkDestroySemaphore(GSDeviceVK::GetInstance()->GetDevice(), it.rendering_finished_semaphore, nullptr); if (it.rendering_finished_semaphore != VK_NULL_HANDLE)
vkDestroySemaphore(GSDeviceVK::GetInstance()->GetDevice(), it.available_semaphore, nullptr); vkDestroySemaphore(GSDeviceVK::GetInstance()->GetDevice(), it.rendering_finished_semaphore, nullptr);
if (it.available_semaphore != VK_NULL_HANDLE)
vkDestroySemaphore(GSDeviceVK::GetInstance()->GetDevice(), it.available_semaphore, nullptr);
} }
m_semaphores.clear(); m_semaphores = {};
m_image_acquire_result.reset(); m_image_acquire_result.reset();
} }

10
pcsx2/GS/Renderers/Vulkan/VKSwapChain.h
View File

@ -8,6 +8,7 @@
#include "common/WindowInfo.h" #include "common/WindowInfo.h"
#include <array>
#include <memory> #include <memory>
#include <optional> #include <optional>
#include <vector> #include <vector>
@ -15,6 +16,11 @@
class VKSwapChain class VKSwapChain
{ {
public: public:
// We don't actually need +1 semaphores, or, more than one really.
// But, the validation layer gets cranky if we don't fence wait before the next image acquire.
// So, add an additional semaphore to ensure that we're never acquiring before fence waiting.
static constexpr u32 NUM_SEMAPHORES = 4; // Should be command buffers + 1
~VKSwapChain(); ~VKSwapChain();
// Creates a vulkan-renderable surface for the specified window handle. // Creates a vulkan-renderable surface for the specified window handle.
@ -81,8 +87,6 @@ private:
bool CreateSwapChain(); bool CreateSwapChain();
void DestroySwapChain(); void DestroySwapChain();
bool SetupSwapChainImages(VkFormat image_format);
void DestroySwapChainImages(); void DestroySwapChainImages();
void DestroySurface(); void DestroySurface();
@ -99,7 +103,7 @@ private:
VkSwapchainKHR m_swap_chain = VK_NULL_HANDLE; VkSwapchainKHR m_swap_chain = VK_NULL_HANDLE;
std::vector<std::unique_ptr<GSTextureVK>> m_images; std::vector<std::unique_ptr<GSTextureVK>> m_images;
std::vector<ImageSemaphores> m_semaphores; std::array<ImageSemaphores, NUM_SEMAPHORES> m_semaphores = {};
u32 m_current_image = 0; u32 m_current_image = 0;
u32 m_current_semaphore = 0; u32 m_current_semaphore = 0;