diff options
| author | 2019-02-20 21:24:56 -0500 | |
|---|---|---|
| committer | 2019-02-20 21:24:56 -0500 | |
| commit | ae437320c84e8c5fff69e8cec413e63b11f952b6 (patch) | |
| tree | d7f7f74d87fdaa6dd9ec829086e8c3814ae0506b /src/video_core/gpu.h | |
| parent | Fixes Unicode Key File Directories (#2120) (diff) | |
| parent | video_core: Remove usages of System::GetInstance() within the engines (diff) | |
| download | yuzu-ae437320c84e8c5fff69e8cec413e63b11f952b6.tar.gz yuzu-ae437320c84e8c5fff69e8cec413e63b11f952b6.tar.xz yuzu-ae437320c84e8c5fff69e8cec413e63b11f952b6.zip | |
Merge pull request #2130 from lioncash/system_engine
video_core: Remove usages of System::GetInstance() within the engines
Diffstat (limited to 'src/video_core/gpu.h')
| -rw-r--r-- | src/video_core/gpu.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/video_core/gpu.h b/src/video_core/gpu.h index a482196ea..0f5bfdcbf 100644 --- a/src/video_core/gpu.h +++ b/src/video_core/gpu.h | |||
| @@ -6,12 +6,15 @@ | |||
| 6 | 6 | ||
| 7 | #include <array> | 7 | #include <array> |
| 8 | #include <memory> | 8 | #include <memory> |
| 9 | #include <vector> | ||
| 10 | #include "common/common_types.h" | 9 | #include "common/common_types.h" |
| 11 | #include "core/hle/service/nvflinger/buffer_queue.h" | 10 | #include "core/hle/service/nvflinger/buffer_queue.h" |
| 12 | #include "video_core/dma_pusher.h" | 11 | #include "video_core/dma_pusher.h" |
| 13 | #include "video_core/memory_manager.h" | 12 | #include "video_core/memory_manager.h" |
| 14 | 13 | ||
| 14 | namespace Core { | ||
| 15 | class System; | ||
| 16 | } | ||
| 17 | |||
| 15 | namespace VideoCore { | 18 | namespace VideoCore { |
| 16 | class RasterizerInterface; | 19 | class RasterizerInterface; |
| 17 | } | 20 | } |
| @@ -118,7 +121,7 @@ enum class EngineID { | |||
| 118 | 121 | ||
| 119 | class GPU final { | 122 | class GPU final { |
| 120 | public: | 123 | public: |
| 121 | explicit GPU(VideoCore::RasterizerInterface& rasterizer); | 124 | explicit GPU(Core::System& system, VideoCore::RasterizerInterface& rasterizer); |
| 122 | ~GPU(); | 125 | ~GPU(); |
| 123 | 126 | ||
| 124 | struct MethodCall { | 127 | struct MethodCall { |