diff options
| author | 2019-02-12 19:24:34 -0500 | |
|---|---|---|
| committer | 2019-02-12 19:24:34 -0500 | |
| commit | c440ecfafe5204b22ec00d2ba8e0cd39464c6a1a (patch) | |
| tree | b15696c7f74bfaaa38c493b33dacc3e4d8ca96eb /src/video_core/gpu.h | |
| parent | Merge pull request #2108 from FernandoS27/fix-cc (diff) | |
| parent | kepler_compute: Fixup assert and rename engines (diff) | |
| download | yuzu-c440ecfafe5204b22ec00d2ba8e0cd39464c6a1a.tar.gz yuzu-c440ecfafe5204b22ec00d2ba8e0cd39464c6a1a.tar.xz yuzu-c440ecfafe5204b22ec00d2ba8e0cd39464c6a1a.zip | |
Merge pull request #2104 from ReinUsesLisp/compute-assert
kepler_compute: Fixup assert and rename the engine
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 fb8975811..21d82e426 100644 --- a/src/video_core/gpu.h +++ b/src/video_core/gpu.h | |||
| @@ -102,15 +102,15 @@ struct FramebufferConfig { | |||
| 102 | namespace Engines { | 102 | namespace Engines { |
| 103 | class Fermi2D; | 103 | class Fermi2D; |
| 104 | class Maxwell3D; | 104 | class Maxwell3D; |
| 105 | class MaxwellCompute; | ||
| 106 | class MaxwellDMA; | 105 | class MaxwellDMA; |
| 106 | class KeplerCompute; | ||
| 107 | class KeplerMemory; | 107 | class KeplerMemory; |
| 108 | } // namespace Engines | 108 | } // namespace Engines |
| 109 | 109 | ||
| 110 | enum class EngineID { | 110 | enum class EngineID { |
| 111 | FERMI_TWOD_A = 0x902D, // 2D Engine | 111 | FERMI_TWOD_A = 0x902D, // 2D Engine |
| 112 | MAXWELL_B = 0xB197, // 3D Engine | 112 | MAXWELL_B = 0xB197, // 3D Engine |
| 113 | MAXWELL_COMPUTE_B = 0xB1C0, | 113 | KEPLER_COMPUTE_B = 0xB1C0, |
| 114 | KEPLER_INLINE_TO_MEMORY_B = 0xA140, | 114 | KEPLER_INLINE_TO_MEMORY_B = 0xA140, |
| 115 | MAXWELL_DMA_COPY_A = 0xB0B5, | 115 | MAXWELL_DMA_COPY_A = 0xB0B5, |
| 116 | }; | 116 | }; |
| @@ -208,7 +208,7 @@ private: | |||
| 208 | /// 2D engine | 208 | /// 2D engine |
| 209 | std::unique_ptr<Engines::Fermi2D> fermi_2d; | 209 | std::unique_ptr<Engines::Fermi2D> fermi_2d; |
| 210 | /// Compute engine | 210 | /// Compute engine |
| 211 | std::unique_ptr<Engines::MaxwellCompute> maxwell_compute; | 211 | std::unique_ptr<Engines::KeplerCompute> kepler_compute; |
| 212 | /// DMA engine | 212 | /// DMA engine |
| 213 | std::unique_ptr<Engines::MaxwellDMA> maxwell_dma; | 213 | std::unique_ptr<Engines::MaxwellDMA> maxwell_dma; |
| 214 | /// Inline memory engine | 214 | /// Inline memory engine |