OpenPunk/citra
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Only check for enabled JIT in Setup() to avoid race conditions

Browse Source
This commit is contained in:
Jannik Vogel
2016-03-30 13:14:02 +02:00
parent 2796552790
commit 9db801c3db
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/video_core/shader/shader.cpp
View File

@@ -107,6 +107,8 @@ void ShaderSetup::Setup() {
jit_shader = shader; jit_shader = shader;
shader_map[cache_key] = std::move(shader); shader_map[cache_key] = std::move(shader);
} }
} else {
jit_shader.reset();
} }
#endif // ARCHITECTURE_x86_64 #endif // ARCHITECTURE_x86_64
} }
@@ -130,8 +132,8 @@ void ShaderSetup::Run(UnitState<false>& state, const InputVertex& input, int num
state.conditional_code[1] = false; state.conditional_code[1] = false;
#ifdef ARCHITECTURE_x86_64 #ifdef ARCHITECTURE_x86_64
if (VideoCore::g_shader_jit_enabled) if (auto shader = jit_shader.lock())
jit_shader.lock().get()->Run(*this, state, config.main_offset); shader.get()->Run(*this, state, config.main_offset);
else else
RunInterpreter(*this, state, config.main_offset); RunInterpreter(*this, state, config.main_offset);
#else #else