Skip to content

Commit ffff4a6

Browse files
committed
Revert: Config: Turn off MTVU, Instant VU1 by default.
reverts this due to better way of fixing black box in previous commit reverts f5fb30a (fixing conflicts
1 parent c3f851b commit ffff4a6

File tree

2 files changed

+8
-19
lines changed

2 files changed

+8
-19
lines changed

pcsx2/Pcsx2Config.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -384,8 +384,7 @@ Pcsx2Config::SpeedhackOptions::SpeedhackOptions()
384384
WaitLoop = true;
385385
IntcStat = true;
386386
vuFlagHack = true;
387-
//vu1Instant = true; //except this one (parappa 2 black box fix
388-
387+
vu1Instant = true;
389388
}
390389

391390
Pcsx2Config::SpeedhackOptions& Pcsx2Config::SpeedhackOptions::DisableAll()
@@ -1917,13 +1916,10 @@ Pcsx2Config::Pcsx2Config()
19171916
InhibitScreensaver = true;
19181917
BackupSavestate = true;
19191918

1920-
//black box/noodles fix for parappa 2, set as default for ptr2plus
1921-
EmuConfig.Speedhacks.vuThread = false;
1922-
EmuConfig.Speedhacks.vu1Instant = false;
19231919
//ptr2plus needs hostfs on
19241920
HostFs = true;
19251921

1926-
performance_preset = 0;
1922+
performance_preset = 0; //ptr2plus
19271923

19281924
WarnAboutUnsafeSettings = true;
19291925
ManuallySetRealTimeClock = false;

pcsx2/VMManager.cpp

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3312,15 +3312,10 @@ void VMManager::WarnAboutUnsafeSettings()
33123312
}
33133313
if (!EmuConfig.Cpu.Recompiler.EnableFastmem)
33143314
append(ICON_FA_EXCLAMATION_CIRCLE, TRANSLATE_SV("VMManager", "Fastmem is not enabled, this will reduce performance."));
3315-
if (EmuConfig.Speedhacks.vuThread)
3316-
{
3317-
append(ICON_FA_EXCLAMATION_CIRCLE,
3318-
TRANSLATE_SV("VMManager", "MTVU (Multi-Threaded VU1) is enabled, this will break visuals in PaRappa 2 (black box, noodles)"));
3319-
}
3320-
if (EmuConfig.Speedhacks.vu1Instant)
3315+
if (!EmuConfig.Speedhacks.vu1Instant)
33213316
{
33223317
append(ICON_FA_EXCLAMATION_CIRCLE,
3323-
TRANSLATE_SV("VMManager", "Instant VU1 is enabled, this will break visuals in PaRappa 2 (black box, noodles)"));
3318+
TRANSLATE_SV("VMManager", "Instant VU1 is disabled, this may reduce performance."));
33243319
}
33253320
if (!EmuConfig.Speedhacks.vuFlagHack)
33263321
{
@@ -3475,18 +3470,16 @@ void VMManager::SetHardwareDependentDefaultSettings(SettingsInterface& si)
34753470

34763471
Console.WriteLn(fmt::format("CPU cores count: {}", core_count));
34773472

3478-
/*
34793473
if (core_count >= 3)
34803474
{
34813475
Console.WriteLn(" Enabling MTVU.");
34823476
si.SetBoolValue("EmuCore/Speedhacks", "vuThread", true);
34833477
}
34843478
else
3485-
{*/
3486-
//Console.WriteLn(" Disabling MTVU.");
3487-
Console.WriteLn("Not enabling MTVU because it breaks PaRappa 2 (black box/noodles");
3488-
//si.SetBoolValue("EmuCore/Speedhacks", "vuThread", false);
3489-
//}
3479+
{
3480+
Console.WriteLn(" Disabling MTVU.");
3481+
si.SetBoolValue("EmuCore/Speedhacks", "vuThread", false);
3482+
}
34903483

34913484
const int extra_threads = (core_count > 3) ? 3 : 2;
34923485
Console.WriteLn(fmt::format(" Setting Extra Software Rendering Threads to {}.", extra_threads));

0 commit comments

Comments
 (0)