diff options
| author | 2018-07-21 10:51:00 -0700 | |
|---|---|---|
| committer | 2018-07-21 10:51:00 -0700 | |
| commit | 552aac7e6c233d15dba22fe54c68588f1e48a5fa (patch) | |
| tree | d1f2b22baa5c46ff89d5c8437a624c71ccf85596 /src/video_core/gpu.h | |
| parent | Merge pull request #751 from Subv/tpidr_el0 (diff) | |
| parent | gpu: Rename Get3DEngine() to Maxwell3D() (diff) | |
| download | yuzu-552aac7e6c233d15dba22fe54c68588f1e48a5fa.tar.gz yuzu-552aac7e6c233d15dba22fe54c68588f1e48a5fa.tar.xz yuzu-552aac7e6c233d15dba22fe54c68588f1e48a5fa.zip | |
Merge pull request #749 from lioncash/consistency
gpu: Rename Get3DEngine() to Maxwell3D()
Diffstat (limited to 'src/video_core/gpu.h')
| -rw-r--r-- | src/video_core/gpu.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/video_core/gpu.h b/src/video_core/gpu.h index 60930e997..a32148ecd 100644 --- a/src/video_core/gpu.h +++ b/src/video_core/gpu.h | |||
| @@ -93,15 +93,14 @@ public: | |||
| 93 | /// Processes a command list stored at the specified address in GPU memory. | 93 | /// Processes a command list stored at the specified address in GPU memory. |
| 94 | void ProcessCommandList(GPUVAddr address, u32 size); | 94 | void ProcessCommandList(GPUVAddr address, u32 size); |
| 95 | 95 | ||
| 96 | /// Returns a const reference to the Maxwell3D GPU engine. | ||
| 97 | const Engines::Maxwell3D& Maxwell3D() const; | ||
| 98 | |||
| 96 | /// Returns a reference to the Maxwell3D GPU engine. | 99 | /// Returns a reference to the Maxwell3D GPU engine. |
| 97 | const Engines::Maxwell3D& Get3DEngine() const; | 100 | Engines::Maxwell3D& Maxwell3D(); |
| 98 | 101 | ||
| 99 | std::unique_ptr<MemoryManager> memory_manager; | 102 | std::unique_ptr<MemoryManager> memory_manager; |
| 100 | 103 | ||
| 101 | Engines::Maxwell3D& Maxwell3D() { | ||
| 102 | return *maxwell_3d; | ||
| 103 | } | ||
| 104 | |||
| 105 | private: | 104 | private: |
| 106 | /// Writes a single register in the engine bound to the specified subchannel | 105 | /// Writes a single register in the engine bound to the specified subchannel |
| 107 | void WriteReg(u32 method, u32 subchannel, u32 value, u32 remaining_params); | 106 | void WriteReg(u32 method, u32 subchannel, u32 value, u32 remaining_params); |