diff options
| author | bunnei <bunneidev@gmail.com> | 2019-03-22 23:41:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-22 23:41:12 +0100 |
| commit | e5893db3e618fd276733a24eebc0606c5fd1e7f2 (patch) | |
| tree | 5a3ae98bb04d3fb3f513a51504b63940e70c5130 /src/video_core/gpu.h | |
| parent | Merge pull request #2277 from bunnei/fix-smo-transitions (diff) | |
| parent | memory_manager: Cleanup FindFreeRegion. (diff) | |
| download | yuzu-e5893db3e618fd276733a24eebc0606c5fd1e7f2.tar yuzu-e5893db3e618fd276733a24eebc0606c5fd1e7f2.tar.gz yuzu-e5893db3e618fd276733a24eebc0606c5fd1e7f2.tar.bz2 yuzu-e5893db3e618fd276733a24eebc0606c5fd1e7f2.tar.lz yuzu-e5893db3e618fd276733a24eebc0606c5fd1e7f2.tar.xz yuzu-e5893db3e618fd276733a24eebc0606c5fd1e7f2.tar.zst yuzu-e5893db3e618fd276733a24eebc0606c5fd1e7f2.zip | |
Diffstat (limited to 'src/video_core/gpu.h')
| -rw-r--r-- | src/video_core/gpu.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/gpu.h b/src/video_core/gpu.h index a14b95c30..c1830ac8d 100644 --- a/src/video_core/gpu.h +++ b/src/video_core/gpu.h @@ -9,7 +9,6 @@ #include "common/common_types.h" #include "core/hle/service/nvflinger/buffer_queue.h" #include "video_core/dma_pusher.h" -#include "video_core/memory_manager.h" using CacheAddr = std::uintptr_t; inline CacheAddr ToCacheAddr(const void* host_ptr) { @@ -124,6 +123,8 @@ enum class EngineID { MAXWELL_DMA_COPY_A = 0xB0B5, }; +class MemoryManager; + class GPU { public: explicit GPU(Core::System& system, VideoCore::RendererBase& renderer); @@ -244,9 +245,8 @@ protected: private: std::unique_ptr<Tegra::MemoryManager> memory_manager; - /// Mapping of command subchannels to their bound engine ids. + /// Mapping of command subchannels to their bound engine ids std::array<EngineID, 8> bound_engines = {}; - /// 3D engine std::unique_ptr<Engines::Maxwell3D> maxwell_3d; /// 2D engine |