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

Merge pull request #9731 from JosJuice/perf-queries-slow 

Fix perf query regression
This commit is contained in:
Mai M 2021-05-21 10:14:51 -04:00 committed by GitHub
parent 0a2fde73a2 1d3b9fdec2
commit bc89df897e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/VideoBackends/D3D/D3DPerfQuery.cpp
View File

@ -27,16 +27,20 @@ PerfQuery::~PerfQuery() = default;
void PerfQuery::EnableQuery(PerfQueryGroup type) void PerfQuery::EnableQuery(PerfQueryGroup type)
{ {
const u32 query_count = m_query_count.load(std::memory_order_relaxed); u32 query_count = m_query_count.load(std::memory_order_relaxed);
// Is this sane? // Is this sane?
if (query_count > m_query_buffer.size() / 2) if (query_count > m_query_buffer.size() / 2)
{
WeakFlush(); WeakFlush();
query_count = m_query_count.load(std::memory_order_relaxed);
}
if (m_query_buffer.size() == query_count) if (m_query_buffer.size() == query_count)
{ {
// TODO // TODO
FlushOne(); FlushOne();
query_count = m_query_count.load(std::memory_order_relaxed);
ERROR_LOG_FMT(VIDEO, "Flushed query buffer early!"); ERROR_LOG_FMT(VIDEO, "Flushed query buffer early!");
} }

13
Source/Core/VideoBackends/OGL/OGLPerfQuery.cpp
View File

@ -99,15 +99,19 @@ PerfQueryGL::~PerfQueryGL()
void PerfQueryGL::EnableQuery(PerfQueryGroup type) void PerfQueryGL::EnableQuery(PerfQueryGroup type)
{ {
const u32 query_count = m_query_count.load(std::memory_order_relaxed); u32 query_count = m_query_count.load(std::memory_order_relaxed);
// Is this sane? // Is this sane?
if (query_count > m_query_buffer.size() / 2) if (query_count > m_query_buffer.size() / 2)
{
WeakFlush(); WeakFlush();
query_count = m_query_count.load(std::memory_order_relaxed);
}
if (m_query_buffer.size() == query_count) if (m_query_buffer.size() == query_count)
{ {
FlushOne(); FlushOne();
query_count = m_query_count.load(std::memory_order_relaxed);
// ERROR_LOG_FMT(VIDEO, "Flushed query buffer early!"); // ERROR_LOG_FMT(VIDEO, "Flushed query buffer early!");
} }
@ -195,14 +199,19 @@ PerfQueryGLESNV::~PerfQueryGLESNV()
void PerfQueryGLESNV::EnableQuery(PerfQueryGroup type) void PerfQueryGLESNV::EnableQuery(PerfQueryGroup type)
{ {
const u32 query_count = m_query_count.load(std::memory_order_relaxed); u32 query_count = m_query_count.load(std::memory_order_relaxed);
// Is this sane? // Is this sane?
if (query_count > m_query_buffer.size() / 2) if (query_count > m_query_buffer.size() / 2)
{
WeakFlush(); WeakFlush();
query_count = m_query_count.load(std::memory_order_relaxed);
}
if (m_query_buffer.size() == query_count) if (m_query_buffer.size() == query_count)
{ {
FlushOne(); FlushOne();
query_count = m_query_count.load(std::memory_order_relaxed);
// ERROR_LOG_FMT(VIDEO, "Flushed query buffer early!"); // ERROR_LOG_FMT(VIDEO, "Flushed query buffer early!");
} }