The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-25 07:21:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

VideoBackends:Vulkan: Fix queries

Browse Source 
Fixes both checking whether queries are done
and actually resets query pools.
This commit is contained in:
Robin Kertels 2022-11-16 17:34:41 +01:00
parent 8a1c28be63
commit 6ba7573877
No known key found for this signature in database
GPG Key ID: 3824904F14D40757
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Source/Core/VideoBackends/Vulkan/VKPerfQuery.cpp
View File

@ -35,6 +35,9 @@ bool PerfQuery::Initialize()
return false; return false;
} }
// Vulkan requires query pools to be reset after creation
ResetQuery();
return true; return true;
} }
@ -55,6 +58,7 @@ void PerfQuery::EnableQuery(PerfQueryGroup type)
ActiveQuery& entry = m_query_buffer[m_query_next_pos]; ActiveQuery& entry = m_query_buffer[m_query_next_pos];
DEBUG_ASSERT(!entry.has_value); DEBUG_ASSERT(!entry.has_value);
entry.has_value = true; entry.has_value = true;
entry.query_type = type;
// Use precise queries if supported, otherwise boolean (which will be incorrect). // Use precise queries if supported, otherwise boolean (which will be incorrect).
VkQueryControlFlags flags = VkQueryControlFlags flags =
@ -72,6 +76,9 @@ void PerfQuery::DisableQuery(PerfQueryGroup type)
if (type == PQG_ZCOMP_ZCOMPLOC || type == PQG_ZCOMP) if (type == PQG_ZCOMP_ZCOMPLOC || type == PQG_ZCOMP)
{ {
vkCmdEndQuery(g_command_buffer_mgr->GetCurrentCommandBuffer(), m_query_pool, m_query_next_pos); vkCmdEndQuery(g_command_buffer_mgr->GetCurrentCommandBuffer(), m_query_pool, m_query_next_pos);
ActiveQuery& entry = m_query_buffer[m_query_next_pos];
entry.fence_counter = g_command_buffer_mgr->GetCurrentFenceCounter();
m_query_next_pos = (m_query_next_pos + 1) % PERF_QUERY_BUFFER_SIZE; m_query_next_pos = (m_query_next_pos + 1) % PERF_QUERY_BUFFER_SIZE;
m_query_count.fetch_add(1, std::memory_order_relaxed); m_query_count.fetch_add(1, std::memory_order_relaxed);
} }
@ -119,8 +126,10 @@ u32 PerfQuery::GetQueryResult(PerfQueryType type)
void PerfQuery::FlushResults() void PerfQuery::FlushResults()
{ {
while (!IsFlushed()) if (!IsFlushed())
PartialFlush(true); PartialFlush(true);
ASSERT(IsFlushed());
} }
bool PerfQuery::IsFlushed() const bool PerfQuery::IsFlushed() const
@ -185,13 +194,17 @@ void PerfQuery::ReadbackQueries(u32 query_count)
(m_query_readback_pos + query_count) <= PERF_QUERY_BUFFER_SIZE); (m_query_readback_pos + query_count) <= PERF_QUERY_BUFFER_SIZE);
// Read back from the GPU. // Read back from the GPU.
VkResult res = VkResult res = vkGetQueryPoolResults(
vkGetQueryPoolResults(g_vulkan_context->GetDevice(), m_query_pool, m_query_readback_pos, g_vulkan_context->GetDevice(), m_query_pool, m_query_readback_pos, query_count,
query_count, query_count * sizeof(PerfQueryDataType), query_count * sizeof(PerfQueryDataType), m_query_result_buffer.data(),
m_query_result_buffer.data(), sizeof(PerfQueryDataType), 0); sizeof(PerfQueryDataType), VK_QUERY_RESULT_WAIT_BIT);
if (res != VK_SUCCESS) if (res != VK_SUCCESS)
LOG_VULKAN_ERROR(res, "vkGetQueryPoolResults failed: "); LOG_VULKAN_ERROR(res, "vkGetQueryPoolResults failed: ");
StateTracker::GetInstance()->EndRenderPass();
vkCmdResetQueryPool(g_command_buffer_mgr->GetCurrentCommandBuffer(), m_query_pool,
m_query_readback_pos, query_count);
// Remove pending queries. // Remove pending queries.
for (u32 i = 0; i < query_count; i++) for (u32 i = 0; i < query_count; i++)
{ {

2
Source/Core/VideoBackends/Vulkan/VKPerfQuery.h
View File

@ -40,7 +40,7 @@ private:
struct ActiveQuery struct ActiveQuery
{ {
u64 fence_counter; u64 fence_counter;
PerfQueryType query_type; PerfQueryGroup query_type;
bool has_value; bool has_value;
}; };