From fa0303d646d63dd83b3d654137a1ce511831331f Mon Sep 17 00:00:00 2001 From: Ty Date: Wed, 30 Jul 2025 15:11:32 -0400 Subject: [PATCH] GS: Properly check for a VU1 recompiler. Fixes ARM builds where the VU1 recompiler was enabled despite there being no VU1 recompiler. --- pcsx2/Config.h | 6 ++++-- pcsx2/Gif_Unit.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pcsx2/Config.h b/pcsx2/Config.h index 8921bd9995..84fee350ed 100644 --- a/pcsx2/Config.h +++ b/pcsx2/Config.h @@ -1435,10 +1435,12 @@ namespace EmuFolders // ------------ CPU / Recompiler Options --------------- -#ifdef _M_X86 // TODO(Stenzek): Remove me once EE/VU/IOP recs are added. -#define THREAD_VU1 (EmuConfig.Cpu.Recompiler.EnableVU1 && EmuConfig.Speedhacks.vuThread) +#ifdef _M_X86 // TODO: Remove me once EE/VU/IOP recs are added. +#define REC_VU1 (EmuConfig.Cpu.Recompiler.EnableVU1) +#define THREAD_VU1 (REC_VU1 && EmuConfig.Speedhacks.vuThread) #else #define THREAD_VU1 false +#define REC_VU1 false #endif #define INSTANT_VU1 (EmuConfig.Speedhacks.vu1Instant) #define CHECK_EEREC (EmuConfig.Cpu.Recompiler.EnableEE) diff --git a/pcsx2/Gif_Unit.h b/pcsx2/Gif_Unit.h index c47a6fa82b..ceaf53904a 100644 --- a/pcsx2/Gif_Unit.h +++ b/pcsx2/Gif_Unit.h @@ -603,7 +603,7 @@ struct Gif_Unit } if (curSize >= size) return size; - if(((flush && gifTag.tag.EOP) || !flush) && (CHECK_XGKICKHACK || !EmuConfig.Cpu.Recompiler.EnableVU1)) + if(((flush && gifTag.tag.EOP) || !flush) && (CHECK_XGKICKHACK || !REC_VU1)) { return curSize | ((u32)gifTag.tag.EOP << 31); }