From 1e1f9398176e4f1ec608f31f22a576c749a0a723 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Fri, 16 Dec 2016 22:30:00 -0800 Subject: VideoCore/Shader: Use only entry_point as ShaderSetup param This removes all implicit dependency of ShaderState on global PICA state. --- src/video_core/shader/shader.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'src/video_core/shader/shader.cpp') diff --git a/src/video_core/shader/shader.cpp b/src/video_core/shader/shader.cpp index 868be1360..936db0582 100644 --- a/src/video_core/shader/shader.cpp +++ b/src/video_core/shader/shader.cpp @@ -120,33 +120,35 @@ void ShaderSetup::Setup() { MICROPROFILE_DEFINE(GPU_Shader, "GPU", "Shader", MP_RGB(50, 50, 240)); -void ShaderSetup::Run(UnitState& state) { - auto& config = g_state.regs.vs; +void ShaderSetup::Run(UnitState& state, unsigned int entry_point) { + ASSERT(entry_point < 1024); MICROPROFILE_SCOPE(GPU_Shader); #ifdef ARCHITECTURE_x86_64 if (VideoCore::g_shader_jit_enabled) { - jit_shader->Run(*this, state, config.main_offset); + jit_shader->Run(*this, state, entry_point); } else { DebugData dummy_debug_data; - RunInterpreter(*this, state, dummy_debug_data, config.main_offset); + RunInterpreter(*this, state, dummy_debug_data, entry_point); } #else DebugData dummy_debug_data; - RunInterpreter(*this, state, dummy_debug_data, config.main_offset); + RunInterpreter(*this, state, dummy_debug_data, entry_point); #endif // ARCHITECTURE_x86_64 } DebugData ShaderSetup::ProduceDebugInfo(const InputVertex& input, int num_attributes, - const Regs::ShaderConfig& config) { + unsigned int entry_point) { + ASSERT(entry_point < 1024); + UnitState state; DebugData debug_data; // Setup input register table boost::fill(state.registers.input, Math::Vec4::AssignToAll(float24::Zero())); state.LoadInputVertex(input, num_attributes); - RunInterpreter(*this, state, debug_data, config.main_offset); + RunInterpreter(*this, state, debug_data, entry_point); return debug_data; } -- cgit v1.2.3