diff options
| author | 2020-04-19 16:12:06 -0400 | |
|---|---|---|
| committer | 2020-04-19 16:12:08 -0400 | |
| commit | 44e959157bf8247549e1d35e9332a66fc6a0cb9d (patch) | |
| tree | a03646cd5230bb425223fa5758777a3130a62e30 /src/video_core/dma_pusher.h | |
| parent | Merge pull request #3686 from lioncash/table (diff) | |
| download | yuzu-44e959157bf8247549e1d35e9332a66fc6a0cb9d.tar.gz yuzu-44e959157bf8247549e1d35e9332a66fc6a0cb9d.tar.xz yuzu-44e959157bf8247549e1d35e9332a66fc6a0cb9d.zip | |
dma_pusher: Remove reliance on the global system instance
With this, the video core is now has no calls to the global system
instance at all.
Diffstat (limited to 'src/video_core/dma_pusher.h')
| -rw-r--r-- | src/video_core/dma_pusher.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/video_core/dma_pusher.h b/src/video_core/dma_pusher.h index 6ab06518f..d6188614a 100644 --- a/src/video_core/dma_pusher.h +++ b/src/video_core/dma_pusher.h | |||
| @@ -10,6 +10,10 @@ | |||
| 10 | #include "common/bit_field.h" | 10 | #include "common/bit_field.h" |
| 11 | #include "common/common_types.h" | 11 | #include "common/common_types.h" |
| 12 | 12 | ||
| 13 | namespace Core { | ||
| 14 | class System; | ||
| 15 | } | ||
| 16 | |||
| 13 | namespace Tegra { | 17 | namespace Tegra { |
| 14 | 18 | ||
| 15 | enum class SubmissionMode : u32 { | 19 | enum class SubmissionMode : u32 { |
| @@ -56,7 +60,7 @@ using CommandList = std::vector<Tegra::CommandListHeader>; | |||
| 56 | */ | 60 | */ |
| 57 | class DmaPusher { | 61 | class DmaPusher { |
| 58 | public: | 62 | public: |
| 59 | explicit DmaPusher(GPU& gpu); | 63 | explicit DmaPusher(Core::System& system, GPU& gpu); |
| 60 | ~DmaPusher(); | 64 | ~DmaPusher(); |
| 61 | 65 | ||
| 62 | void Push(CommandList&& entries) { | 66 | void Push(CommandList&& entries) { |
| @@ -72,8 +76,6 @@ private: | |||
| 72 | 76 | ||
| 73 | void CallMethod(u32 argument) const; | 77 | void CallMethod(u32 argument) const; |
| 74 | 78 | ||
| 75 | GPU& gpu; | ||
| 76 | |||
| 77 | std::vector<CommandHeader> command_headers; ///< Buffer for list of commands fetched at once | 79 | std::vector<CommandHeader> command_headers; ///< Buffer for list of commands fetched at once |
| 78 | 80 | ||
| 79 | std::queue<CommandList> dma_pushbuffer; ///< Queue of command lists to be processed | 81 | std::queue<CommandList> dma_pushbuffer; ///< Queue of command lists to be processed |
| @@ -92,6 +94,9 @@ private: | |||
| 92 | 94 | ||
| 93 | GPUVAddr dma_mget{}; ///< main pushbuffer last read address | 95 | GPUVAddr dma_mget{}; ///< main pushbuffer last read address |
| 94 | bool ib_enable{true}; ///< IB mode enabled | 96 | bool ib_enable{true}; ///< IB mode enabled |
| 97 | |||
| 98 | GPU& gpu; | ||
| 99 | Core::System& system; | ||
| 95 | }; | 100 | }; |
| 96 | 101 | ||
| 97 | } // namespace Tegra | 102 | } // namespace Tegra |