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

Cleanups

Browse Source
This commit is contained in:
twinaphex 2018-04-16 04:35:23 +02:00
parent d46011ae14
commit ec2267daa6
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gfx/video_crt_switch.c
View File

@ -55,6 +55,7 @@ static void crt_check_first_run(void)
orig_height = GetSystemMetrics(SM_CYSCREEN); orig_height = GetSystemMetrics(SM_CYSCREEN);
orig_width = GetSystemMetrics(SM_CXSCREEN); orig_width = GetSystemMetrics(SM_CXSCREEN);
#endif #endif
first_run = false; first_run = false;
} }
@ -185,6 +186,11 @@ void crt_switch_res_core(unsigned width, unsigned height, float hz)
void crt_video_restore(void) void crt_video_restore(void)
{ {
if (first_run)
return;
video_display_server_switch_resolution(orig_width, orig_height, video_display_server_switch_resolution(orig_width, orig_height,
0, 60); 0, 60);
first_run = true;
} }

7
gfx/video_driver.c
View File

@ -144,7 +144,6 @@ static void *video_driver_state_buffer = NULL;
static unsigned video_driver_state_scale = 0; static unsigned video_driver_state_scale = 0;
static unsigned video_driver_state_out_bpp = 0; static unsigned video_driver_state_out_bpp = 0;
static bool video_driver_state_out_rgb32 = false; static bool video_driver_state_out_rgb32 = false;
static bool video_driver_crt_switched = false;
static bool video_driver_crt_switching_active = false; static bool video_driver_crt_switching_active = false;
static struct retro_system_av_info video_driver_av_info; static struct retro_system_av_info video_driver_av_info;
@ -1572,12 +1571,7 @@ static void video_driver_lock_new(void)
void video_driver_destroy(void) void video_driver_destroy(void)
{ {
video_display_server_destroy(); video_display_server_destroy();
if (video_driver_crt_switched)
{
crt_video_restore(); crt_video_restore();
video_driver_crt_switched = false;
}
video_driver_cb_has_focus = null_driver_has_focus; video_driver_cb_has_focus = null_driver_has_focus;
video_driver_use_rgba = false; video_driver_use_rgba = false;
@ -2606,7 +2600,6 @@ void video_driver_frame(const void *data, unsigned width,
/* trigger set resolution*/ /* trigger set resolution*/
if (video_info.crt_switch_resolution) if (video_info.crt_switch_resolution)
{ {
video_driver_crt_switched = true;
video_driver_crt_switching_active = true; video_driver_crt_switching_active = true;
if (video_info.crt_switch_resolution_super == 2560) if (video_info.crt_switch_resolution_super == 2560)