summaryrefslogtreecommitdiffstats
path: root/src/video_core/shader/shader.cpp
diff options
context:
space:
mode:
authorlinkmauve <linkmauve@linkmauve.fr>2016-05-16 18:54:45 +0200
committerlinkmauve <linkmauve@linkmauve.fr>2016-05-16 18:54:45 +0200
commitf40fabd688576fae7ab91195547a6967178b28dd (patch)
tree3e3768978c47ae3c35e5318d8ff361825047a909 /src/video_core/shader/shader.cpp
parentMerge pull request #1792 from JayFoxRox/avoid-uninitialised (diff)
parentUse new shader-jit signature for interpreter (diff)
downloadyuzu-f40fabd688576fae7ab91195547a6967178b28dd.tar
yuzu-f40fabd688576fae7ab91195547a6967178b28dd.tar.gz
yuzu-f40fabd688576fae7ab91195547a6967178b28dd.tar.bz2
yuzu-f40fabd688576fae7ab91195547a6967178b28dd.tar.lz
yuzu-f40fabd688576fae7ab91195547a6967178b28dd.tar.xz
yuzu-f40fabd688576fae7ab91195547a6967178b28dd.tar.zst
yuzu-f40fabd688576fae7ab91195547a6967178b28dd.zip
Diffstat (limited to 'src/video_core/shader/shader.cpp')
-rw-r--r--src/video_core/shader/shader.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/video_core/shader/shader.cpp b/src/video_core/shader/shader.cpp
index e93a9d92a..161097610 100644
--- a/src/video_core/shader/shader.cpp
+++ b/src/video_core/shader/shader.cpp
@@ -64,6 +64,7 @@ MICROPROFILE_DEFINE(GPU_Shader, "GPU", "Shader", MP_RGB(50, 50, 240));
OutputVertex ShaderSetup::Run(UnitState<false>& state, const InputVertex& input, int num_attributes) {
auto& config = g_state.regs.vs;
+ auto& setup = g_state.vs;
MICROPROFILE_SCOPE(GPU_Shader);
@@ -81,11 +82,11 @@ OutputVertex ShaderSetup::Run(UnitState<false>& state, const InputVertex& input,
#ifdef ARCHITECTURE_x86_64
if (VideoCore::g_shader_jit_enabled)
- jit_shader->Run(&state.registers, g_state.regs.vs.main_offset);
+ jit_shader->Run(setup, state, config.main_offset);
else
- RunInterpreter(state);
+ RunInterpreter(setup, state, config.main_offset);
#else
- RunInterpreter(state);
+ RunInterpreter(setup, state, config.main_offset);
#endif // ARCHITECTURE_x86_64
// Setup output data
@@ -156,7 +157,7 @@ DebugData<true> ShaderSetup::ProduceDebugInfo(const InputVertex& input, int num_
state.conditional_code[0] = false;
state.conditional_code[1] = false;
- RunInterpreter(state);
+ RunInterpreter(setup, state, config.main_offset);
return state.debug;
}