libretro/beetle-psx-libretro
1
0
Fork 0
mirror of https://github.com/libretro/beetle-psx-libretro.git synced 2025-02-21 17:31:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up recent changes

Browse Source
This commit is contained in:
ggdrt 2020-03-07 19:33:32 -08:00
parent 0f1e7e6082
commit c346ec3c7a
3 changed files with 19 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
rsx/rsx_intf.h
View File

@ -5,17 +5,24 @@
#define SOUND_FREQUENCY 44100
/* NTSC content on NTSC clock, PAL content on PAL clock.
* Note: Core currently only reports non-interlaced timings
* to avoid possible frontend driver reinits. Core option
* for allowing automatic reporting of timing switches is
* to-be-implemented.
*/
/* NTSC content on NTSC clock, PAL content on PAL clock. */
#define FPS_NTSC_INTERLACED 59.940
#define FPS_NTSC_NONINTERLACED 59.826
#define FPS_PAL_INTERLACED 50.000
#define FPS_PAL_NONINTERLACED 49.761
/* Note: It is possible for the PlayStation GPU to output NTSC
* on PAL GPU clock and vice versa, but this is unsupported in
* Mednafen/Beetle PSX. The values below are provided for
* completion but are not guaranteed to be correct.
*/
#if 0
#define FPS_NTSC_ON_PAL_INTERLACED 59.393
#define FPS_NTSC_ON_PAL_NONINTERLACED 59.280
#define FPS_PAL_ON_NTSC_INTERLACED 50.460
#define FPS_PAL_ON_NTSC_NONINTERLACED 50.219
#endif
enum rsx_renderer_type
{
RSX_SOFTWARE = 0,

19
rsx/rsx_lib_gl.cpp
View File

@ -2290,25 +2290,8 @@ static struct retro_system_av_info get_av_info(VideoClock std)
std ? last_scanline_pal : last_scanline_ntsc,
aspect_ratio_setting, display_vram, widescreen_hack);
info.timing.sample_rate = SOUND_FREQUENCY;
/* Precise FPS values for the video output for the given
* VideoClock. It's actually possible to configure the PlayStation GPU
* to output with NTSC timings with the PAL clock (and vice-versa)
* which would make this code invalid but it wouldn't make a lot of
* sense for a game to do that. */
#if 0
switch (std)
{
case VideoClock_Ntsc:
info.timing.fps = (currently_interlaced ? FPS_NTSC_INTERLACED : FPS_NTSC_NONINTERLACED);
break;
case VideoClock_Pal:
info.timing.fps = (currently_interlaced ? FPS_PAL_INTERLACED : FPS_PAL_NONINTERLACED);
break;
}
#endif
info.timing.fps = rsx_common_get_timing_fps();
info.timing.sample_rate = SOUND_FREQUENCY;
return info;
}

19
rsx/rsx_lib_vulkan.cpp
View File

@ -204,27 +204,18 @@ void rsx_vulkan_get_system_av_info(struct retro_system_av_info *info)
memset(info, 0, sizeof(*info));
// Set retro_game_geometry
info->geometry.base_width = MEDNAFEN_CORE_GEOMETRY_BASE_W;
info->geometry.base_height = MEDNAFEN_CORE_GEOMETRY_BASE_H;
info->geometry.max_width = MEDNAFEN_CORE_GEOMETRY_MAX_W * (super_sampling ? 1 : scaling);
info->geometry.max_height = MEDNAFEN_CORE_GEOMETRY_MAX_H * (super_sampling ? 1 : scaling);
info->timing.sample_rate = SOUND_FREQUENCY;
info->geometry.base_width = MEDNAFEN_CORE_GEOMETRY_BASE_W;
info->geometry.base_height = MEDNAFEN_CORE_GEOMETRY_BASE_H;
info->geometry.max_width = MEDNAFEN_CORE_GEOMETRY_MAX_W * (super_sampling ? 1 : scaling);
info->geometry.max_height = MEDNAFEN_CORE_GEOMETRY_MAX_H * (super_sampling ? 1 : scaling);
info->geometry.aspect_ratio = rsx_common_get_aspect_ratio(content_is_pal, crop_overscan,
content_is_pal ? initial_scanline_pal : initial_scanline,
content_is_pal ? last_scanline_pal : last_scanline,
aspect_ratio_setting, show_vram, widescreen_hack);
// Set retro_system_timing
#if 0
if (content_is_pal)
info->timing.fps = (currently_interlaced ? FPS_PAL_INTERLACED : FPS_PAL_NONINTERLACED);
else
info->timing.fps = (currently_interlaced ? FPS_NTSC_INTERLACED : FPS_NTSC_NONINTERLACED);
#endif
info->timing.fps = rsx_common_get_timing_fps();
info->timing.sample_rate = SOUND_FREQUENCY;
}
void rsx_vulkan_refresh_variables(void)