mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-04 22:20:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request from alphanu1/alphanu1-patch-67

Browse Source 
update
This commit is contained in:
alphanu1 2018-05-25 10:55:54 +01:00 committed by GitHub
commit 9c03f99eb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 16 deletions

4
gfx/video_crt_switch.c

@ -93,9 +93,9 @@ static void crt_screen_setup_aspect(unsigned width, unsigned height)
{ {
/* detect menu only */ /* detect menu only */
if (width < 1920) if (width < 1920)
width = 320; width = 704;
height = 240; height = 480;
crt_aspect_ratio_switch(width, height); crt_aspect_ratio_switch(width, height);
} }

14
gfx/video_driver.c

@ -1014,10 +1014,6 @@ static bool video_driver_init_internal(bool *video_is_threaded)
video.force_aspect = settings->bools.video_force_aspect; video.force_aspect = settings->bools.video_force_aspect;
video.font_enable = settings->bools.video_font_enable; video.font_enable = settings->bools.video_font_enable;
video.swap_interval = settings->uints.video_swap_interval; video.swap_interval = settings->uints.video_swap_interval;
if (video_driver_crt_switching_active)
video.swap_interval = 0;
#ifdef GEKKO #ifdef GEKKO
video.viwidth = settings->uints.video_viwidth; video.viwidth = settings->uints.video_viwidth;
video.vfilter = settings->bools.video_vfilter; video.vfilter = settings->bools.video_vfilter;
@ -2620,12 +2616,6 @@ void video_driver_frame(const void *data, unsigned width,
{ {
video_driver_crt_switching_active = true; video_driver_crt_switching_active = true;
if (height > 300)
current_video_context.swap_interval(video_context_data, 0);
if (height < 300)
current_video_context.swap_interval(video_context_data, 1);
if (video_info.crt_switch_resolution_super == 2560) if (video_info.crt_switch_resolution_super == 2560)
width = 2560; width = 2560;
if (video_info.crt_switch_resolution_super == 3840) if (video_info.crt_switch_resolution_super == 3840)
@ -3193,14 +3183,10 @@ bool video_context_driver_get_video_output_size(gfx_ctx_size_t *size_data)
bool video_context_driver_swap_interval(unsigned *interval) bool video_context_driver_swap_interval(unsigned *interval)
{ {
if (!video_driver_crt_switching_active)
{
if (!current_video_context.swap_interval) if (!current_video_context.swap_interval)
return false; return false;
current_video_context.swap_interval(video_context_data, *interval); current_video_context.swap_interval(video_context_data, *interval);
return true; return true;
}
return true;
} }
bool video_context_driver_get_proc_address(gfx_ctx_proc_address_t *proc) bool video_context_driver_get_proc_address(gfx_ctx_proc_address_t *proc)