summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bunnei2020-05-16 02:00:14 -0400
committerGravatar GitHub2020-05-16 02:00:14 -0400
commit74d5c0ed2fe0b545cba59b97a235c1a06f02186f (patch)
tree433e987e31db39ed9eadbcd4b39afe464774239c
parentMerge pull request #3942 from ReinUsesLisp/flush-and-invalidate (diff)
parentDmaPusher: Remove dead code in step (diff)
downloadyuzu-74d5c0ed2fe0b545cba59b97a235c1a06f02186f.tar.gz
yuzu-74d5c0ed2fe0b545cba59b97a235c1a06f02186f.tar.xz
yuzu-74d5c0ed2fe0b545cba59b97a235c1a06f02186f.zip
Merge pull request #3944 from ogniK5377/dma_mget
DmaPusher: Remove dead code in step
-rw-r--r--src/video_core/dma_pusher.cpp9
-rw-r--r--src/video_core/dma_pusher.h1
2 files changed, 1 insertions, 9 deletions
diff --git a/src/video_core/dma_pusher.cpp b/src/video_core/dma_pusher.cpp
index bdc023d54..f2f96ac33 100644
--- a/src/video_core/dma_pusher.cpp
+++ b/src/video_core/dma_pusher.cpp
@@ -54,9 +54,7 @@ bool DmaPusher::Step() {
54 return true; 54 return true;
55 }); 55 });
56 const CommandListHeader command_list_header{command_list[dma_pushbuffer_subindex++]}; 56 const CommandListHeader command_list_header{command_list[dma_pushbuffer_subindex++]};
57 GPUVAddr dma_get = command_list_header.addr; 57 const GPUVAddr dma_get = command_list_header.addr;
58 GPUVAddr dma_put = dma_get + command_list_header.size * sizeof(u32);
59 bool non_main = command_list_header.is_non_main;
60 58
61 if (dma_pushbuffer_subindex >= command_list.size()) { 59 if (dma_pushbuffer_subindex >= command_list.size()) {
62 // We've gone through the current list, remove it from the queue 60 // We've gone through the current list, remove it from the queue
@@ -133,11 +131,6 @@ bool DmaPusher::Step() {
133 index++; 131 index++;
134 } 132 }
135 133
136 if (!non_main) {
137 // TODO (degasus): This is dead code, as dma_mget is never read.
138 dma_mget = dma_put;
139 }
140
141 return true; 134 return true;
142} 135}
143 136
diff --git a/src/video_core/dma_pusher.h b/src/video_core/dma_pusher.h
index e8b714e94..efa90d170 100644
--- a/src/video_core/dma_pusher.h
+++ b/src/video_core/dma_pusher.h
@@ -102,7 +102,6 @@ private:
102 DmaState dma_state{}; 102 DmaState dma_state{};
103 bool dma_increment_once{}; 103 bool dma_increment_once{};
104 104
105 GPUVAddr dma_mget{}; ///< main pushbuffer last read address
106 bool ib_enable{true}; ///< IB mode enabled 105 bool ib_enable{true}; ///< IB mode enabled
107 106
108 std::array<Tegra::Engines::EngineInterface*, max_subchannels> subchannels{}; 107 std::array<Tegra::Engines::EngineInterface*, max_subchannels> subchannels{};