From a572da8056291c54b0110391cb1b77970334dd94 Mon Sep 17 00:00:00 2001
From: CamilleLaVey <camillelavey99@gmail.com>
Date: Fri, 16 Jan 2026 14:00:54 -0400
Subject: [PATCH] Revert "fix try #1"

---
 src/video_core/dma_pusher.h                | 2 +-
 src/video_core/engines/engine_interface.h  | 1 -
 src/video_core/engines/maxwell_3d.cpp      | 5 +----
 src/video_core/macro/macro_interpreter.cpp | 5 ++---
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/video_core/dma_pusher.h b/src/video_core/dma_pusher.h
index e42b0152bc..f850513603 100644
--- a/src/video_core/dma_pusher.h
+++ b/src/video_core/dma_pusher.h
@@ -178,7 +178,7 @@ private:
     const bool ib_enable{true}; ///< IB mode enabled
 
     std::array<Engines::EngineInterface*, max_subchannels> subchannels{};
-    std::array<Engines::EngineTypes, max_subchannels> subchannel_type{};
+    std::array<Engines::EngineTypes, max_subchannels> subchannel_type;
 
     GPU& gpu;
     Core::System& system;
diff --git a/src/video_core/engines/engine_interface.h b/src/video_core/engines/engine_interface.h
index 5e3b6926eb..e271ecab59 100644
--- a/src/video_core/engines/engine_interface.h
+++ b/src/video_core/engines/engine_interface.h
@@ -15,7 +15,6 @@
 namespace Tegra::Engines {
 
 enum class EngineTypes : u32 {
-    Invalid = 0,
     KeplerCompute,
     Maxwell3D,
     Fermi2D,
diff --git a/src/video_core/engines/maxwell_3d.cpp b/src/video_core/engines/maxwell_3d.cpp
index 1c40f9ce56..7c1603d814 100644
--- a/src/video_core/engines/maxwell_3d.cpp
+++ b/src/video_core/engines/maxwell_3d.cpp
@@ -256,10 +256,7 @@ void Maxwell3D::ProcessDirtyRegisters(u32 method, u32 argument) {
     }
     regs.reg_array[method] = argument;
 
-    const auto& table0 = dirty.tables[0];
-    const auto& table1 = dirty.tables[1];
-    const u8 flag0 = table0[method];
-    const u8 flag1 = table1[method];
+    const auto [flag0, flag1] = VideoCommon::Dirty::GetDirtyFlagsForMethod(method);
     dirty.flags[flag0] = true;
     if (flag1 != flag0) {
         dirty.flags[flag1] = true;
diff --git a/src/video_core/macro/macro_interpreter.cpp b/src/video_core/macro/macro_interpreter.cpp
index e0d1ed694f..f9befce676 100644
--- a/src/video_core/macro/macro_interpreter.cpp
+++ b/src/video_core/macro/macro_interpreter.cpp
@@ -107,9 +107,8 @@ void MacroInterpreterImpl::Execute(const std::vector<u32>& params, u32 method) {
         keep_executing = Step(false);
     }
 
-    // Verify the macro used all the input parameters (debug only)
-    // Some games/macros may not consume all parameters, which is valid behavior
-    DEBUG_ASSERT(next_parameter_index == num_parameters);
+    // Assert the the macro used all the input parameters
+    ASSERT(next_parameter_index == num_parameters);
 }
 
 void MacroInterpreterImpl::Reset() {