Merge pull request #18012 from hrydgard/disable-present-time-measurement

Vulkan: Don't use the present time extensions (but keep the code around for future experiments)
This commit is contained in:
Henrik Rydgård authored and GitHub committed 2023-08-30 11:10:29 +02:00
commit 0db32660bd
4 files changed
+21 -15

No files matched your search

+13 -9
View File
@@ -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) {
+2 -1
View File
@@ -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);
};
+5 -5
View File
@@ -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);
}
+1
View File
@@ -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;