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

Remove Settings.SupportHires 

There's no point in disabling it at this point, so it's always supported.
This commit is contained in:
BearOso 2022-04-13 15:06:13 -05:00
parent 7cbe92afa0
commit 1085ed6fad
11 changed files with 28 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
gfx.cpp
View File

@ -123,7 +123,7 @@ void S9xGraphicsScreenResize (void)
IPPU.InterlaceOBJ = Memory.FillRAM[0x2133] & 2; IPPU.InterlaceOBJ = Memory.FillRAM[0x2133] & 2;
IPPU.PseudoHires = Memory.FillRAM[0x2133] & 8; IPPU.PseudoHires = Memory.FillRAM[0x2133] & 8;
if (Settings.SupportHiRes && (PPU.BGMode == 5 || PPU.BGMode == 6 || IPPU.PseudoHires)) if (PPU.BGMode == 5 || PPU.BGMode == 6 || IPPU.PseudoHires)
{ {
IPPU.DoubleWidthPixels = TRUE; IPPU.DoubleWidthPixels = TRUE;
IPPU.RenderedScreenWidth = SNES_WIDTH << 1; IPPU.RenderedScreenWidth = SNES_WIDTH << 1;
@ -134,7 +134,7 @@ void S9xGraphicsScreenResize (void)
IPPU.RenderedScreenWidth = SNES_WIDTH; IPPU.RenderedScreenWidth = SNES_WIDTH;
} }
if (Settings.SupportHiRes && IPPU.Interlace) if (IPPU.Interlace)
{ {
GFX.PPL = GFX.RealPPL << 1; GFX.PPL = GFX.RealPPL << 1;
IPPU.DoubleHeightPixels = TRUE; IPPU.DoubleHeightPixels = TRUE;
@ -472,34 +472,31 @@ void S9xUpdateScreen (void)
PPU.RecomputeClipWindows = FALSE; PPU.RecomputeClipWindows = FALSE;
} }
if (Settings.SupportHiRes) if (!IPPU.DoubleWidthPixels && (PPU.BGMode == 5 || PPU.BGMode == 6 || IPPU.PseudoHires))
{ {
if (!IPPU.DoubleWidthPixels && (PPU.BGMode == 5 || PPU.BGMode == 6 || IPPU.PseudoHires)) // Have to back out of the regular speed hack
for (uint32 y = 0; y < GFX.StartY; y++)
{ {
// Have to back out of the regular speed hack uint16 *p = GFX.Screen + y * GFX.PPL + 255;
for (uint32 y = 0; y < GFX.StartY; y++) uint16 *q = GFX.Screen + y * GFX.PPL + 510;
{
uint16 *p = GFX.Screen + y * GFX.PPL + 255;
uint16 *q = GFX.Screen + y * GFX.PPL + 510;
for (int x = 255; x >= 0; x--, p--, q -= 2) for (int x = 255; x >= 0; x--, p--, q -= 2)
*q = *(q + 1) = *p; *q = *(q + 1) = *p;
}
IPPU.DoubleWidthPixels = TRUE;
IPPU.RenderedScreenWidth = 512;
} }
if (!IPPU.DoubleHeightPixels && IPPU.Interlace && (PPU.BGMode == 5 || PPU.BGMode == 6)) IPPU.DoubleWidthPixels = TRUE;
{ IPPU.RenderedScreenWidth = 512;
IPPU.DoubleHeightPixels = TRUE; }
IPPU.RenderedScreenHeight = PPU.ScreenHeight << 1;
GFX.PPL = GFX.RealPPL << 1;
GFX.DoInterlace = 2;
for (int32 y = (int32) GFX.StartY - 2; y >= 0; y--) if (!IPPU.DoubleHeightPixels && IPPU.Interlace && (PPU.BGMode == 5 || PPU.BGMode == 6))
memmove(GFX.Screen + (y + 1) * GFX.PPL, GFX.Screen + y * GFX.RealPPL, GFX.PPL * sizeof(uint16)); {
} IPPU.DoubleHeightPixels = TRUE;
IPPU.RenderedScreenHeight = PPU.ScreenHeight << 1;
GFX.PPL = GFX.RealPPL << 1;
GFX.DoInterlace = 2;
for (int32 y = (int32) GFX.StartY - 2; y >= 0; y--)
memmove(GFX.Screen + (y + 1) * GFX.PPL, GFX.Screen + y * GFX.RealPPL, GFX.PPL * sizeof(uint16));
} }
if ((Memory.FillRAM[0x2130] & 0x30) != 0x30 && (Memory.FillRAM[0x2131] & 0x3f)) if ((Memory.FillRAM[0x2130] & 0x30) != 0x30 && (Memory.FillRAM[0x2131] & 0x3f))

