summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei2018-11-27 18:42:21 -0500
committerGravatar bunnei2018-11-27 18:42:21 -0500
commitc568f5cea79fe2e9d93fb545aee9bf6b3f6d70ae (patch)
tree4e79aa2ac84b14d5414175fafd23f1754f063889 /src
parentgpu: Rewrite GPU command list processing with DmaPusher class. (diff)
downloadyuzu-c568f5cea79fe2e9d93fb545aee9bf6b3f6d70ae.tar.gz
yuzu-c568f5cea79fe2e9d93fb545aee9bf6b3f6d70ae.tar.xz
yuzu-c568f5cea79fe2e9d93fb545aee9bf6b3f6d70ae.zip
gpu: Move command list profiling to DmaPusher::DispatchCalls.
Diffstat (limited to 'src')
-rw-r--r--src/video_core/dma_pusher.cpp5
-rw-r--r--src/video_core/gpu.cpp5
2 files changed, 5 insertions, 5 deletions
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 @@
2// Licensed under GPLv2 or any later version 2// Licensed under GPLv2 or any later version
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include "common/microprofile.h"
5#include "core/core.h" 6#include "core/core.h"
6#include "core/memory.h" 7#include "core/memory.h"
7#include "video_core/dma_pusher.h" 8#include "video_core/dma_pusher.h"
@@ -14,7 +15,11 @@ DmaPusher::DmaPusher(GPU& gpu) : gpu(gpu) {}
14 15
15DmaPusher::~DmaPusher() = default; 16DmaPusher::~DmaPusher() = default;
16 17
18MICROPROFILE_DEFINE(DispatchCalls, "GPU", "Execute command buffer", MP_RGB(128, 128, 192));
19
17void DmaPusher::DispatchCalls() { 20void DmaPusher::DispatchCalls() {
21 MICROPROFILE_SCOPE(DispatchCalls);
22
18 // On entering GPU code, assume all memory may be touched by the ARM core. 23 // On entering GPU code, assume all memory may be touched by the ARM core.
19 gpu.Maxwell3D().dirty_flags.OnMemoryWrite(); 24 gpu.Maxwell3D().dirty_flags.OnMemoryWrite();
20 25
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 @@
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include "common/assert.h" 5#include "common/assert.h"
6#include "common/microprofile.h"
7#include "video_core/engines/fermi_2d.h" 6#include "video_core/engines/fermi_2d.h"
8#include "video_core/engines/kepler_memory.h" 7#include "video_core/engines/kepler_memory.h"
9#include "video_core/engines/maxwell_3d.h" 8#include "video_core/engines/maxwell_3d.h"
@@ -128,11 +127,7 @@ enum class BufferMethods {
128 CountBufferMethods = 0x40, 127 CountBufferMethods = 0x40,
129}; 128};
130 129
131MICROPROFILE_DEFINE(ProcessCommandLists, "GPU", "Execute command buffer", MP_RGB(128, 128, 192));
132
133void GPU::CallMethod(const MethodCall& method_call) { 130void GPU::CallMethod(const MethodCall& method_call) {
134 MICROPROFILE_SCOPE(ProcessCommandLists);
135
136 LOG_TRACE(HW_GPU, 131 LOG_TRACE(HW_GPU,
137 "Processing method {:08X} on subchannel {} value " 132 "Processing method {:08X} on subchannel {} value "
138 "{:08X} remaining params {}", 133 "{:08X} remaining params {}",