1 files changed, 10 insertions, 15 deletions

diff --git a/src/video_core/shader/shader_jit_x64.cpp b/src/video_core/shader/shader_jit_x64.cpp
index 755ae119f..15c1d60b5 100644
--- a/src/video_core/shader/shader_jit_x64.cpp
+++ b/src/video_core/shader/shader_jit_x64.cpp
@@ -14,37 +14,32 @@ namespace Shader {
 JitX64Engine::JitX64Engine() = default;
 JitX64Engine::~JitX64Engine() = default;
 
-void JitX64Engine::SetupBatch(const ShaderSetup* setup_) {
-    cached_shader = nullptr;
-    setup = setup_;
-    if (setup == nullptr)
-        return;
-
-    u64 code_hash = Common::ComputeHash64(&setup->program_code, sizeof(setup->program_code));
-    u64 swizzle_hash = Common::ComputeHash64(&setup->swizzle_data, sizeof(setup->swizzle_data));
+void JitX64Engine::SetupBatch(ShaderSetup& setup) {
+    u64 code_hash = Common::ComputeHash64(&setup.program_code, sizeof(setup.program_code));
+    u64 swizzle_hash = Common::ComputeHash64(&setup.swizzle_data, sizeof(setup.swizzle_data));
 
     u64 cache_key = code_hash ^ swizzle_hash;
     auto iter = cache.find(cache_key);
     if (iter != cache.end()) {
-        cached_shader = iter->second.get();
+        setup.engine_data.cached_shader = iter->second.get();
     } else {
         auto shader = std::make_unique<JitShader>();
-        shader->Compile(&setup->program_code, &setup->swizzle_data);
-        cached_shader = shader.get();
+        shader->Compile(&setup.program_code, &setup.swizzle_data);
+        setup.engine_data.cached_shader = shader.get();
         cache.emplace_hint(iter, cache_key, std::move(shader));
     }
 }
 
 MICROPROFILE_DECLARE(GPU_Shader);
 
-void JitX64Engine::Run(UnitState& state, unsigned int entry_point) const {
-    ASSERT(setup != nullptr);
-    ASSERT(cached_shader != nullptr);
+void JitX64Engine::Run(const ShaderSetup& setup, UnitState& state, unsigned int entry_point) const {
+    ASSERT(setup.engine_data.cached_shader != nullptr);
     ASSERT(entry_point < 1024);
 
     MICROPROFILE_SCOPE(GPU_Shader);
 
-    cached_shader->Run(*setup, state, entry_point);
+    const JitShader* shader = static_cast<const JitShader*>(setup.engine_data.cached_shader);
+    shader->Run(setup, state, entry_point);
 }
 
 } // namespace Shader