From 4b2a81e7fffe9404af0cc048c9e9eb33d3a46ab8 Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Thu, 19 Aug 2021 17:59:17 +1000
Subject: [PATCH] Move GetCoreThread()/GetMTGS() to AppCoreThread.cpp

---
 pcsx2/Config.h              |  4 ++--
 pcsx2/gui/AppCoreThread.cpp |  9 +++++++++
 pcsx2/gui/AppMain.cpp       | 10 ----------
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/pcsx2/Config.h b/pcsx2/Config.h
index 62cf385aea..5418ac705c 100644
--- a/pcsx2/Config.h
+++ b/pcsx2/Config.h
@@ -542,9 +542,9 @@ TraceLogFilters&				SetTraceConfig();
 
 #define THREAD_VU1					(EmuConfig.Cpu.Recompiler.EnableVU1 && EmuConfig.Speedhacks.vuThread)
 #define INSTANT_VU1					(EmuConfig.Speedhacks.vu1Instant)
-#define CHECK_EEREC					(EmuConfig.Cpu.Recompiler.EnableEE && GetCpuProviders().IsRecAvailable_EE())
+#define CHECK_EEREC					(EmuConfig.Cpu.Recompiler.EnableEE)
 #define CHECK_CACHE					(EmuConfig.Cpu.Recompiler.EnableEECache)
-#define CHECK_IOPREC				(EmuConfig.Cpu.Recompiler.EnableIOP && GetCpuProviders().IsRecAvailable_IOP())
+#define CHECK_IOPREC				(EmuConfig.Cpu.Recompiler.EnableIOP)
 
 //------------ SPECIAL GAME FIXES!!! ---------------
 #define CHECK_VUADDSUBHACK			(EmuConfig.Gamefixes.VuAddSubHack)	 // Special Fix for Tri-ace games, they use an encryption algorithm that requires VU addi opcode to be bit-accurate.
diff --git a/pcsx2/gui/AppCoreThread.cpp b/pcsx2/gui/AppCoreThread.cpp
index 06cd62748d..01896f2e96 100644
--- a/pcsx2/gui/AppCoreThread.cpp
+++ b/pcsx2/gui/AppCoreThread.cpp
@@ -42,6 +42,15 @@ __aligned16 AppCoreThread CoreThread;
 
 typedef void (AppCoreThread::*FnPtr_CoreThreadMethod)();
 
+SysCoreThread& GetCoreThread()
+{
+	return CoreThread;
+}
+
+SysMtgsThread& GetMTGS()
+{
+	return mtgsThread;
+}
 
 namespace GameInfo
 {
diff --git a/pcsx2/gui/AppMain.cpp b/pcsx2/gui/AppMain.cpp
index ccc5e937ba..aa5f95f5bc 100644
--- a/pcsx2/gui/AppMain.cpp
+++ b/pcsx2/gui/AppMain.cpp
@@ -1100,16 +1100,6 @@ SysMainMemory& GetVmMemory()
 	return wxGetApp().GetVmReserve();
 }
 
-SysCoreThread& GetCoreThread()
-{
-	return CoreThread;
-}
-
-SysMtgsThread& GetMTGS()
-{
-	return mtgsThread;
-}
-
 SysCpuProviderPack& GetCpuProviders()
 {
 	return *wxGetApp().m_CpuProviders;