From 23f727351c4c6d7f2177994957c0b2a4f6d0e2e7 Mon Sep 17 00:00:00 2001
From: ty <amfobes@gmail.com>
Date: Sat, 24 Apr 2021 22:17:59 -0400
Subject: [PATCH] Core / VU: Disable MTVU when VU1 Interpreter is selected

Also clean up Config.h a little
---
 pcsx2/Config.h        | 10 ++--------
 pcsx2/Pcsx2Config.cpp |  8 +-------
 pcsx2/gui/AppInit.cpp |  4 +---
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/pcsx2/Config.h b/pcsx2/Config.h
index e00e2c23d1..40270c13d8 100644
--- a/pcsx2/Config.h
+++ b/pcsx2/Config.h
@@ -1,5 +1,5 @@
 /*  PCSX2 - PS2 Emulator for PCs
- *  Copyright (C) 2002-2010  PCSX2 Dev Team
+ *  Copyright (C) 2002-2021  PCSX2 Dev Team
  *
  *  PCSX2 is free software: you can redistribute it and/or modify it under the terms
  *  of the GNU Lesser General Public License as published by the Free Software Found-
@@ -237,10 +237,6 @@ struct Pcsx2Config
 				EnableVU0		:1,
 				EnableVU1		:1;
 
-			bool
-				UseMicroVU0		:1,
-				UseMicroVU1		:1;
-
 			bool
 				vuOverflow		:1,
 				vuExtraOverflow	:1,
@@ -540,10 +536,8 @@ TraceLogFilters&				SetTraceConfig();
 
 // ------------ CPU / Recompiler Options ---------------
 
-#define THREAD_VU1					(EmuConfig.Cpu.Recompiler.UseMicroVU1 && EmuConfig.Speedhacks.vuThread)
+#define THREAD_VU1					(EmuConfig.Cpu.Recompiler.EnableVU1 && EmuConfig.Speedhacks.vuThread)
 #define INSTANT_VU1					(EmuConfig.Speedhacks.vu1Instant)
-#define CHECK_MICROVU0				(EmuConfig.Cpu.Recompiler.UseMicroVU0)
-#define CHECK_MICROVU1				(EmuConfig.Cpu.Recompiler.UseMicroVU1)
 #define CHECK_EEREC					(EmuConfig.Cpu.Recompiler.EnableEE && GetCpuProviders().IsRecAvailable_EE())
 #define CHECK_CACHE					(EmuConfig.Cpu.Recompiler.EnableEECache)
 #define CHECK_IOPREC				(EmuConfig.Cpu.Recompiler.EnableIOP && GetCpuProviders().IsRecAvailable_IOP())
diff --git a/pcsx2/Pcsx2Config.cpp b/pcsx2/Pcsx2Config.cpp
index 55c2880fad..a2b11378ad 100644
--- a/pcsx2/Pcsx2Config.cpp
+++ b/pcsx2/Pcsx2Config.cpp
@@ -1,5 +1,5 @@
 /*  PCSX2 - PS2 Emulator for PCs
- *  Copyright (C) 2002-2010  PCSX2 Dev Team
+ *  Copyright (C) 2002-2021  PCSX2 Dev Team
  *
  *  PCSX2 is free software: you can redistribute it and/or modify it under the terms
  *  of the GNU Lesser General Public License as published by the Free Software Found-
@@ -120,9 +120,6 @@ Pcsx2Config::RecompilerOptions::RecompilerOptions()
 	EnableVU0	= true;
 	EnableVU1	= true;
 
-	UseMicroVU0	= true;
-	UseMicroVU1	= true;
-
 	// vu and fpu clamping default to standard overflow.
 	vuOverflow	= true;
 	//vuExtraOverflow = false;
@@ -177,9 +174,6 @@ void Pcsx2Config::RecompilerOptions::LoadSave( IniInterface& ini )
 	IniBitBool( EnableVU0 );
 	IniBitBool( EnableVU1 );
 
-	IniBitBool( UseMicroVU0 );
-	IniBitBool( UseMicroVU1 );
-
 	IniBitBool( vuOverflow );
 	IniBitBool( vuExtraOverflow );
 	IniBitBool( vuSignOverflow );
diff --git a/pcsx2/gui/AppInit.cpp b/pcsx2/gui/AppInit.cpp
index 963b217b88..9d4a64880c 100644
--- a/pcsx2/gui/AppInit.cpp
+++ b/pcsx2/gui/AppInit.cpp
@@ -1,5 +1,5 @@
 /*  PCSX2 - PS2 Emulator for PCs
- *  Copyright (C) 2002-2010  PCSX2 Dev Team
+ *  Copyright (C) 2002-2021  PCSX2 Dev Team
  *
  *  PCSX2 is free software: you can redistribute it and/or modify it under the terms
  *  of the GNU Lesser General Public License as published by the Free Software Found-
@@ -182,14 +182,12 @@ void Pcsx2App::AllocateCoreStuffs()
 			if (BaseException* ex = m_CpuProviders->GetException_MicroVU0())
 			{
 				scrollableTextArea->AppendText(L"* microVU0\n\t" + ex->FormatDisplayMessage() + L"\n\n");
-				recOps.UseMicroVU0 = false;
 				recOps.EnableVU0 = false;
 			}
 
 			if (BaseException* ex = m_CpuProviders->GetException_MicroVU1())
 			{
 				scrollableTextArea->AppendText(L"* microVU1\n\t" + ex->FormatDisplayMessage() + L"\n\n");
-				recOps.UseMicroVU1 = false;
 				recOps.EnableVU1 = false;
 			}