diff options
author | bunnei <bunneidev@gmail.com> | 2019-02-12 19:24:34 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-12 19:24:34 -0500 |
commit | c440ecfafe5204b22ec00d2ba8e0cd39464c6a1a (patch) | |
tree | b15696c7f74bfaaa38c493b33dacc3e4d8ca96eb /src/video_core/gpu.h | |
parent | 444231a83d831c4cfcee03d29e2a375b258bdc4e (diff) | |
parent | 1ddcd0e6f03e83d0447f03ac57d5e0bda7a2f4c7 (diff) |
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 { namespace Engines { class Fermi2D; class Maxwell3D; -class MaxwellCompute; class MaxwellDMA; +class KeplerCompute; class KeplerMemory; } // namespace Engines enum class EngineID { FERMI_TWOD_A = 0x902D, // 2D Engine MAXWELL_B = 0xB197, // 3D Engine - MAXWELL_COMPUTE_B = 0xB1C0, + KEPLER_COMPUTE_B = 0xB1C0, KEPLER_INLINE_TO_MEMORY_B = 0xA140, MAXWELL_DMA_COPY_A = 0xB0B5, }; @@ -208,7 +208,7 @@ private: /// 2D engine std::unique_ptr<Engines::Fermi2D> fermi_2d; /// Compute engine - std::unique_ptr<Engines::MaxwellCompute> maxwell_compute; + std::unique_ptr<Engines::KeplerCompute> kepler_compute; /// DMA engine std::unique_ptr<Engines::MaxwellDMA> maxwell_dma; /// Inline memory engine |