2
gfx.h
View File

@ -16,7 +16,7 @@ struct SGFX
const uint32 Pitch = sizeof(uint16) * MAX_SNES_WIDTH; const uint32 Pitch = sizeof(uint16) * MAX_SNES_WIDTH;
const uint32 RealPPL = MAX_SNES_WIDTH; // true PPL of Screen buffer const uint32 RealPPL = MAX_SNES_WIDTH; // true PPL of Screen buffer
const uint32 ScreenSize = MAX_SNES_WIDTH * MAX_SNES_HEIGHT; const uint32 ScreenSize = MAX_SNES_WIDTH * MAX_SNES_HEIGHT;
uint16 ScreenBuffer[512 * (478 + 64)]; uint16 ScreenBuffer[MAX_SNES_WIDTH * (MAX_SNES_HEIGHT + 64)];
uint16 *Screen; uint16 *Screen;
uint16 *SubScreen; uint16 *SubScreen;
uint8 *ZBuffer; uint8 *ZBuffer;

1
gtk/src/gtk_config.cpp
View File

@ -177,7 +177,6 @@ int Snes9xConfig::load_defaults()
Settings.StopEmulation = true; Settings.StopEmulation = true;
Settings.FrameTimeNTSC = 16639; Settings.FrameTimeNTSC = 16639;
Settings.FrameTimePAL = 20000; Settings.FrameTimePAL = 20000;
Settings.SupportHiRes = true;
Settings.FrameTime = Settings.FrameTimeNTSC; Settings.FrameTime = Settings.FrameTimeNTSC;
Settings.BlockInvalidVRAMAccessMaster = true; Settings.BlockInvalidVRAMAccessMaster = true;
Settings.SoundSync = false; Settings.SoundSync = false;

1
gtk/src/gtk_display.cpp
View File

