From 64852409dfc3824a6577e27a491a4c6af4d2ccd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 30 Aug 2023 10:47:20 +0200 Subject: [PATCH] Don't use the present time extensions (but keep the code around for future experiments) Seen some suspicious crashes on Poco F1. --- Common/GPU/Vulkan/VulkanFrameData.cpp | 22 +++++++++++++--------- Common/GPU/Vulkan/VulkanFrameData.h | 3 ++- Common/GPU/Vulkan/VulkanRenderManager.cpp | 10 +++++----- Common/GPU/Vulkan/VulkanRenderManager.h | 1 + 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/Common/GPU/Vulkan/VulkanFrameData.cpp b/Common/GPU/Vulkan/VulkanFrameData.cpp index 0ca94bd848..c2d233356c 100644 --- a/Common/GPU/Vulkan/VulkanFrameData.cpp +++ b/Common/GPU/Vulkan/VulkanFrameData.cpp @@ -116,14 +116,17 @@ VkResult FrameData::QueuePresent(VulkanContext *vulkan, FrameDataShared &shared) uint64_t frameId = this->frameId; VkPresentTimeGOOGLE presentTimeGOOGLE{ (uint32_t)frameId, 0 }; // it's ok to truncate this. it'll wrap around and work (if we ever reach 4 billion frames..) - if (vulkan->Extensions().KHR_present_id && vulkan->GetDeviceFeatures().enabled.presentId.presentId) { - presentID.pPresentIds = &frameId; - presentID.swapchainCount = 1; - present.pNext = &presentID; - } else if (vulkan->Extensions().GOOGLE_display_timing) { - presentGOOGLE.pTimes = &presentTimeGOOGLE; - presentGOOGLE.swapchainCount = 1; - present.pNext = &presentGOOGLE; + + if (shared.measurePresentTime) { + if (vulkan->Extensions().KHR_present_id && vulkan->GetDeviceFeatures().enabled.presentId.presentId) { + presentID.pPresentIds = &frameId; + presentID.swapchainCount = 1; + present.pNext = &presentID; + } else if (vulkan->Extensions().GOOGLE_display_timing) { + presentGOOGLE.pTimes = &presentTimeGOOGLE; + presentGOOGLE.swapchainCount = 1; + present.pNext = &presentGOOGLE; + } } return vkQueuePresentKHR(vulkan->GetGraphicsQueue(), &present); @@ -245,7 +248,7 @@ void FrameData::SubmitPending(VulkanContext *vulkan, FrameSubmitType type, Frame } } -void FrameDataShared::Init(VulkanContext *vulkan, bool useMultiThreading) { +void FrameDataShared::Init(VulkanContext *vulkan, bool useMultiThreading, bool measurePresentTime) { VkSemaphoreCreateInfo semaphoreCreateInfo = { VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO }; semaphoreCreateInfo.flags = 0; VkResult res = vkCreateSemaphore(vulkan->GetDevice(), &semaphoreCreateInfo, nullptr, &acquireSemaphore); @@ -258,6 +261,7 @@ void FrameDataShared::Init(VulkanContext *vulkan, bool useMultiThreading) { vulkan->SetDebugName(readbackFence, VK_OBJECT_TYPE_FENCE, "readbackFence"); this->useMultiThreading = useMultiThreading; + this->measurePresentTime = measurePresentTime; } void FrameDataShared::Destroy(VulkanContext *vulkan) { diff --git a/Common/GPU/Vulkan/VulkanFrameData.h b/Common/GPU/Vulkan/VulkanFrameData.h index a4638bb618..8b014dfff5 100644 --- a/Common/GPU/Vulkan/VulkanFrameData.h +++ b/Common/GPU/Vulkan/VulkanFrameData.h @@ -55,8 +55,9 @@ struct FrameDataShared { // For synchronous readbacks. VkFence readbackFence = VK_NULL_HANDLE; bool useMultiThreading; + bool measurePresentTime; - void Init(VulkanContext *vulkan, bool useMultiThreading); + void Init(VulkanContext *vulkan, bool useMultiThreading, bool measurePresentTime); void Destroy(VulkanContext *vulkan); }; diff --git a/Common/GPU/Vulkan/VulkanRenderManager.cpp b/Common/GPU/Vulkan/VulkanRenderManager.cpp index 7ec9c1ac47..a27e3bdce3 100644 --- a/Common/GPU/Vulkan/VulkanRenderManager.cpp +++ b/Common/GPU/Vulkan/VulkanRenderManager.cpp @@ -25,9 +25,6 @@ #define UINT64_MAX 0xFFFFFFFFFFFFFFFFULL #endif - -#define USE_PRESENT_WAIT 0 - using namespace PPSSPP_VK; // renderPass is an example of the "compatibility class" or RenderPassType type. @@ -260,7 +257,10 @@ VulkanRenderManager::VulkanRenderManager(VulkanContext *vulkan, bool useThread, { inflightFramesAtStart_ = vulkan_->GetInflightFrames(); - frameDataShared_.Init(vulkan, useThread); + // For present timing experiments. Disabled for now. + measurePresentTime_ = false; + + frameDataShared_.Init(vulkan, useThread, measurePresentTime_); for (int i = 0; i < inflightFramesAtStart_; i++) { frameData_[i].Init(vulkan, i); @@ -308,7 +308,7 @@ bool VulkanRenderManager::CreateBackbuffers() { INFO_LOG(G3D, "Starting Vulkan compiler thread"); compileThread_ = std::thread(&VulkanRenderManager::CompileThreadFunc, this); - if (USE_PRESENT_WAIT && vulkan_->Extensions().KHR_present_wait && vulkan_->GetPresentMode() == VK_PRESENT_MODE_FIFO_KHR) { + if (measurePresentTime_ && vulkan_->Extensions().KHR_present_wait && vulkan_->GetPresentMode() == VK_PRESENT_MODE_FIFO_KHR) { INFO_LOG(G3D, "Starting Vulkan present wait thread"); presentWaitThread_ = std::thread(&VulkanRenderManager::PresentWaitThreadFunc, this); } diff --git a/Common/GPU/Vulkan/VulkanRenderManager.h b/Common/GPU/Vulkan/VulkanRenderManager.h index 7d2d9f819f..32e5c7ccf3 100644 --- a/Common/GPU/Vulkan/VulkanRenderManager.h +++ b/Common/GPU/Vulkan/VulkanRenderManager.h @@ -495,6 +495,7 @@ private: bool run_ = false; bool useRenderThread_ = true; + bool measurePresentTime_ = false; // This is the offset within this frame, in case of a mid-frame sync. VKRStep *curRenderStep_ = nullptr;