Răsfoiți Sursa

gpu: Move command list profiling to DmaPusher::DispatchCalls.

bunnei 7 ani în urmă
părinte
comite
c568f5cea7
2 a modificat fișierele cu 5 adăugiri și 5 ștergeri
  1. 5 0
      src/video_core/dma_pusher.cpp
  2. 0 5
      src/video_core/gpu.cpp

+ 5 - 0
src/video_core/dma_pusher.cpp

@@ -2,6 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 // Refer to the license.txt file included.
 
 
+#include "common/microprofile.h"
 #include "core/core.h"
 #include "core/core.h"
 #include "core/memory.h"
 #include "core/memory.h"
 #include "video_core/dma_pusher.h"
 #include "video_core/dma_pusher.h"
@@ -14,7 +15,11 @@ DmaPusher::DmaPusher(GPU& gpu) : gpu(gpu) {}
 
 
 DmaPusher::~DmaPusher() = default;
 DmaPusher::~DmaPusher() = default;
 
 
+MICROPROFILE_DEFINE(DispatchCalls, "GPU", "Execute command buffer", MP_RGB(128, 128, 192));
+
 void DmaPusher::DispatchCalls() {
 void DmaPusher::DispatchCalls() {
+    MICROPROFILE_SCOPE(DispatchCalls);
+
     // On entering GPU code, assume all memory may be touched by the ARM core.
     // On entering GPU code, assume all memory may be touched by the ARM core.
     gpu.Maxwell3D().dirty_flags.OnMemoryWrite();
     gpu.Maxwell3D().dirty_flags.OnMemoryWrite();
 
 

+ 0 - 5
src/video_core/gpu.cpp

@@ -3,7 +3,6 @@
 // Refer to the license.txt file included.
 // Refer to the license.txt file included.
 
 
 #include "common/assert.h"
 #include "common/assert.h"
-#include "common/microprofile.h"
 #include "video_core/engines/fermi_2d.h"
 #include "video_core/engines/fermi_2d.h"
 #include "video_core/engines/kepler_memory.h"
 #include "video_core/engines/kepler_memory.h"
 #include "video_core/engines/maxwell_3d.h"
 #include "video_core/engines/maxwell_3d.h"
@@ -128,11 +127,7 @@ enum class BufferMethods {
     CountBufferMethods = 0x40,
     CountBufferMethods = 0x40,
 };
 };
 
 
-MICROPROFILE_DEFINE(ProcessCommandLists, "GPU", "Execute command buffer", MP_RGB(128, 128, 192));
-
 void GPU::CallMethod(const MethodCall& method_call) {
 void GPU::CallMethod(const MethodCall& method_call) {
-    MICROPROFILE_SCOPE(ProcessCommandLists);
-
     LOG_TRACE(HW_GPU,
     LOG_TRACE(HW_GPU,
               "Processing method {:08X} on subchannel {} value "
               "Processing method {:08X} on subchannel {} value "
               "{:08X} remaining params {}",
               "{:08X} remaining params {}",