diff options
| author | 2018-02-11 23:44:12 -0500 | |
|---|---|---|
| committer | 2018-02-11 23:44:12 -0500 | |
| commit | 6cddf9d88e7fc49919fda92bcd4235797c56f07f (patch) | |
| tree | 3f7da3795b5561b2d325325b72610996e2857742 /src/core/core.h | |
| parent | GPU: Added a command processor to decode the GPU pushbuffers and forward the ... (diff) | |
| download | yuzu-6cddf9d88e7fc49919fda92bcd4235797c56f07f.tar.gz yuzu-6cddf9d88e7fc49919fda92bcd4235797c56f07f.tar.xz yuzu-6cddf9d88e7fc49919fda92bcd4235797c56f07f.zip | |
Make a GPU class in VideoCore to contain the GPU state.
Also moved the GPU MemoryManager class to video_core since it makes more sense for it to be there.
Diffstat (limited to 'src/core/core.h')
| -rw-r--r-- | src/core/core.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/core/core.h b/src/core/core.h index 06ab4c75f..f63cc47cc 100644 --- a/src/core/core.h +++ b/src/core/core.h | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include "core/memory.h" | 11 | #include "core/memory.h" |
| 12 | #include "core/perf_stats.h" | 12 | #include "core/perf_stats.h" |
| 13 | #include "core/telemetry_session.h" | 13 | #include "core/telemetry_session.h" |
| 14 | #include "video_core/gpu.h" | ||
| 14 | 15 | ||
| 15 | class EmuWindow; | 16 | class EmuWindow; |
| 16 | class ARM_Interface; | 17 | class ARM_Interface; |
| @@ -102,6 +103,10 @@ public: | |||
| 102 | return *cpu_core; | 103 | return *cpu_core; |
| 103 | } | 104 | } |
| 104 | 105 | ||
| 106 | Tegra::GPU& GPU() { | ||
| 107 | return *gpu_core; | ||
| 108 | } | ||
| 109 | |||
| 105 | PerfStats perf_stats; | 110 | PerfStats perf_stats; |
| 106 | FrameLimiter frame_limiter; | 111 | FrameLimiter frame_limiter; |
| 107 | 112 | ||
| @@ -138,6 +143,8 @@ private: | |||
| 138 | ///< ARM11 CPU core | 143 | ///< ARM11 CPU core |
| 139 | std::unique_ptr<ARM_Interface> cpu_core; | 144 | std::unique_ptr<ARM_Interface> cpu_core; |
| 140 | 145 | ||
| 146 | std::unique_ptr<Tegra::GPU> gpu_core; | ||
| 147 | |||
| 141 | /// When true, signals that a reschedule should happen | 148 | /// When true, signals that a reschedule should happen |
| 142 | bool reschedule_pending{}; | 149 | bool reschedule_pending{}; |
| 143 | 150 | ||