From 15c961d0bf65d6725cfc7769e58e1440e2afb377 Mon Sep 17 00:00:00 2001
From: CamilleLaVey <camillelavey99@gmail.com>
Date: Sun, 11 Jan 2026 00:57:48 -0400
Subject: [PATCH] [video_core, macro] Macro execution caching

---
 src/video_core/macro/macro.cpp | 18 ++++++++++++++++++
 src/video_core/macro/macro.h   |  3 +++
 2 files changed, 21 insertions(+)

diff --git a/src/video_core/macro/macro.cpp b/src/video_core/macro/macro.cpp
index 2ff5e21c5e..ac85b183db 100644
--- a/src/video_core/macro/macro.cpp
+++ b/src/video_core/macro/macro.cpp
@@ -64,14 +64,30 @@ void MacroEngine::AddCode(u32 method, u32 data) {
 }
 
 void MacroEngine::ClearCode(u32 method) {
+    if (method == last_macro_method) {
+        last_macro_method = 0xFFFFFFFF;
+        last_macro_cache = nullptr;
+    }
     macro_cache.erase(method);
     uploaded_macro_code.erase(method);
 }
 
 void MacroEngine::Execute(u32 method, const std::vector<u32>& parameters) {
+    if (method == last_macro_method && last_macro_cache != nullptr) [[likely]] {
+        if (last_macro_cache->has_hle_program) {
+            last_macro_cache->hle_program->Execute(parameters, method);
+        } else {
+            maxwell3d.RefreshParameters();
+            last_macro_cache->lle_program->Execute(parameters, method);
+        }
+        return;
+    }
+
     auto compiled_macro = macro_cache.find(method);
     if (compiled_macro != macro_cache.end()) {
         const auto& cache_info = compiled_macro->second;
+        last_macro_method = method;
+        last_macro_cache = &compiled_macro->second;
         if (cache_info.has_hle_program) {
             cache_info.hle_program->Execute(parameters, method);
         } else {
@@ -95,6 +111,8 @@ void MacroEngine::Execute(u32 method, const std::vector<u32>& parameters) {
             }
         }
         auto& cache_info = macro_cache[method];
+        last_macro_method = method;
+        last_macro_cache = &cache_info;
 
         if (!mid_method.has_value()) {
             cache_info.lle_program = Compile(macro_code->second);
diff --git a/src/video_core/macro/macro.h b/src/video_core/macro/macro.h
index 737ced9a45..6435df4ba5 100644
--- a/src/video_core/macro/macro.h
+++ b/src/video_core/macro/macro.h
@@ -138,6 +138,9 @@ private:
     std::unordered_map<u32, std::vector<u32>> uploaded_macro_code;
     std::unique_ptr<HLEMacro> hle_macros;
     Engines::Maxwell3D& maxwell3d;
+    
+    u32 last_macro_method{0xFFFFFFFF};
+    CacheInfo* last_macro_cache{nullptr};
 };
 
 std::unique_ptr<MacroEngine> GetMacroEngine(Engines::Maxwell3D& maxwell3d);