summaryrefslogtreecommitdiff
path: root/src/video_core/gpu.cpp
diff options
context:
space:
mode:
authorGravatar ReinUsesLisp2019-01-22 20:49:31 -0300
committerGravatar ReinUsesLisp2019-02-10 19:29:33 -0300
commit1ddcd0e6f03e83d0447f03ac57d5e0bda7a2f4c7 (patch)
tree4d927140ea9fb1a44a0fdeaefdbcf30a7c360f18 /src/video_core/gpu.cpp
parentMerge pull request #2083 from ReinUsesLisp/shader-ir-cbuf-tracking (diff)
downloadyuzu-1ddcd0e6f03e83d0447f03ac57d5e0bda7a2f4c7.tar.gz
yuzu-1ddcd0e6f03e83d0447f03ac57d5e0bda7a2f4c7.tar.xz
yuzu-1ddcd0e6f03e83d0447f03ac57d5e0bda7a2f4c7.zip
kepler_compute: Fixup assert and rename engines
When I originally added the compute assert I used the wrong documentation. This addresses that. The dispatch register was tested with homebrew against hardware and is triggered by some games (e.g. Super Mario Odyssey). What exactly is missing to get a valid program bound by this engine requires more investigation.
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);