From c568f5cea79fe2e9d93fb545aee9bf6b3f6d70ae Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Tue, 27 Nov 2018 18:42:21 -0500
Subject: gpu: Move command list profiling to DmaPusher::DispatchCalls.

---
 src/video_core/dma_pusher.cpp | 5 +++++
 src/video_core/gpu.cpp        | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/video_core/dma_pusher.cpp b/src/video_core/dma_pusher.cpp
index 9f85a7aca..23ec97944 100644
--- a/src/video_core/dma_pusher.cpp
+++ b/src/video_core/dma_pusher.cpp
@@ -2,6 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "common/microprofile.h"
 #include "core/core.h"
 #include "core/memory.h"
 #include "video_core/dma_pusher.h"
@@ -14,7 +15,11 @@ DmaPusher::DmaPusher(GPU& gpu) : gpu(gpu) {}
 
 DmaPusher::~DmaPusher() = default;
 
+MICROPROFILE_DEFINE(DispatchCalls, "GPU", "Execute command buffer", MP_RGB(128, 128, 192));
+
 void DmaPusher::DispatchCalls() {
+    MICROPROFILE_SCOPE(DispatchCalls);
+
     // On entering GPU code, assume all memory may be touched by the ARM core.
     gpu.Maxwell3D().dirty_flags.OnMemoryWrite();
 
diff --git a/src/video_core/gpu.cpp b/src/video_core/gpu.cpp
index 4a96530ae..6c81dee64 100644
--- a/src/video_core/gpu.cpp
+++ b/src/video_core/gpu.cpp
@@ -3,7 +3,6 @@
 // Refer to the license.txt file included.
 
 #include "common/assert.h"
-#include "common/microprofile.h"
 #include "video_core/engines/fermi_2d.h"
 #include "video_core/engines/kepler_memory.h"
 #include "video_core/engines/maxwell_3d.h"
@@ -128,11 +127,7 @@ enum class BufferMethods {
     CountBufferMethods = 0x40,
 };
 
-MICROPROFILE_DEFINE(ProcessCommandLists, "GPU", "Execute command buffer", MP_RGB(128, 128, 192));
-
 void GPU::CallMethod(const MethodCall& method_call) {
-    MICROPROFILE_SCOPE(ProcessCommandLists);
-
     LOG_TRACE(HW_GPU,
               "Processing method {:08X} on subchannel {} value "
               "{:08X} remaining params {}",
-- 
cgit v1.2.3