summaryrefslogtreecommitdiff
path: root/src/video_core/dma_pusher.cpp
diff options
context:
space:
mode:
authorGravatar Lioncash2020-12-04 14:39:12 -0500
committerGravatar Lioncash2020-12-04 16:19:09 -0500
commit677a8b208d47d0d2397197ce74c7039a8ea79d20 (patch)
tree51f6cc58b69b42c7af300c6c56abd0af37e0c748 /src/video_core/dma_pusher.cpp
parentMerge pull request #5064 from lioncash/node-shadow (diff)
downloadyuzu-677a8b208d47d0d2397197ce74c7039a8ea79d20.tar.gz
yuzu-677a8b208d47d0d2397197ce74c7039a8ea79d20.tar.xz
yuzu-677a8b208d47d0d2397197ce74c7039a8ea79d20.zip
video_core: Resolve more variable shadowing scenarios
Resolves variable shadowing scenarios up to the end of the OpenGL code to make it nicer to review. The rest will be resolved in a following commit.
Diffstat (limited to 'src/video_core/dma_pusher.cpp')
-rw-r--r--src/video_core/dma_pusher.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/video_core/dma_pusher.cpp b/src/video_core/dma_pusher.cpp
index d8801b1f5..2c8b20024 100644
--- a/src/video_core/dma_pusher.cpp
+++ b/src/video_core/dma_pusher.cpp
@@ -13,7 +13,7 @@
13 13
14namespace Tegra { 14namespace Tegra {
15 15
16DmaPusher::DmaPusher(Core::System& system, GPU& gpu) : gpu{gpu}, system{system} {} 16DmaPusher::DmaPusher(Core::System& system_, GPU& gpu_) : gpu{gpu_}, system{system_} {}
17 17
18DmaPusher::~DmaPusher() = default; 18DmaPusher::~DmaPusher() = default;
19 19
@@ -152,7 +152,12 @@ void DmaPusher::SetState(const CommandHeader& command_header) {
152 152
153void DmaPusher::CallMethod(u32 argument) const { 153void DmaPusher::CallMethod(u32 argument) const {
154 if (dma_state.method < non_puller_methods) { 154 if (dma_state.method < non_puller_methods) {
155 gpu.CallMethod({dma_state.method, argument, dma_state.subchannel, dma_state.method_count}); 155 gpu.CallMethod(GPU::MethodCall{
156 dma_state.method,
157 argument,
158 dma_state.subchannel,
159 dma_state.method_count,
160 });
156 } else { 161 } else {
157 subchannels[dma_state.subchannel]->CallMethod(dma_state.method, argument, 162 subchannels[dma_state.subchannel]->CallMethod(dma_state.method, argument,
158 dma_state.is_last_call); 163 dma_state.is_last_call);