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

libretro: Get rid of EndScreenRefreshCallback. 

Just use S9xSyncSpeed, which was there all along.
This commit is contained in:
BearOso 2023-03-20 16:15:15 -05:00
parent 50f9f9eba1
commit 16a45f7b92
3 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gfx.cpp
View File

@ -98,9 +98,6 @@ bool8 S9xGraphicsInit (void)
} }
} }
GFX.EndScreenRefreshCallback = NULL;
GFX.EndScreenRefreshCallbackData = NULL;
return (TRUE); return (TRUE);
} }
@ -110,9 +107,6 @@ void S9xGraphicsDeinit (void)
if (GFX.SubScreen) { free(GFX.SubScreen); GFX.SubScreen = NULL; } if (GFX.SubScreen) { free(GFX.SubScreen); GFX.SubScreen = NULL; }
if (GFX.ZBuffer) { free(GFX.ZBuffer); GFX.ZBuffer = NULL; } if (GFX.ZBuffer) { free(GFX.ZBuffer); GFX.ZBuffer = NULL; }
if (GFX.SubZBuffer) { free(GFX.SubZBuffer); GFX.SubZBuffer = NULL; } if (GFX.SubZBuffer) { free(GFX.SubZBuffer); GFX.SubZBuffer = NULL; }
GFX.EndScreenRefreshCallback = NULL;
GFX.EndScreenRefreshCallbackData = NULL;
} }
void S9xGraphicsScreenResize (void) void S9xGraphicsScreenResize (void)
@ -268,15 +262,6 @@ void S9xEndScreenRefresh (void)
} }
} }
} }
if (GFX.EndScreenRefreshCallback)
GFX.EndScreenRefreshCallback(GFX.EndScreenRefreshCallbackData);
}
void S9xSetEndScreenRefreshCallback(const SGFX::Callback cb, void *const data)
{
GFX.EndScreenRefreshCallback = cb;
GFX.EndScreenRefreshCallbackData = data;
} }
void RenderLine (uint8 C) void RenderLine (uint8 C)

6
gfx.h
View File

@ -11,8 +11,6 @@
struct SGFX struct SGFX
{ {
typedef void (*Callback)(void *);
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;
@ -68,9 +66,6 @@ struct SGFX
std::string InfoString; std::string InfoString;
uint32 InfoStringTimeout; uint32 InfoStringTimeout;
char FrameDisplayString[256]; char FrameDisplayString[256];
Callback EndScreenRefreshCallback;
void *EndScreenRefreshCallbackData;
}; };
struct SBG struct SBG
@ -206,7 +201,6 @@ struct COLOR_SUB
void S9xStartScreenRefresh (void); void S9xStartScreenRefresh (void);
void S9xEndScreenRefresh (void); void S9xEndScreenRefresh (void);
void S9xSetEndScreenRefreshCallback(SGFX::Callback cb, void *data);
void S9xBuildDirectColourMaps (void); void S9xBuildDirectColourMaps (void);
void RenderLine (uint8); void RenderLine (uint8);
void S9xComputeClipWindows (void); void S9xComputeClipWindows (void);

6
libretro/libretro.cpp
View File

@ -749,8 +749,8 @@ static void update_variables(void)
} }
} }
static void S9xEndScreenRefreshCallback(void*) void S9xSyncSpeed() {
{
if (Settings.Mute) { if (Settings.Mute) {
S9xClearSamples(); S9xClearSamples();
return; return;
@ -1371,7 +1371,6 @@ void retro_init(void)
ntsc_screen_buffer = (uint16*) calloc(1, MAX_SNES_WIDTH_NTSC * 2 * (MAX_SNES_HEIGHT + 16)); ntsc_screen_buffer = (uint16*) calloc(1, MAX_SNES_WIDTH_NTSC * 2 * (MAX_SNES_HEIGHT + 16));
snes_ntsc_buffer = ntsc_screen_buffer + (MAX_SNES_WIDTH_NTSC >> 1) * 16; snes_ntsc_buffer = ntsc_screen_buffer + (MAX_SNES_WIDTH_NTSC >> 1) * 16;
S9xGraphicsInit(); S9xGraphicsInit();
S9xSetEndScreenRefreshCallback(S9xEndScreenRefreshCallback, NULL);
S9xInitInputDevices(); S9xInitInputDevices();
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
@ -2082,7 +2081,6 @@ bool8 S9xContinueUpdate(int width, int height)
// Dummy functions that should probably be implemented correctly later. // Dummy functions that should probably be implemented correctly later.
void S9xParsePortConfig(ConfigFile&, int) {} void S9xParsePortConfig(ConfigFile&, int) {}
void S9xSyncSpeed() {}
const char* S9xStringInput(const char* in) { return in; } const char* S9xStringInput(const char* in) { return in; }
#ifdef _WIN32 #ifdef _WIN32