1
0
mirror of https://github.com/libretro/RetroArch synced 2025-02-24 09:40:07 +00:00

Merge branch 'sdl2-out-of-x' of git://github.com/keithbowes/RetroArch into master

This commit is contained in:
twinaphex 2021-02-01 23:13:17 +01:00
commit 0b08693f9d

@ -440,10 +440,16 @@ static void *sdl2_gfx_init(const video_info_t *video,
#if defined(_WIN32)
sdl2_set_handles(vid->window, RARCH_DISPLAY_WIN32);
#elif defined(HAVE_X11)
sdl2_set_handles(vid->window, RARCH_DISPLAY_X11);
#elif defined(HAVE_COCOA)
sdl2_set_handles(vid->window, RARCH_DISPLAY_OSX);
#else
const char *video_driver = SDL_GetCurrentVideoDriver();
if (strcmp(video_driver, "x11") == 0)
sdl2_set_handles(vid->window, RARCH_DISPLAY_X11);
else if (strcmp(video_driver, "wayland") == 0)
sdl2_set_handles(vid->window, RARCH_DISPLAY_WAYLAND);
else
sdl2_set_handles(vid->window, RARCH_DISPLAY_NONE);
#endif
sdl_refresh_viewport(vid);