Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-09 15:45:40 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix swapchain synchronization issues

Browse source 
While we wait on the CPU-side fence for these command buffers, we must
also wait on the GPU-side semaphore to be compliant to validation
layers synchronization. We still get an error on the very first frame
since it will wait for a semaphore that has nothing signaling it.
This commit is contained in:
Wunkolo 2023-08-17 21:23:19 -07:00
parent 52ddaae221
commit 6052abe551
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/core/renderer_vk/renderer_vk.cpp
View file

@ -508,10 +508,23 @@ void RendererVK::display() {
vk::SubmitInfo submitInfo = {};
// Wait for any previous uses of the image image to finish presenting
if (swapchainImageIndex != swapchainImageInvalid) {
submitInfo.setWaitSemaphores(swapImageFreeSemaphore[frameBufferingIndex].get());
static const vk::PipelineStageFlags waitStageMask = vk::PipelineStageFlagBits::eColorAttachmentOutput;
submitInfo.setWaitDstStageMask(waitStageMask);
std::vector<vk::Semaphore> waitSemaphores;
std::vector<vk::PipelineStageFlags> waitSemaphoreStages;
{
if (swapchainImageIndex != swapchainImageInvalid) {
waitSemaphores.emplace_back(swapImageFreeSemaphore[frameBufferingIndex].get());
static const vk::PipelineStageFlags waitStageMask = vk::PipelineStageFlagBits::eColorAttachmentOutput;
waitSemaphoreStages.emplace_back(waitStageMask);
}
// Ensure a proper semaphore wait on render-finished
// We already wait on the fence, but this must be done to be compliant
// to validation layers
waitSemaphores.emplace_back(renderFinishedSemaphore[frameBufferingIndex].get());
waitSemaphoreStages.emplace_back(vk::PipelineStageFlagBits::eColorAttachmentOutput);
submitInfo.setWaitSemaphores(waitSemaphores);
submitInfo.setWaitDstStageMask(waitSemaphoreStages);
}
// Signal when finished
submitInfo.setSignalSemaphores(renderFinishedSemaphore[frameBufferingIndex].get());
@ -880,12 +893,16 @@ void RendererVK::initGraphicsContext(SDL_Window* window) {
for (usize i = 0; i < frameBufferingCount; i++) {
if (auto createResult = device->createSemaphoreUnique(semaphoreInfo); createResult.result == vk::Result::eSuccess) {
swapImageFreeSemaphore[i] = std::move(createResult.value);
Vulkan::setObjectName(device.get(), swapImageFreeSemaphore[i].get(), "swapImageFreeSemaphore#%zu", i);
} else {
Helpers::panic("Error creating 'present-ready' semaphore: %s\n", vk::to_string(createResult.result).c_str());
}
if (auto createResult = device->createSemaphoreUnique(semaphoreInfo); createResult.result == vk::Result::eSuccess) {
renderFinishedSemaphore[i] = std::move(createResult.value);
Vulkan::setObjectName(device.get(), renderFinishedSemaphore[i].get(), "renderFinishedSemaphore#%zu", i);
} else {
Helpers::panic("Error creating 'post-render' semaphore: %s\n", vk::to_string(createResult.result).c_str());
}