ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Core / VU: Disable MTVU when VU1 Interpreter is selected 

Also clean up Config.h a little
This commit is contained in:
ty 2021-04-24 22:17:59 -04:00 committed by lightningterror
parent 133af79c45
commit 23f727351c
3 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pcsx2/Config.h
View File

@ -1,5 +1,5 @@
/* PCSX2 - PS2 Emulator for PCs /* 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 * 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- * of the GNU Lesser General Public License as published by the Free Software Found-
@ -237,10 +237,6 @@ struct Pcsx2Config
EnableVU0 :1, EnableVU0 :1,
EnableVU1 :1; EnableVU1 :1;
bool
UseMicroVU0 :1,
UseMicroVU1 :1;
bool bool
vuOverflow :1, vuOverflow :1,
vuExtraOverflow :1, vuExtraOverflow :1,
@ -540,10 +536,8 @@ TraceLogFilters& SetTraceConfig();
// ------------ CPU / Recompiler Options --------------- // ------------ 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 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_EEREC (EmuConfig.Cpu.Recompiler.EnableEE && GetCpuProviders().IsRecAvailable_EE())
#define CHECK_CACHE (EmuConfig.Cpu.Recompiler.EnableEECache) #define CHECK_CACHE (EmuConfig.Cpu.Recompiler.EnableEECache)
#define CHECK_IOPREC (EmuConfig.Cpu.Recompiler.EnableIOP && GetCpuProviders().IsRecAvailable_IOP()) #define CHECK_IOPREC (EmuConfig.Cpu.Recompiler.EnableIOP && GetCpuProviders().IsRecAvailable_IOP())

8
pcsx2/Pcsx2Config.cpp
View File

@ -1,5 +1,5 @@
/* PCSX2 - PS2 Emulator for PCs /* 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 * 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- * of the GNU Lesser General Public License as published by the Free Software Found-
@ -120,9 +120,6 @@ Pcsx2Config::RecompilerOptions::RecompilerOptions()
EnableVU0 = true; EnableVU0 = true;
EnableVU1 = true; EnableVU1 = true;
UseMicroVU0 = true;
UseMicroVU1 = true;
// vu and fpu clamping default to standard overflow. // vu and fpu clamping default to standard overflow.
vuOverflow = true; vuOverflow = true;
//vuExtraOverflow = false; //vuExtraOverflow = false;
@ -177,9 +174,6 @@ void Pcsx2Config::RecompilerOptions::LoadSave( IniInterface& ini )
IniBitBool( EnableVU0 ); IniBitBool( EnableVU0 );
IniBitBool( EnableVU1 ); IniBitBool( EnableVU1 );
IniBitBool( UseMicroVU0 );
IniBitBool( UseMicroVU1 );
IniBitBool( vuOverflow ); IniBitBool( vuOverflow );
IniBitBool( vuExtraOverflow ); IniBitBool( vuExtraOverflow );
IniBitBool( vuSignOverflow ); IniBitBool( vuSignOverflow );

4
pcsx2/gui/AppInit.cpp
View File

@ -1,5 +1,5 @@
/* PCSX2 - PS2 Emulator for PCs /* 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 * 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- * 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()) if (BaseException* ex = m_CpuProviders->GetException_MicroVU0())
{ {
scrollableTextArea->AppendText(L"* microVU0\n\t" + ex->FormatDisplayMessage() + L"\n\n"); scrollableTextArea->AppendText(L"* microVU0\n\t" + ex->FormatDisplayMessage() + L"\n\n");
recOps.UseMicroVU0 = false;
recOps.EnableVU0 = false; recOps.EnableVU0 = false;
} }
if (BaseException* ex = m_CpuProviders->GetException_MicroVU1()) if (BaseException* ex = m_CpuProviders->GetException_MicroVU1())
{ {
scrollableTextArea->AppendText(L"* microVU1\n\t" + ex->FormatDisplayMessage() + L"\n\n"); scrollableTextArea->AppendText(L"* microVU1\n\t" + ex->FormatDisplayMessage() + L"\n\n");
recOps.UseMicroVU1 = false;
recOps.EnableVU1 = false; recOps.EnableVU1 = false;
} }