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

win32: cut ext height from top and botton, center regular (fixes #443)

This commit is contained in:
OV2 2018-11-01 22:36:31 +01:00
parent 63126dfc48
commit 24c29e281a
3 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
win32/win32.cpp
View File

@ -1038,9 +1038,9 @@ void InitSnes9X( void)
extern void S9xPostRomInit(); extern void S9xPostRomInit();
Memory.PostRomInitFunc = S9xPostRomInit; Memory.PostRomInitFunc = S9xPostRomInit;
ScreenBuf = new BYTE [EXT_PITCH * EXT_HEIGHT]; ScreenBuf = new BYTE [EXT_PITCH * EXT_HEIGHT_WITH_CENTERING];
ScreenBuffer = ScreenBuf + EXT_OFFSET; ScreenBuffer = ScreenBuf + EXT_OFFSET_WITH_CENTERING;
memset (ScreenBuf, 0, EXT_PITCH * EXT_HEIGHT); memset (ScreenBuf, 0, EXT_PITCH * EXT_HEIGHT_WITH_CENTERING);
GFX.Pitch = EXT_PITCH; GFX.Pitch = EXT_PITCH;
GFX.RealPPL = EXT_PITCH; GFX.RealPPL = EXT_PITCH;

35
win32/win32_display.cpp
View File

@ -232,6 +232,29 @@ IS9xDisplayOutput *S9xDisplayOutput=&Direct3D;
bool8 S9xDeinitUpdate (int, int); bool8 S9xDeinitUpdate (int, int);
void DoAVIVideoFrame(); void DoAVIVideoFrame();
// cut off both top and bottom if overscan is disabled and game outputs extended height,
// center image if overscan is enabled and game outputs regular height
static void CheckOverscanOffset()
{
int lines_to_skip = 0;
if (!GUI.HeightExtend)
{
if (Src.Height == SNES_HEIGHT_EXTENDED)
lines_to_skip = 7;
else if (Src.Height == SNES_HEIGHT_EXTENDED << 1)
lines_to_skip = 15;
}
else
{
if (Src.Height == SNES_HEIGHT)
lines_to_skip = -8;
else if (Src.Height == SNES_HEIGHT << 1)
lines_to_skip = -16;
}
Src.Surface = (BYTE*)(GFX.Screen + lines_to_skip * (int)GFX.RealPPL);
}
/* WinRefreshDisplay /* WinRefreshDisplay
repeats the last rendered frame repeats the last rendered frame
*/ */
@ -240,6 +263,8 @@ void WinRefreshDisplay(void)
if(!Src.Width) if(!Src.Width)
return; return;
CheckOverscanOffset();
SelectRenderMethod (); SelectRenderMethod ();
S9xDisplayOutput->Render(Src); S9xDisplayOutput->Render(Src);
@ -391,16 +416,10 @@ bool8 S9xContinueUpdate(int Width, int Height)
bool8 S9xDeinitUpdate (int Width, int Height) bool8 S9xDeinitUpdate (int Width, int Height)
{ {
Src.Width = Width; Src.Width = Width;
if(Height%SNES_HEIGHT)
Src.Height = Height; Src.Height = Height;
else
{
if(Height==SNES_HEIGHT)
Src.Height=SNES_HEIGHT_EXTENDED;
else Src.Height=SNES_HEIGHT_EXTENDED<<1;
}
Src.Pitch = GFX.Pitch; Src.Pitch = GFX.Pitch;
Src.Surface = (BYTE*)GFX.Screen;
CheckOverscanOffset();
// avi writing // avi writing
DoAVIVideoFrame(); DoAVIVideoFrame();

2
win32/wsnes9x.h
View File

@ -619,10 +619,12 @@ enum
#define EXT_WIDTH (MAX_SNES_WIDTH + 4) #define EXT_WIDTH (MAX_SNES_WIDTH + 4)
#define EXT_PITCH (EXT_WIDTH * 2) #define EXT_PITCH (EXT_WIDTH * 2)
#define EXT_HEIGHT (MAX_SNES_HEIGHT + 4) #define EXT_HEIGHT (MAX_SNES_HEIGHT + 4)
#define EXT_HEIGHT_WITH_CENTERING (EXT_HEIGHT + 16) // extra lines to center non ext height images
// Offset into buffer to allow a two pixel border around the whole rendered // Offset into buffer to allow a two pixel border around the whole rendered
// SNES image. This is a speed up hack to allow some of the image processing // SNES image. This is a speed up hack to allow some of the image processing
// routines to access black pixel data outside the normal bounds of the buffer. // routines to access black pixel data outside the normal bounds of the buffer.
#define EXT_OFFSET (EXT_PITCH * 2 + 2 * 2) #define EXT_OFFSET (EXT_PITCH * 2 + 2 * 2)
#define EXT_OFFSET_WITH_CENTERING (EXT_OFFSET + EXT_PITCH * 16) // same as above
#define WIN32_WHITE RGB(255,255,255) #define WIN32_WHITE RGB(255,255,255)