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

PCSX2-Counters: Remove default video mode variable 

* Fixes a bug where NTSC VideoMode was automatically used when videomode is uninitialized. the bug was only temporary till the SMODE register was written.
This commit is contained in:
Akash 2016-07-01 14:46:53 +05:30
parent a1fdf1e625
commit e7d4bc4506
3 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcsx2/Config.h
View File

@ -288,11 +288,6 @@ struct Pcsx2Config
bool FrameSkipEnable;
bool VsyncEnable;
// The region mode controls the default Maximum/Minimum FPS settings and also
// regulates the vsync rates (which in turn control the IOP's SPU2 tick sync and ensure
// proper audio playback speed).
int DefaultVideoMode; // 0=NTSC and 1=PAL
int FramesToDraw; // number of consecutive frames (fields) to render
int FramesToSkip; // number of consecutive frames (fields) to skip
@ -318,7 +313,6 @@ struct Pcsx2Config
OpEqu( FramerateNTSC ) &&
OpEqu( FrameratePAL ) &&
OpEqu( DefaultVideoMode ) &&
OpEqu( FramesToDraw ) &&
OpEqu( FramesToSkip );
}

3
pcsx2/Counters.cpp
View File

@ -155,9 +155,6 @@ void rcntInit()
vsyncCounter.Mode = MODE_VRENDER;
vsyncCounter.sCycle = cpuRegs.cycle;
// Set the video mode to user's default request:
gsSetVideoMode( (GS_VideoMode)EmuConfig.GS.DefaultVideoMode );
for (i=0; i<4; i++) rcntReset(i);
cpuRcntSet();
}

5
pcsx2/Pcsx2Config.cpp
View File

@ -206,7 +206,6 @@ Pcsx2Config::GSOptions::GSOptions()
DisableOutput = false;
VsyncQueueSize = 2;
DefaultVideoMode = NTSC;
FramesToDraw = 2;
FramesToSkip = 2;
@ -231,10 +230,6 @@ void Pcsx2Config::GSOptions::LoadSave( IniInterface& ini )
IniEntry( FramerateNTSC );
IniEntry( FrameratePAL );
// WARNING: array must be NULL terminated to compute it size
static const wxChar * const ntsc_pal_str[3] = { L"ntsc", L"pal", NULL };
ini.EnumEntry( L"DefaultRegionMode", DefaultVideoMode, ntsc_pal_str, DefaultVideoMode );
IniEntry( FramesToDraw );
IniEntry( FramesToSkip );
}