summaryrefslogtreecommitdiff
path: root/src/video_core/gpu.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2019-02-12 19:24:34 -0500
committerGravatar GitHub2019-02-12 19:24:34 -0500
commitc440ecfafe5204b22ec00d2ba8e0cd39464c6a1a (patch)
treeb15696c7f74bfaaa38c493b33dacc3e4d8ca96eb /src/video_core/gpu.cpp
parentMerge pull request #2108 from FernandoS27/fix-cc (diff)
parentkepler_compute: Fixup assert and rename engines (diff)
downloadyuzu-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.cpp')
-rw-r--r--src/video_core/gpu.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/video_core/gpu.cpp b/src/video_core/gpu.cpp
index d3d32a359..96c42b8a0 100644
--- a/src/video_core/gpu.cpp
+++ b/src/video_core/gpu.cpp
@@ -6,9 +6,9 @@
6#include "core/core_timing.h" 6#include "core/core_timing.h"
7#include "core/memory.h" 7#include "core/memory.h"
8#include "video_core/engines/fermi_2d.h" 8#include "video_core/engines/fermi_2d.h"
9#include "video_core/engines/kepler_compute.h"
9#include "video_core/engines/kepler_memory.h" 10#include "video_core/engines/kepler_memory.h"
10#include "video_core/engines/maxwell_3d.h" 11#include "video_core/engines/maxwell_3d.h"
11#include "video_core/engines/maxwell_compute.h"
12#include "video_core/engines/maxwell_dma.h" 12#include "video_core/engines/maxwell_dma.h"
13#include "video_core/gpu.h" 13#include "video_core/gpu.h"
14#include "video_core/rasterizer_interface.h" 14#include "video_core/rasterizer_interface.h"
@@ -31,7 +31,7 @@ GPU::GPU(VideoCore::RasterizerInterface& rasterizer) {
31 dma_pusher = std::make_unique<Tegra::DmaPusher>(*this); 31 dma_pusher = std::make_unique<Tegra::DmaPusher>(*this);
32 maxwell_3d = std::make_unique<Engines::Maxwell3D>(rasterizer, *memory_manager); 32 maxwell_3d = std::make_unique<Engines::Maxwell3D>(rasterizer, *memory_manager);
33 fermi_2d = std::make_unique<Engines::Fermi2D>(rasterizer, *memory_manager); 33 fermi_2d = std::make_unique<Engines::Fermi2D>(rasterizer, *memory_manager);
34 maxwell_compute = std::make_unique<Engines::MaxwellCompute>(); 34 kepler_compute = std::make_unique<Engines::KeplerCompute>(*memory_manager);
35 maxwell_dma = std::make_unique<Engines::MaxwellDMA>(rasterizer, *memory_manager); 35 maxwell_dma = std::make_unique<Engines::MaxwellDMA>(rasterizer, *memory_manager);
36 kepler_memory = std::make_unique<Engines::KeplerMemory>(rasterizer, *memory_manager); 36 kepler_memory = std::make_unique<Engines::KeplerMemory>(rasterizer, *memory_manager);
37} 37}
@@ -245,8 +245,8 @@ void GPU::CallEngineMethod(const MethodCall& method_call) {
245 case EngineID::MAXWELL_B: 245 case EngineID::MAXWELL_B:
246 maxwell_3d->CallMethod(method_call); 246 maxwell_3d->CallMethod(method_call);
247 break; 247 break;
248 case EngineID::MAXWELL_COMPUTE_B: 248 case EngineID::KEPLER_COMPUTE_B:
249 maxwell_compute->CallMethod(method_call); 249 kepler_compute->CallMethod(method_call);
250 break; 250 break;
251 case EngineID::MAXWELL_DMA_COPY_A: 251 case EngineID::MAXWELL_DMA_COPY_A:
252 maxwell_dma->CallMethod(method_call); 252 maxwell_dma->CallMethod(method_call);