@ -1624,7 +1624,6 @@ static void S9xGTKDisplayString(const char *string, int linesFromBottom,
void S9xInitDisplay(int argc, char **argv) void S9xInitDisplay(int argc, char **argv)
{ {
Settings.SupportHiRes = true;
S9xBlit2xSaIFilterInit(); S9xBlit2xSaIFilterInit();
#ifdef USE_HQ2X #ifdef USE_HQ2X
S9xBlitHQ2xFilterInit(); S9xBlitHQ2xFilterInit();

5
libretro/libretro.cpp
View File

@ -372,10 +372,6 @@ static void update_variables(void)
var.value=NULL; var.value=NULL;
Settings.Transparency=!(environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && !strcmp("disabled", var.value)); Settings.Transparency=!(environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && !strcmp("disabled", var.value));
var.key="snes9x_gfx_hires";
var.value=NULL;
Settings.SupportHiRes=!(environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && !strcmp("disabled", var.value));
var.key="snes9x_audio_interpolation"; var.key="snes9x_audio_interpolation";
var.value=NULL; var.value=NULL;
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
@ -1344,7 +1340,6 @@ void retro_init(void)
Settings.Stereo = TRUE; Settings.Stereo = TRUE;
Settings.SoundPlaybackRate = 32040; Settings.SoundPlaybackRate = 32040;
Settings.SoundInputRate = 32040; Settings.SoundInputRate = 32040;
Settings.SupportHiRes = TRUE;
Settings.Transparency = TRUE; Settings.Transparency = TRUE;
Settings.AutoDisplayMessages = TRUE; Settings.AutoDisplayMessages = TRUE;
Settings.InitialInfoStringTimeout = 120; Settings.InitialInfoStringTimeout = 120;

1
macosx/mac-os.mm
View File

@ -2508,7 +2508,6 @@ static void Initialize (void)
Settings.Stereo = true; Settings.Stereo = true;
Settings.SoundPlaybackRate = 32000; Settings.SoundPlaybackRate = 32000;
Settings.SoundInputRate = 31950; Settings.SoundInputRate = 31950;
Settings.SupportHiRes = true;
Settings.Transparency = true; Settings.Transparency = true;
Settings.AutoDisplayMessages = true; Settings.AutoDisplayMessages = true;
Settings.InitialInfoStringTimeout = 120; Settings.InitialInfoStringTimeout = 120;

12
snapshot.cpp
View File

@ -1754,11 +1754,11 @@ int S9xUnfreezeFromStream (STREAM stream)
UnfreezeStructFromCopy(ssi, SnapScreenshot, COUNT(SnapScreenshot), local_screenshot, version); UnfreezeStructFromCopy(ssi, SnapScreenshot, COUNT(SnapScreenshot), local_screenshot, version);
IPPU.RenderedScreenWidth = min(ssi->Width, IMAGE_WIDTH); IPPU.RenderedScreenWidth = min(ssi->Width, MAX_SNES_WIDTH);
IPPU.RenderedScreenHeight = min(ssi->Height, IMAGE_HEIGHT); IPPU.RenderedScreenHeight = min(ssi->Height, MAX_SNES_HEIGHT);
const bool8 scaleDownX = IPPU.RenderedScreenWidth < ssi->Width; const bool8 scaleDownX = IPPU.RenderedScreenWidth < ssi->Width;
const bool8 scaleDownY = IPPU.RenderedScreenHeight < ssi->Height && ssi->Height > SNES_HEIGHT_EXTENDED; const bool8 scaleDownY = IPPU.RenderedScreenHeight < ssi->Height && ssi->Height > SNES_HEIGHT_EXTENDED;
GFX.DoInterlace = Settings.SupportHiRes ? ssi->Interlaced : 0; GFX.DoInterlace = ssi->Interlaced;
uint8 *rowpix = ssi->Data; uint8 *rowpix = ssi->Data;
uint16 *screen = GFX.Screen; uint16 *screen = GFX.Screen;
@ -1795,7 +1795,7 @@ int S9xUnfreezeFromStream (STREAM stream)
} }
// black out what we might have missed // black out what we might have missed
for (uint32 y = IPPU.RenderedScreenHeight; y < (uint32) (IMAGE_HEIGHT); y++) for (uint32 y = IPPU.RenderedScreenHeight; y < (uint32) (MAX_SNES_HEIGHT); y++)
memset(GFX.Screen + y * GFX.RealPPL, 0, GFX.RealPPL * 2); memset(GFX.Screen + y * GFX.RealPPL, 0, GFX.RealPPL * 2);
delete ssi; delete ssi;
@ -1893,8 +1893,8 @@ int S9xUnfreezeScreenshotFromStream(STREAM stream, uint16 **image_buffer, int &w
UnfreezeStructFromCopy(ssi, SnapScreenshot, COUNT(SnapScreenshot), local_screenshot, version); UnfreezeStructFromCopy(ssi, SnapScreenshot, COUNT(SnapScreenshot), local_screenshot, version);
width = min(ssi->Width, IMAGE_WIDTH); width = min(ssi->Width, MAX_SNES_WIDTH);
height = min(ssi->Height, IMAGE_HEIGHT); height = min(ssi->Height, MAX_SNES_HEIGHT);
*image_buffer = (uint16 *)malloc(width * height * sizeof(uint16)); *image_buffer = (uint16 *)malloc(width * height * sizeof(uint16));

4
snes9x.cpp
View File

@ -247,7 +247,6 @@ void S9xLoadConfigFiles (char **argv, int argc)
// Display // Display
Settings.SupportHiRes = conf.GetBool("Display::HiRes", true);
Settings.Transparency = conf.GetBool("Display::Transparency", true); Settings.Transparency = conf.GetBool("Display::Transparency", true);
Settings.DisableGraphicWindows = !conf.GetBool("Display::GraphicWindows", true); Settings.DisableGraphicWindows = !conf.GetBool("Display::GraphicWindows", true);
Settings.DisplayTime = conf.GetBool("Display::DisplayTime", false); Settings.DisplayTime = conf.GetBool("Display::DisplayTime", false);
@ -550,9 +549,6 @@ char * S9xParseArgs (char **argv, int argc)
if (!strcasecmp(argv[i], "-displaykeypress")) if (!strcasecmp(argv[i], "-displaykeypress"))
Settings.DisplayPressedKeys = TRUE; Settings.DisplayPressedKeys = TRUE;
else else
if (!strcasecmp(argv[i], "-nohires"))
Settings.SupportHiRes = FALSE;
else
if (!strcasecmp(argv[i], "-notransparency")) if (!strcasecmp(argv[i], "-notransparency"))
Settings.Transparency = FALSE; Settings.Transparency = FALSE;
else else

3
snes9x.h
View File

@ -58,8 +58,6 @@
#define SNES_HEIGHT_EXTENDED 239 #define SNES_HEIGHT_EXTENDED 239
#define MAX_SNES_WIDTH (SNES_WIDTH * 2) #define MAX_SNES_WIDTH (SNES_WIDTH * 2)
#define MAX_SNES_HEIGHT (SNES_HEIGHT_EXTENDED * 2) #define MAX_SNES_HEIGHT (SNES_HEIGHT_EXTENDED * 2)
#define IMAGE_WIDTH (Settings.SupportHiRes ? MAX_SNES_WIDTH : SNES_WIDTH)
#define IMAGE_HEIGHT (Settings.SupportHiRes ? MAX_SNES_HEIGHT : SNES_HEIGHT_EXTENDED)
#define NTSC_MASTER_CLOCK 21477272.727272 // 21477272 + 8/11 exact #define NTSC_MASTER_CLOCK 21477272.727272 // 21477272 + 8/11 exact
#define PAL_MASTER_CLOCK 21281370.0 #define PAL_MASTER_CLOCK 21281370.0
@ -242,7 +240,6 @@ struct SSettings
int32 DynamicRateLimit; /* Multiplied by 1000 */ int32 DynamicRateLimit; /* Multiplied by 1000 */
int32 InterpolationMethod; int32 InterpolationMethod;
bool8 SupportHiRes;
bool8 Transparency; bool8 Transparency;
uint8 BG_Forced; uint8 BG_Forced;
bool8 DisableGraphicWindows; bool8 DisableGraphicWindows;

1
unix/unix.cpp
View File

@ -1648,7 +1648,6 @@ int main (int argc, char **argv)
Settings.Stereo = TRUE; Settings.Stereo = TRUE;
Settings.SoundPlaybackRate = 48000; Settings.SoundPlaybackRate = 48000;
Settings.SoundInputRate = 31950; Settings.SoundInputRate = 31950;
Settings.SupportHiRes = TRUE;
Settings.Transparency = TRUE; Settings.Transparency = TRUE;
Settings.AutoDisplayMessages = TRUE; Settings.AutoDisplayMessages = TRUE;
Settings.InitialInfoStringTimeout = 120; Settings.InitialInfoStringTimeout = 120;

2
win32/wconfig.cpp
View File

@ -104,8 +104,6 @@ void WinSetDefaultValues ()
// CPU options // CPU options
Settings.Paused = false; Settings.Paused = false;
Settings.SupportHiRes = true;
#ifdef NETPLAY_SUPPORT #ifdef NETPLAY_SUPPORT
Settings.Port = 1996; Settings.Port = 1996;
NetPlay.MaxFrameSkip = 10; NetPlay.MaxFrameSkip = 10;