diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2016-12-18 01:06:04 +0100 |
---|---|---|
committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-01-26 03:53:25 +0100 |
commit | 0f642741451e3f75c2f1d64ae9beccaf1437f12c (patch) | |
tree | f964da57def5be6b8d5bc41176db97668bd01125 /src/video_core/shader/shader_interpreter.cpp | |
parent | Shader: Remove OutputRegisters struct (diff) | |
download | yuzu-0f642741451e3f75c2f1d64ae9beccaf1437f12c.tar yuzu-0f642741451e3f75c2f1d64ae9beccaf1437f12c.tar.gz yuzu-0f642741451e3f75c2f1d64ae9beccaf1437f12c.tar.bz2 yuzu-0f642741451e3f75c2f1d64ae9beccaf1437f12c.tar.lz yuzu-0f642741451e3f75c2f1d64ae9beccaf1437f12c.tar.xz yuzu-0f642741451e3f75c2f1d64ae9beccaf1437f12c.tar.zst yuzu-0f642741451e3f75c2f1d64ae9beccaf1437f12c.zip |
Diffstat (limited to 'src/video_core/shader/shader_interpreter.cpp')
-rw-r--r-- | src/video_core/shader/shader_interpreter.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/video_core/shader/shader_interpreter.cpp b/src/video_core/shader/shader_interpreter.cpp index a6197c10a..e44abbf1d 100644 --- a/src/video_core/shader/shader_interpreter.cpp +++ b/src/video_core/shader/shader_interpreter.cpp @@ -652,25 +652,23 @@ static void RunInterpreter(const ShaderSetup& setup, UnitState& state, DebugData } } -void InterpreterEngine::SetupBatch(const ShaderSetup* setup_) { - setup = setup_; -} +void InterpreterEngine::SetupBatch(ShaderSetup& setup) {} MICROPROFILE_DECLARE(GPU_Shader); -void InterpreterEngine::Run(UnitState& state, unsigned int entry_point) const { - ASSERT(setup != nullptr); +void InterpreterEngine::Run(const ShaderSetup& setup, UnitState& state, + unsigned int entry_point) const { ASSERT(entry_point < 1024); MICROPROFILE_SCOPE(GPU_Shader); DebugData<false> dummy_debug_data; - RunInterpreter(*setup, state, dummy_debug_data, entry_point); + RunInterpreter(setup, state, dummy_debug_data, entry_point); } -DebugData<true> InterpreterEngine::ProduceDebugInfo(const InputVertex& input, int num_attributes, +DebugData<true> InterpreterEngine::ProduceDebugInfo(const ShaderSetup& setup, + const InputVertex& input, int num_attributes, unsigned int entry_point) const { - ASSERT(setup != nullptr); ASSERT(entry_point < 1024); UnitState state; @@ -679,7 +677,7 @@ DebugData<true> InterpreterEngine::ProduceDebugInfo(const InputVertex& input, in // Setup input register table boost::fill(state.registers.input, Math::Vec4<float24>::AssignToAll(float24::Zero())); state.LoadInputVertex(input, num_attributes); - RunInterpreter(*setup, state, debug_data, entry_point); + RunInterpreter(setup, state, debug_data, entry_point); return debug_data; } |