From ec36fce7c6b1b3920a054b3da971b84459de6179 Mon Sep 17 00:00:00 2001
From: iwubcode <iwubcode@users.noreply.github.com>
Date: Tue, 1 Apr 2025 18:32:42 -0500
Subject: [PATCH] VideoCommon: fix a mali bug by moving the perf queries back
to being close to the draw call, having them apart seems to cause errors on
some devices
---
Source/Core/VideoCommon/VertexManagerBase.cpp | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/Source/Core/VideoCommon/VertexManagerBase.cpp b/Source/Core/VideoCommon/VertexManagerBase.cpp
index 7987887b86..64246df904 100644
--- a/Source/Core/VideoCommon/VertexManagerBase.cpp
+++ b/Source/Core/VideoCommon/VertexManagerBase.cpp
@@ -644,9 +644,6 @@ void VertexManagerBase::Flush()
// Same with GPU texture decoding, which uses compute shaders.
g_texture_cache->BindTextures(used_textures, samplers);
- if (PerfQueryBase::ShouldEmulate())
- g_perf_query->EnableQuery(bpmem.zcontrol.early_ztest ? PQG_ZCOMP_ZCOMPLOC : PQG_ZCOMP);
-
if (!skip)
{
UpdatePipelineConfig();
@@ -668,15 +665,9 @@ void VertexManagerBase::Flush()
}
}
- // Track the total emulated state draws
- INCSTAT(g_stats.this_frame.num_draw_calls);
-
// Even if we skip the draw, emulated state should still be impacted
OnDraw();
- if (PerfQueryBase::ShouldEmulate())
- g_perf_query->DisableQuery(bpmem.zcontrol.early_ztest ? PQG_ZCOMP_ZCOMPLOC : PQG_ZCOMP);
-
// The EFB cache is now potentially stale.
g_framebuffer_manager->FlagPeekCacheAsOutOfDate();
}
@@ -1098,7 +1089,16 @@ void VertexManagerBase::RenderDrawCall(
base_vertex <<= 2;
}
+ if (PerfQueryBase::ShouldEmulate())
+ g_perf_query->EnableQuery(bpmem.zcontrol.early_ztest ? PQG_ZCOMP_ZCOMPLOC : PQG_ZCOMP);
+
DrawCurrentBatch(base_index, m_index_generator.GetIndexLen(), base_vertex);
+
+ // Track the total emulated state draws
+ INCSTAT(g_stats.this_frame.num_draw_calls);
+
+ if (PerfQueryBase::ShouldEmulate())
+ g_perf_query->DisableQuery(bpmem.zcontrol.early_ztest ? PQG_ZCOMP_ZCOMPLOC : PQG_ZCOMP);
}
const AbstractPipeline* VertexManagerBase::GetCustomPipeline(