From 88638c504b8bf3337e7f314846411bcc622a1f32 Mon Sep 17 00:00:00 2001
From: Mr-Wiseguy <mrwiseguyromhacking@gmail.com>
Date: Sat, 3 Jan 2026 21:45:57 -0500
Subject: [PATCH] Update frontend and fix shader building setup

---
 CMakeLists.txt           | 34 +++++++++++++++-------------------
 lib/RecompFrontend       |  2 +-
 shaders/InterfacePS.hlsl | 11 -----------
 shaders/InterfaceVS.hlsl | 23 -----------------------
 4 files changed, 16 insertions(+), 54 deletions(-)
 delete mode 100644 shaders/InterfacePS.hlsl
 delete mode 100644 shaders/InterfaceVS.hlsl

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c874f89..9488103 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -171,7 +171,6 @@ target_include_directories(BanjoRecompiled PRIVATE
     ${CMAKE_SOURCE_DIR}/lib/freetype-windows-binaries/include
     ${CMAKE_SOURCE_DIR}/lib/rt64/src/contrib/nativefiledialog-extended/src/include
     ${CMAKE_SOURCE_DIR}/lib/SlotMap
-    ${CMAKE_BINARY_DIR}/shaders
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
@@ -298,22 +297,6 @@ if (CMAKE_SYSTEM_NAME MATCHES "Linux")
     target_link_libraries(BanjoRecompiled PRIVATE "-latomic -static-libstdc++" ${CMAKE_DL_LIBS} Threads::Threads)
 endif()
 
-set(RECOMP_FRONTEND_N64MODERNRUNTIME_PATH ${CMAKE_SOURCE_DIR}/lib/N64ModernRuntime)
-set(RECOMP_FRONTEND_RT64_PATH ${CMAKE_SOURCE_DIR}/lib/rt64)
-
-add_subdirectory(${CMAKE_SOURCE_DIR}/lib/RecompFrontend)
-
-target_link_libraries(BanjoRecompiled PRIVATE
-    PatchesLib
-    RecompiledFuncs
-    recompui
-    recompinput
-    librecomp
-    ultramodern
-    rt64
-    nfd
-)
-
 # TODO fix the rt64 CMake script so that this doesn't need to be duplicated here
 # For DXC
 set (DXC_COMMON_OPTS "-I${PROJECT_SOURCE_DIR}/src")
@@ -346,8 +329,21 @@ else()
     endif()
 endif()
 
-build_vertex_shader(BanjoRecompiled "shaders/InterfaceVS.hlsl" "shaders/InterfaceVS.hlsl")
-build_pixel_shader(BanjoRecompiled "shaders/InterfacePS.hlsl" "shaders/InterfacePS.hlsl")
+set(RECOMP_FRONTEND_N64MODERNRUNTIME_PATH ${CMAKE_SOURCE_DIR}/lib/N64ModernRuntime)
+set(RECOMP_FRONTEND_RT64_PATH ${CMAKE_SOURCE_DIR}/lib/rt64)
+
+add_subdirectory(${CMAKE_SOURCE_DIR}/lib/RecompFrontend)
+
+target_link_libraries(BanjoRecompiled PRIVATE
+    PatchesLib
+    RecompiledFuncs
+    recompui
+    recompinput
+    librecomp
+    ultramodern
+    rt64
+    nfd
+)
 
 # Embed all .nrm files in the "mods" directory
 file(GLOB NRM_FILES "${CMAKE_SOURCE_DIR}/mods/*.nrm")
diff --git a/lib/RecompFrontend b/lib/RecompFrontend
index 8a58012..bd10e72 160000
--- a/lib/RecompFrontend
+++ b/lib/RecompFrontend
@@ -1 +1 @@
-Subproject commit 8a58012d2083a40cb1ebb537a4c828dcf5724d74
+Subproject commit bd10e72eca9a1d4249afd329b04a8cdd5f5c7e72
diff --git a/shaders/InterfacePS.hlsl b/shaders/InterfacePS.hlsl
deleted file mode 100644
index b8ab340..0000000
--- a/shaders/InterfacePS.hlsl
+++ /dev/null
@@ -1,11 +0,0 @@
-SamplerState gSampler : register(s1, space0);
-Texture2D<float4> gTexture : register(t2, space1);
-
-void PSMain(
-    in float4 iColor : COLOR,
-    in float2 iUV : TEXCOORD,
-    out float4 oColor : SV_TARGET
-)
-{
-    oColor = gTexture.SampleLevel(gSampler, iUV, 0) * iColor;
-}
diff --git a/shaders/InterfaceVS.hlsl b/shaders/InterfaceVS.hlsl
deleted file mode 100644
index 05fd649..0000000
--- a/shaders/InterfaceVS.hlsl
+++ /dev/null
@@ -1,23 +0,0 @@
-struct Input {
-    float4x4 transform;
-    float2 translation;
-};
-
-[[vk::push_constant]]
-ConstantBuffer<Input> gInput : register(b0, space0);
-
-void VSMain(
-    in float2 iPosition : POSITION,
-    in float4 iColor : COLOR,
-    in float2 iUV : TEXCOORD,
-    out float4 oColor : COLOR,
-    out float2 oUV : TEXCOORD,
-    out float4 oPosition : SV_Position
-)
-{
-	float2 translatedPos = iPosition + gInput.translation;
-	oPosition = mul(gInput.transform, float4(translatedPos, 0, 1));
-
-	oColor = iColor;
-	oUV = iUV;
-}