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 #11759 from TellowKrinkle/MTLPerfQueryFixes 

VideoBackends:Metal: Fix perf queries
This commit is contained in:
OatmealDome 2023-04-18 22:15:50 +02:00 committed by GitHub
parent 2e7f0d002e 09c80513cd
commit 8aae296d4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/VideoBackends/Metal/MTLStateTracker.h
View File

@ -270,6 +270,7 @@ private:
u32 texel_buffer_offset0; u32 texel_buffer_offset0;
u32 texel_buffer_offset1; u32 texel_buffer_offset1;
PerfQueryGroup perf_query_group = static_cast<PerfQueryGroup>(-1); PerfQueryGroup perf_query_group = static_cast<PerfQueryGroup>(-1);
u32 perf_query_id;
} m_state; } m_state;
u32 m_perf_query_tracker_counter = 0; u32 m_perf_query_tracker_counter = 0;

22
Source/Core/VideoBackends/Metal/MTLStateTracker.mm
View File

@ -674,6 +674,7 @@ std::shared_ptr<Metal::StateTracker::PerfQueryTracker> Metal::StateTracker::NewP
m_perf_query_tracker_counter++]]; m_perf_query_tracker_counter++]];
tracker->buffer = MRCTransfer(buffer); tracker->buffer = MRCTransfer(buffer);
tracker->contents = static_cast<const u64*>([buffer contents]); tracker->contents = static_cast<const u64*>([buffer contents]);
tracker->query_id = m_state.perf_query_id;
return tracker; return tracker;
} }
} }
@ -682,6 +683,8 @@ std::shared_ptr<Metal::StateTracker::PerfQueryTracker> Metal::StateTracker::NewP
// Reuse an old one // Reuse an old one
std::shared_ptr<PerfQueryTracker> tracker = std::move(m_perf_query_tracker_cache.back()); std::shared_ptr<PerfQueryTracker> tracker = std::move(m_perf_query_tracker_cache.back());
m_perf_query_tracker_cache.pop_back(); m_perf_query_tracker_cache.pop_back();
tracker->groups.clear();
tracker->query_id = m_state.perf_query_id;
return tracker; return tracker;
} }
} }
@ -689,15 +692,26 @@ std::shared_ptr<Metal::StateTracker::PerfQueryTracker> Metal::StateTracker::NewP
void Metal::StateTracker::EnablePerfQuery(PerfQueryGroup group, u32 query_id) void Metal::StateTracker::EnablePerfQuery(PerfQueryGroup group, u32 query_id)
{ {
m_state.perf_query_group = group; m_state.perf_query_group = group;
m_state.perf_query_id = query_id;
if (!m_current_perf_query || m_current_perf_query->query_id != query_id || if (!m_current_perf_query || m_current_perf_query->query_id != query_id ||
m_current_perf_query->groups.size() == PERF_QUERY_BUFFER_SIZE) m_current_perf_query->groups.size() == PERF_QUERY_BUFFER_SIZE)
{ {
if (m_current_render_encoder) if (m_current_render_encoder)
EndRenderPass(); EndRenderPass();
if (!m_current_perf_query) if (m_current_perf_query)
m_current_perf_query = NewPerfQueryTracker(); {
m_current_perf_query->groups.clear(); [m_current_render_cmdbuf
m_current_perf_query->query_id = query_id; addCompletedHandler:[backref = m_backref, q = std::move(m_current_perf_query)](id) {
std::lock_guard<std::mutex> guard(backref->mtx);
if (StateTracker* tracker = backref->state_tracker)
{
if (PerfQuery* query = static_cast<PerfQuery*>(g_perf_query.get()))
query->ReturnResults(q->contents, q->groups.data(), q->groups.size(), q->query_id);
tracker->m_perf_query_tracker_cache.emplace_back(std::move(q));
}
}];
m_current_perf_query.reset();
}
} }
} }