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

Revert "PCSX2-Counters: Some Changes to Video mode counter stuffs"

This commit is contained in:
ramapcsx2 2016-06-09 00:44:14 +02:00
parent d482c5de91
commit ec07571069
8 changed files with 72 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcsx2/CDVD/CDVD.cpp
View File

@ -25,7 +25,7 @@
#include "CDVD_internal.h" #include "CDVD_internal.h"
#include "CDVDisoReader.h" #include "CDVDisoReader.h"
#include "GS.h" // for gsVideoMode #include "GS.h" // for gsRegionMode
#include "Elfheader.h" #include "Elfheader.h"
#include "ps2/BiosTools.h" #include "ps2/BiosTools.h"
#include "GameDatabase.h" #include "GameDatabase.h"
@ -958,7 +958,7 @@ u8 monthmap[13] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
void cdvdVsync() { void cdvdVsync() {
cdvd.RTCcount++; cdvd.RTCcount++;
if (cdvd.RTCcount < ((gsVideoMode == GS_VideoMode::NTSC) ? 60 : 50)) return; if (cdvd.RTCcount < ((gsRegionMode == Region_NTSC) ? 60 : 50)) return;
cdvd.RTCcount = 0; cdvd.RTCcount = 0;
if ( cdvd.Status == CDVD_STATUS_TRAY_OPEN ) if ( cdvd.Status == CDVD_STATUS_TRAY_OPEN )

4
pcsx2/Config.h
View File

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

37
pcsx2/Counters.cpp
View File

@ -156,7 +156,7 @@ void rcntInit()
vsyncCounter.sCycle = cpuRegs.cycle; vsyncCounter.sCycle = cpuRegs.cycle;
// Set the video mode to user's default request: // Set the video mode to user's default request:
gsSetVideoMode( static_cast<GS_VideoMode>(EmuConfig.GS.DefaultVideoMode )); gsSetRegionMode( (GS_RegionMode)EmuConfig.GS.DefaultRegionMode );
for (i=0; i<4; i++) rcntReset(i); for (i=0; i<4; i++) rcntReset(i);
cpuRcntSet(); cpuRcntSet();
@ -173,7 +173,7 @@ static u64 m_iStart=0;
struct vSyncTimingInfo struct vSyncTimingInfo
{ {
Fixed100 Framerate; // frames per second (8 bit fixed) Fixed100 Framerate; // frames per second (8 bit fixed)
GS_VideoMode VideoMode; // used to detect change (interlaced/progressive) GS_RegionMode RegionMode; // used to detect change (interlaced/progressive)
u32 Render; // time from vblank end to vblank start (cycles) u32 Render; // time from vblank end to vblank start (cycles)
u32 Blank; // time from vblank start to vblank end (cycles) u32 Blank; // time from vblank start to vblank end (cycles)
@ -193,6 +193,7 @@ static void vSyncInfoCalc(vSyncTimingInfo* info, Fixed100 framesPerSecond, u32 s
// NOTE: mgs3 likes a /4 vsync, but many games prefer /2. This seems to indicate a // NOTE: mgs3 likes a /4 vsync, but many games prefer /2. This seems to indicate a
// problem in the counters vsync gates somewhere. // problem in the counters vsync gates somewhere.
u64 Frame = ((u64)PS2CLK * 1000000ULL) / (framesPerSecond * 100).ToIntRounded(); u64 Frame = ((u64)PS2CLK * 1000000ULL) / (framesPerSecond * 100).ToIntRounded();
u64 HalfFrame = Frame / 2; u64 HalfFrame = Frame / 2;
@ -213,7 +214,7 @@ static void vSyncInfoCalc(vSyncTimingInfo* info, Fixed100 framesPerSecond, u32 s
u64 hBlank = Scanline / 2; u64 hBlank = Scanline / 2;
u64 hRender = Scanline - hBlank; u64 hRender = Scanline - hBlank;
if (gsVideoMode >= GS_VideoMode::VESA) if (gsRegionMode == Region_NTSC_PROGRESSIVE)
{ {
hBlank /= 2; hBlank /= 2;
hRender /= 2; hRender /= 2;
@ -235,7 +236,7 @@ static void vSyncInfoCalc(vSyncTimingInfo* info, Fixed100 framesPerSecond, u32 s
else if ((hBlank - info->hBlank) >= 5000) info->hBlank++; else if ((hBlank - info->hBlank) >= 5000) info->hBlank++;
// Calculate accumulative hSync rounding error per half-frame: // Calculate accumulative hSync rounding error per half-frame:
if (gsVideoMode >= GS_VideoMode::VESA) // gets off the chart in that mode if (gsRegionMode != Region_NTSC_PROGRESSIVE) // gets off the chart in that mode
{ {
u32 hSyncCycles = ((info->hRender + info->hBlank) * scansPerFrame) / 2; u32 hSyncCycles = ((info->hRender + info->hBlank) * scansPerFrame) / 2;
u32 vSyncCycles = (info->Render + info->Blank); u32 vSyncCycles = (info->Render + info->Blank);
@ -248,21 +249,6 @@ static void vSyncInfoCalc(vSyncTimingInfo* info, Fixed100 framesPerSecond, u32 s
// is thus not worth the effort at this time. // is thus not worth the effort at this time.
} }
const char* Report_VideoMode(GS_VideoMode videomode)
{
switch (videomode)
{
case GS_VideoMode::PAL: return "PAL";
case GS_VideoMode::NTSC: return "NTSC";
case GS_VideoMode::VESA: return "VESA";
case GS_VideoMode::HDTV_480P: return "HDTV 480p";
case GS_VideoMode::HDTV_576P: return "HDTV 576p";
case GS_VideoMode::HDTV_720P: return "HDTV 720p";
case GS_VideoMode::HDTV_1080I: return "HDTV 1080i";
case GS_VideoMode::HDTV_1080P: return "HDTV 1080p";
default: return "Unknown Video Mode";
}
}
u32 UpdateVSyncRate() u32 UpdateVSyncRate()
{ {
@ -276,32 +262,33 @@ u32 UpdateVSyncRate()
u32 scanlines = 0; u32 scanlines = 0;
bool isCustom = false; bool isCustom = false;
if( gsVideoMode == GS_VideoMode::PAL ) if( gsRegionMode == Region_PAL )
{ {
isCustom = (EmuConfig.GS.FrameratePAL != 50.0); isCustom = (EmuConfig.GS.FrameratePAL != 50.0);
framerate = EmuConfig.GS.FrameratePAL / 2; framerate = EmuConfig.GS.FrameratePAL / 2;
scanlines = SCANLINES_TOTAL_PAL; scanlines = SCANLINES_TOTAL_PAL;
if (!gsIsInterlaced) scanlines += 3; if (!gsIsInterlaced) scanlines += 3;
} }
else if ( gsVideoMode == GS_VideoMode::NTSC) else if ( gsRegionMode == Region_NTSC )
{ {
isCustom = (EmuConfig.GS.FramerateNTSC != 59.94); isCustom = (EmuConfig.GS.FramerateNTSC != 59.94);
framerate = EmuConfig.GS.FramerateNTSC / 2; framerate = EmuConfig.GS.FramerateNTSC / 2;
scanlines = SCANLINES_TOTAL_NTSC; scanlines = SCANLINES_TOTAL_NTSC;
if (!gsIsInterlaced) scanlines += 1; if (!gsIsInterlaced) scanlines += 1;
} }
else if (gsVideoMode >= GS_VideoMode::VESA) // VESA/HDTV Video modes else if ( gsRegionMode == Region_NTSC_PROGRESSIVE )
{ {
isCustom = (EmuConfig.GS.FramerateNTSC != 59.94); isCustom = (EmuConfig.GS.FramerateNTSC != 59.94);
framerate = EmuConfig.GS.FramerateNTSC / 2; framerate = EmuConfig.GS.FramerateNTSC / 2;
scanlines = SCANLINES_TOTAL_NTSC; scanlines = SCANLINES_TOTAL_NTSC;
} }
if (vSyncInfo.Framerate != framerate || vSyncInfo.VideoMode != gsVideoMode) if (vSyncInfo.Framerate != framerate || vSyncInfo.RegionMode != gsRegionMode)
{ {
vSyncInfo.VideoMode = gsVideoMode; vSyncInfo.RegionMode = gsRegionMode;
vSyncInfoCalc( &vSyncInfo, framerate, scanlines ); vSyncInfoCalc( &vSyncInfo, framerate, scanlines );
Console.WriteLn( Color_Green, "(UpdateVSyncRate) Mode Changed to %s.", Report_VideoMode(gsVideoMode)); Console.WriteLn( Color_Green, "(UpdateVSyncRate) Mode Changed to %s.", ( gsRegionMode == Region_PAL ) ? "PAL" :
( gsRegionMode == Region_NTSC ) ? "NTSC" : "NTSC Progressive Scan" );
if( isCustom ) if( isCustom )
Console.Indent().WriteLn( Color_StrongGreen, "... with user configured refresh rate: %.02f Hz", 2 * framerate.ToFloat() ); Console.Indent().WriteLn( Color_StrongGreen, "... with user configured refresh rate: %.02f Hz", 2 * framerate.ToFloat() );

25
pcsx2/GS.cpp
View File

@ -33,14 +33,14 @@ void gsOnModeChanged( Fixed100 framerate, u32 newTickrate )
} }
bool gsIsInterlaced = false; bool gsIsInterlaced = false;
GS_RegionMode gsRegionMode = Region_NTSC;
void gsSetVideoMode( GS_VideoMode VideoMode ) void gsSetRegionMode( GS_RegionMode region )
{ {
if( gsVideoMode == VideoMode ) if( gsRegionMode == region ) return;
return;
gsVideoMode = VideoMode; gsRegionMode = region;
UpdateVSyncRate(); UpdateVSyncRate();
} }
@ -157,8 +157,21 @@ __fi void gsWrite8(u32 mem, u8 value)
static void _gsSMODEwrite( u32 mem, u32 value ) static void _gsSMODEwrite( u32 mem, u32 value )
{ {
if(mem == GS_SMODE2) switch (mem)
{
case GS_SMODE1:
if ( (value & 0x6000) == 0x6000 )
gsSetRegionMode( Region_PAL );
else if (value & 0x400000 || value & 0x200000)
gsSetRegionMode( Region_NTSC_PROGRESSIVE );
else
gsSetRegionMode( Region_NTSC );
break;
case GS_SMODE2:
gsIsInterlaced = (value & 0x1); gsIsInterlaced = (value & 0x1);
break;
}
} }
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
@ -423,5 +436,5 @@ void gsResetFrameSkip()
void SaveStateBase::gsFreeze() void SaveStateBase::gsFreeze()
{ {
FreezeMem(PS2MEM_GS, 0x2000); FreezeMem(PS2MEM_GS, 0x2000);
Freeze(gsVideoMode); Freeze(gsRegionMode);
} }

18
pcsx2/GS.h
View File

@ -217,20 +217,14 @@ struct GSRegSIGBLID
#define GSIMR ((u32&)*(PS2MEM_GS+0x1010)) #define GSIMR ((u32&)*(PS2MEM_GS+0x1010))
#define GSSIGLBLID ((GSRegSIGBLID&)*(PS2MEM_GS+0x1080)) #define GSSIGLBLID ((GSRegSIGBLID&)*(PS2MEM_GS+0x1080))
enum class GS_VideoMode : u8 enum GS_RegionMode
{ {
NTSC, Region_NTSC,
PAL, Region_PAL,
VESA, Region_NTSC_PROGRESSIVE
HDTV_480P,
HDTV_576P,
HDTV_720P,
HDTV_1080I,
HDTV_1080P,
Unknown
}; };
extern GS_VideoMode gsVideoMode; extern GS_RegionMode gsRegionMode;
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// MTGS Threaded Class Declaration // MTGS Threaded Class Declaration
@ -369,7 +363,7 @@ extern s32 gsOpen();
extern void gsClose(); extern void gsClose();
extern void gsReset(); extern void gsReset();
extern void gsOnModeChanged( Fixed100 framerate, u32 newTickrate ); extern void gsOnModeChanged( Fixed100 framerate, u32 newTickrate );
extern void gsSetVideoMode( GS_VideoMode VideoMode ); extern void gsSetRegionMode( GS_RegionMode isPal );
extern void gsResetFrameSkip(); extern void gsResetFrameSkip();
extern void gsPostVsyncStart(); extern void gsPostVsyncStart();
extern void gsFrameSkip(); extern void gsFrameSkip();

4
pcsx2/Pcsx2Config.cpp
View File

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

56
pcsx2/R5900OpcodeImpl.cpp
View File

@ -22,9 +22,7 @@
#include "R5900.h" #include "R5900.h"
#include "R5900OpcodeTables.h" #include "R5900OpcodeTables.h"
#include "R5900Exceptions.h" #include "R5900Exceptions.h"
#include "GS.h"
GS_VideoMode gsVideoMode = GS_VideoMode::Unknown;
static __fi bool _add64_Overflow( s64 x, s64 y, s64 &ret ) static __fi bool _add64_Overflow( s64 x, s64 y, s64 &ret )
{ {
@ -887,43 +885,43 @@ void SYSCALL()
const char* inter = (cpuRegs.GPR.n.a0.UL[0] & 1) ? "Interlaced" : "Progressive"; const char* inter = (cpuRegs.GPR.n.a0.UL[0] & 1) ? "Interlaced" : "Progressive";
const char* field = (cpuRegs.GPR.n.a2.UL[0] & 1) ? "FRAME" : "FIELD"; const char* field = (cpuRegs.GPR.n.a2.UL[0] & 1) ? "FRAME" : "FIELD";
std::string mode; std::string mode;
// Warning info might be incorrect!
switch (cpuRegs.GPR.n.a1.UC[0]) {
case 0x2: mode = "NTSC 640x448 @ 59.940 (59.82)"; break;
switch (cpuRegs.GPR.n.a1.UC[0]) case 0x3: mode = "PAL 640x512 @ 50.000 (49.76)"; break;
{
case 0x2: mode = "NTSC 640x448 @ 59.940 (59.82)"; gsSetVideoMode(GS_VideoMode::NTSC); break;
case 0x3: mode = "PAL 640x512 @ 50.000 (49.76)"; gsSetVideoMode(GS_VideoMode::PAL); break;
case 0x1A: mode = "VESA 640x480 @ 59.940"; gsSetVideoMode(GS_VideoMode::VESA); break; case 0x1A: mode = "VESA 640x480 @ 59.940"; break;
case 0x1B: mode = "VESA 640x480 @ 72.809"; gsSetVideoMode(GS_VideoMode::VESA); break; case 0x1B: mode = "VESA 640x480 @ 72.809"; break;
case 0x1C: mode = "VESA 640x480 @ 75.000"; gsSetVideoMode(GS_VideoMode::VESA); break; case 0x1C: mode = "VESA 640x480 @ 75.000"; break;
case 0x1D: mode = "VESA 640x480 @ 85.008"; gsSetVideoMode(GS_VideoMode::VESA); break; case 0x1D: mode = "VESA 640x480 @ 85.008"; break;
case 0x2A: mode = "VESA 800x600 @ 56.250"; gsSetVideoMode(GS_VideoMode::VESA); break; case 0x2A: mode = "VESA 800x600 @ 56.250"; break;
case 0x2B: mode = "VESA 800x600 @ 60.317"; gsSetVideoMode(GS_VideoMode::VESA); break; case 0x2B: mode = "VESA 800x600 @ 60.317"; break;
case 0x2C: mode = "VESA 800x600 @ 72.188"; gsSetVideoMode(GS_VideoMode::VESA); break; case 0x2C: mode = "VESA 800x600 @ 72.188"; break;
case 0x2D: mode = "VESA 800x600 @ 75.000"; gsSetVideoMode(GS_VideoMode::VESA); break; case 0x2D: mode = "VESA 800x600 @ 75.000"; break;
case 0x2E: mode = "VESA 800x600 @ 85.061"; gsSetVideoMode(GS_VideoMode::VESA); break; case 0x2E: mode = "VESA 800x600 @ 85.061"; break;
case 0x3B: mode = "VESA 1024x768 @ 60.004"; gsSetVideoMode(GS_VideoMode::VESA); break; case 0x3B: mode = "VESA 1024x768 @ 60.004"; break;
case 0x3C: mode = "VESA 1024x768 @ 70.069"; gsSetVideoMode(GS_VideoMode::VESA); break; case 0x3C: mode = "VESA 1024x768 @ 70.069"; break;
case 0x3D: mode = "VESA 1024x768 @ 75.029"; gsSetVideoMode(GS_VideoMode::VESA); break; case 0x3D: mode = "VESA 1024x768 @ 75.029"; break;
case 0x3E: mode = "VESA 1024x768 @ 84.997"; gsSetVideoMode(GS_VideoMode::VESA); break; case 0x3E: mode = "VESA 1024x768 @ 84.997"; break;
case 0x4A: mode = "VESA 1280x1024 @ 63.981"; gsSetVideoMode(GS_VideoMode::VESA); break; case 0x4A: mode = "VESA 1280x1024 @ 63.981"; break;
case 0x4B: mode = "VESA 1280x1024 @ 79.976"; gsSetVideoMode(GS_VideoMode::VESA); break; case 0x4B: mode = "VESA 1280x1024 @ 79.976"; break;
case 0x50: mode = "HDTV 720x480 @ 59.94"; gsSetVideoMode(GS_VideoMode::HDTV_480P); break; case 0x50: mode = "HDTV 720x480 @ 59.94"; break;
case 0x51: mode = "HDTV 1920x1080 @ 60.00"; gsSetVideoMode(GS_VideoMode::HDTV_1080I); break; case 0x51: mode = "HDTV 1920x1080 @ 60.00"; break;
case 0x52: mode = "HDTV 1280x720 @ ??.???"; gsSetVideoMode(GS_VideoMode::HDTV_720P); break; case 0x52: mode = "HDTV 1280x720 @ ??.???"; break;
case 0x53: mode = "HDTV 768x576 @ ??.???"; gsSetVideoMode(GS_VideoMode::HDTV_576P); break; case 0x53: mode = "HDTV 768x576 @ ??.???"; break;
case 0x54: mode = "HDTV 1920x1080 @ ??.???"; gsSetVideoMode(GS_VideoMode::HDTV_1080P); break; case 0x54: mode = "HDTV 1920x1080 @ ??.???"; break;
case 0x72: mode = "DVD NTSC 640x448 @ ??.???"; break; case 0x72: mode = "DVD NTSC 640x448 @ ??.???"; break;
case 0x73: mode = "DVD PAL 720x480 @ ??.???"; break; case 0x73: mode = "DVD PAL/480P 720x480 @ ??.???"; break;
default: DevCon.Error("Mode %x is not supported. Report me upstream", cpuRegs.GPR.n.a1.UC[0]); default: Console.Error("Mode %x is not supported. Report me upstream", cpuRegs.GPR.n.a1.UC[0]);
} }
DevCon.Warning("Set GS CRTC configuration. Interlace %s. Field Type %s. Mode %s", inter, field, mode.c_str()); Console.Warning("Set GS CRTC configuration. Interlace %s. Field Type %s. Mode %s", inter, field, mode.c_str());
} }
break; break;

4
pcsx2/gui/FrameForGS.cpp
View File

@ -591,8 +591,8 @@ void GSFrame::OnUpdateTitle( wxTimerEvent& evt )
AppConfig::UiTemplateOptions& templates = g_Conf->Templates; AppConfig::UiTemplateOptions& templates = g_Conf->Templates;
double fps = wxGetApp().FpsManager.GetFramerate(); double fps = wxGetApp().FpsManager.GetFramerate();
// The "not PAL" case covers both NTSC and Progressive modes // The "not PAL" case covers both Region_NTSC and Region_NTSC_PROGRESSIVE
float per = gsVideoMode == GS_VideoMode::PAL ? (fps * 100) / EmuConfig.GS.FrameratePAL.ToFloat() : (fps * 100) / EmuConfig.GS.FramerateNTSC.ToFloat(); float per = gsRegionMode == Region_PAL ? (fps * 100) / EmuConfig.GS.FrameratePAL.ToFloat() : (fps * 100) / EmuConfig.GS.FramerateNTSC.ToFloat();
char gsDest[128]; char gsDest[128];
gsDest[0] = 0; // No need to set whole array to NULL. gsDest[0] = 0; // No need to set whole array to NULL.