From a05d9405b9192b0e9402eba2305d1a35aac44a74 Mon Sep 17 00:00:00 2001
From: Lioncash
Date: Tue, 25 Jan 2022 13:41:35 -0500
Subject: video_core/macro: Remove unused parameter from Execute()

Simplifies the function interface.
---
 src/video_core/macro/macro.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/video_core/macro/macro.cpp')

diff --git a/src/video_core/macro/macro.cpp b/src/video_core/macro/macro.cpp
index d7fabe605..0870a7687 100644
--- a/src/video_core/macro/macro.cpp
+++ b/src/video_core/macro/macro.cpp
@@ -24,8 +24,7 @@ void MacroEngine::AddCode(u32 method, u32 data) {
     uploaded_macro_code[method].push_back(data);
 }
 
-void MacroEngine::Execute(Engines::Maxwell3D& maxwell3d, u32 method,
-                          const std::vector<u32>& parameters) {
+void MacroEngine::Execute(u32 method, const std::vector<u32>& parameters) {
     auto compiled_macro = macro_cache.find(method);
     if (compiled_macro != macro_cache.end()) {
         const auto& cache_info = compiled_macro->second;
-- 
cgit v1.2.3


From cfd9f7d25b4c1aea49b4dc017990f12142b8302b Mon Sep 17 00:00:00 2001
From: Lioncash
Date: Tue, 25 Jan 2022 13:50:10 -0500
Subject: video_core/macro_hle: Return unique_ptr directly from GetHLEProgram()

Same behavior, but less code and header dependencies.
---
 src/video_core/macro/macro.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/video_core/macro/macro.cpp')

diff --git a/src/video_core/macro/macro.cpp b/src/video_core/macro/macro.cpp
index 0870a7687..0ae78a9e5 100644
--- a/src/video_core/macro/macro.cpp
+++ b/src/video_core/macro/macro.cpp
@@ -65,10 +65,9 @@ void MacroEngine::Execute(u32 method, const std::vector<u32>& parameters) {
             cache_info.lle_program = Compile(code);
         }
 
-        auto hle_program = hle_macros->GetHLEProgram(cache_info.hash);
-        if (hle_program.has_value()) {
+        if (auto hle_program = hle_macros->GetHLEProgram(cache_info.hash)) {
             cache_info.has_hle_program = true;
-            cache_info.hle_program = std::move(hle_program.value());
+            cache_info.hle_program = std::move(hle_program);
             cache_info.hle_program->Execute(parameters, method);
         } else {
             cache_info.lle_program->Execute(parameters, method);
-- 
cgit v1.2.3


From a8a4f37628015aace4c4192df41c69bda9706a3f Mon Sep 17 00:00:00 2001
From: Lioncash
Date: Tue, 25 Jan 2022 14:09:59 -0500
Subject: video_core/macro: Add missing <cstring> header

Necessary since memcpy is used.
---
 src/video_core/macro/macro.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/video_core/macro/macro.cpp')

diff --git a/src/video_core/macro/macro.cpp b/src/video_core/macro/macro.cpp
index 0ae78a9e5..0aeda4ce8 100644
--- a/src/video_core/macro/macro.cpp
+++ b/src/video_core/macro/macro.cpp
@@ -2,12 +2,13 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include <cstring>
 #include <optional>
+
 #include <boost/container_hash/hash.hpp>
+
 #include "common/assert.h"
-#include "common/logging/log.h"
 #include "common/settings.h"
-#include "video_core/engines/maxwell_3d.h"
 #include "video_core/macro/macro.h"
 #include "video_core/macro/macro_hle.h"
 #include "video_core/macro/macro_interpreter.h"
-- 
cgit v1.2.3