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

wxgui: Add in a missed check on the threading. Update the game fixes panel. 

git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxgui@1744 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-09-05 12:02:07 +00:00
parent 93e1d87a22
commit 163efebb29
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/Utilities/ThreadTools.cpp
View File

@ -94,6 +94,8 @@ namespace Threading
//
void PersistentThread::Cancel( bool isBlocking )
{
if( !m_running ) return;
if( _InterlockedExchange( &m_detached, true ) )
{
if( m_running )

20
pcsx2/Config.h
View File

@ -53,7 +53,7 @@ enum PluginsEnum_t
// This is intended to be a public class library between the core emulator and GUI only.
// It is *not* meant to be shared data between core emulation and plugins, due to issues
// with version incompatibilities if the structure formats are changed.
//
//
// When GUI code performs modifications of this class, it must be done with strict thread
// safety, since the emu runs on a separate thread. Additionally many components of the
// class require special emu-side resets or state save/recovery to be applied. Please
@ -98,12 +98,12 @@ public:
EnableIOP:1,
EnableVU0:1,
EnableVU1:1;
bool
UseMicroVU0:1,
UseMicroVU1:1;
}; };
// All recs are enabled by default.
RecompilerOptions() : bitset( 0xffffffff ) { }
void LoadSave( IniInterface& conf );
@ -134,7 +134,7 @@ public:
vuExtraOverflow:1,
vuSignOverflow:1,
vuUnderflow:1;
bool
fpuOverflow:1,
fpuExtraOverflow:1,
@ -143,7 +143,7 @@ public:
CpuOptions();
void LoadSave( IniInterface& conf );
bool operator ==( const CpuOptions& right ) const
{
return
@ -184,10 +184,12 @@ public:
BITFIELD32()
bool
VuAddSubHack:1, // Fix for Tri-ace games, they use an encryption algorithm that requires VU ADDI opcode to be bit-accurate.
VuClipFlagHack:1, // Fix for Digimon Rumble Arena 2, fixes spinning/hanging on intro-menu.
FpuCompareHack:1, // Fix for Persona games, maybe others. It's to do with the VU clip flag (again).
VuClipFlagHack:1, // Fix for Persona games, maybe others. It's to do with the VU clip flag (again).
FpuCompareHack:1, // Fix for Digimon Rumble Arena 2, fixes spinning/hanging on intro-menu.
FpuMulHack:1, // Fix for Tales of Destiny hangs.
XgKickHack:1; // Fix for Erementar Gerad, adds more delay to VU XGkick instructions. Corrects the color of some graphics, but breaks Tri-ace games and others.
DMAExeHack:1, // Fix for Fatal Frame; breaks Gust and Tri-Ace games.
XgKickHack:1, // Fix for Erementar Gerad, adds more delay to VU XGkick instructions. Corrects the color of some graphics, but breaks Tri-ace games and others.
MpegHack:1; // Fix for Mana Khemia 1, breaks Digital Devil Saga.
}; };
// all gamefixes are disabled by default.
@ -213,7 +215,7 @@ public:
IopCycleRate_X2:1, // enables the x2 multiplier of the IOP cyclerate
IntcStat:1, // tells Pcsx2 to fast-forward through intc_stat waits.
BIFC0:1, // enables BIFC0 detection and fast-forwarding
vuMinMax:1, // microVU specific MinMax hack; Can cause SPS, Black Screens, etc...
vuFlagHack:1; // MicroVU specific flag hack; Can cause Infinite loops, SPS, etc...
}; };

11
pcsx2/gui/Panels/GameFixesPanel.cpp
View File

@ -28,11 +28,16 @@ Panels::GameFixesPanel::GameFixesPanel( wxWindow& parent, int idealWidth ) :
AddStaticText( mainSizer, _("Some games need special settings.\nEnable them here.") );
wxStaticBoxSizer& groupSizer = *new wxStaticBoxSizer( wxVERTICAL, this, _("PCSX2 Gamefixes") );
AddCheckBox( groupSizer, _("DMA Execution Hack - for Fatal Frame.") );
AddCheckBox( groupSizer, _("VU Add Hack - for Tri-Ace games!") );
AddCheckBox( groupSizer, _( "VU Clip Flag Hack - for Persona games, maybe others.") );
AddCheckBox( groupSizer, _("FPU Compare Hack - for Digimon Rumble Arena 2.") );
AddCheckBox( groupSizer, _("FPU Multiply Hack - for Tales of Destiny.") );
AddCheckBox( groupSizer, _("VU Add Hack - for Tri-Ace games!") );
AddCheckBox( groupSizer, _("VU XGkick Hack - for Erementar Gerad") );
AddCheckBox( groupSizer, _("DMA Execution Hack - for Fatal Frame.") );
AddCheckBox( groupSizer, _("VU XGkick Hack - for Erementar Gerad.") );
// I may as well add this, since these aren't hooked in yet. If the consensus is against it,
// I'll remove it.
AddCheckBox( groupSizer, _("MPEG Hack - for Mana Khemia 1.") );
mainSizer.Add( &groupSizer, wxSizerFlags().Centre() );