From 58e4631dceb76e91af82010807f311c453178cad Mon Sep 17 00:00:00 2001
From: Isaac Marovitz <isaacryu@icloud.com>
Date: Sun, 16 Mar 2025 15:43:33 -0400
Subject: [PATCH] Cleanup

Signed-off-by: Isaac Marovitz <isaacryu@icloud.com>
---
 XenosRecomp/shader_common.h       |  8 ++++++++
 XenosRecomp/shader_recompiler.cpp | 12 ++----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/XenosRecomp/shader_common.h b/XenosRecomp/shader_common.h
index 49e4e84..0af832f 100644
--- a/XenosRecomp/shader_common.h
+++ b/XenosRecomp/shader_common.h
@@ -185,6 +185,14 @@ void rcp(T a)
 }
 #endif
 
+#ifdef __air__
+#define UNROLL
+#define BRANCH
+#else
+#define UNROLL [unroll]
+#define BRANCH [branch]
+#endif
+
 float w0(float a)
 {
     return (1.0f / 6.0f) * (a * (a * (-a + 3.0f) - 3.0f) + 1.0f);
diff --git a/XenosRecomp/shader_recompiler.cpp b/XenosRecomp/shader_recompiler.cpp
index c89bdce..b4b7024 100644
--- a/XenosRecomp/shader_recompiler.cpp
+++ b/XenosRecomp/shader_recompiler.cpp
@@ -1646,9 +1646,7 @@ void ShaderRecompiler::recompile(const uint8_t* shaderData, const std::string_vi
                 {
                     indent();
                 #ifdef UNLEASHED_RECOMP
-                #ifndef XENOS_RECOMP_AIR
-                    print("[unroll] ");
-                #endif
+                    print("UNROLL ");
                 #endif
                     println("for (aL = 0; aL < i{}.x; aL++)", uint32_t(cfInstr.loopStart.loopId));
                     indent();
@@ -1801,17 +1799,11 @@ void ShaderRecompiler::recompile(const uint8_t* shaderData, const std::string_vi
                     specConstantsMask |= SPEC_CONSTANT_ALPHA_TEST;
 
                     indent();
-
-#ifndef XENOS_RECOMP_AIR
-                    out += "[branch] ";
-#endif
-
-                    out += "if (g_SpecConstants() & SPEC_CONSTANT_ALPHA_TEST)";
+                    out += "BRANCH if (g_SpecConstants() & SPEC_CONSTANT_ALPHA_TEST)";
                     indent();
                     out += '{';
 
                     indent();
-
                     out += "\tclip(oC0.w - g_AlphaThreshold);\n";
 
                     indent();