diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-12-07 04:06:12 +0100 |
---|---|---|
committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-12-08 05:20:38 +0100 |
commit | 195fedccf07b909c95e5905c7154c595bb260fc7 (patch) | |
tree | b36ecb555672b6994e4bd11812a605fe2726d172 /src/video_core/command_processor.cpp | |
parent | VideoCore: Rename HWRasterizer methods to be less confusing (diff) | |
download | yuzu-195fedccf07b909c95e5905c7154c595bb260fc7.tar yuzu-195fedccf07b909c95e5905c7154c595bb260fc7.tar.gz yuzu-195fedccf07b909c95e5905c7154c595bb260fc7.tar.bz2 yuzu-195fedccf07b909c95e5905c7154c595bb260fc7.tar.lz yuzu-195fedccf07b909c95e5905c7154c595bb260fc7.tar.xz yuzu-195fedccf07b909c95e5905c7154c595bb260fc7.tar.zst yuzu-195fedccf07b909c95e5905c7154c595bb260fc7.zip |
Diffstat (limited to 'src/video_core/command_processor.cpp')
-rw-r--r-- | src/video_core/command_processor.cpp | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/src/video_core/command_processor.cpp b/src/video_core/command_processor.cpp index bd1b09a4b..35b976c60 100644 --- a/src/video_core/command_processor.cpp +++ b/src/video_core/command_processor.cpp @@ -336,19 +336,14 @@ static void WritePicaReg(u32 id, u32 value, u32 mask) { } } - if (Settings::values.use_hw_renderer) { - // Send to hardware renderer - static auto AddHWTriangle = [](const Pica::Shader::OutputVertex& v0, - const Pica::Shader::OutputVertex& v1, - const Pica::Shader::OutputVertex& v2) { - VideoCore::g_renderer->hw_rasterizer->AddTriangle(v0, v1, v2); - }; - - primitive_assembler.SubmitVertex(output, AddHWTriangle); - } else { - // Send to triangle clipper - primitive_assembler.SubmitVertex(output, Clipper::ProcessTriangle); - } + // Send to renderer + using Pica::Shader::OutputVertex; + auto AddTriangle = []( + const OutputVertex& v0, const OutputVertex& v1, const OutputVertex& v2) { + VideoCore::g_renderer->rasterizer->AddTriangle(v0, v1, v2); + }; + + primitive_assembler.SubmitVertex(output, AddTriangle); } for (auto& range : memory_accesses.ranges) { @@ -356,9 +351,7 @@ static void WritePicaReg(u32 id, u32 value, u32 mask) { range.second, range.first); } - if (Settings::values.use_hw_renderer) { - VideoCore::g_renderer->hw_rasterizer->DrawTriangles(); - } + VideoCore::g_renderer->rasterizer->DrawTriangles(); #if PICA_DUMP_GEOMETRY geometry_dumper.Dump(); @@ -475,7 +468,7 @@ static void WritePicaReg(u32 id, u32 value, u32 mask) { break; } - VideoCore::g_renderer->hw_rasterizer->NotifyPicaRegisterChanged(id); + VideoCore::g_renderer->rasterizer->NotifyPicaRegisterChanged(id); if (g_debug_context) g_debug_context->OnEvent(DebugContext::Event::PicaCommandProcessed, reinterpret_cast<void*>(&id)); |