From f58f7a59231c6a92212a2d037066e5f0f462e907 Mon Sep 17 00:00:00 2001 From: radius Date: Fri, 23 Sep 2016 22:37:50 -0500 Subject: [PATCH] Revert "Make emscripten_egl default context for emscripten" fixes gamepad support. It seems it only works when we use the SDL2 video context This reverts commit 1177edf8254300fe57aec543c7658b92b2876678. --- gfx/video_context_driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gfx/video_context_driver.c b/gfx/video_context_driver.c index 7bc91ccac4..83cf7befbb 100644 --- a/gfx/video_context_driver.c +++ b/gfx/video_context_driver.c @@ -76,15 +76,15 @@ static const gfx_ctx_driver_t *gfx_ctx_drivers[] = { #if defined(__APPLE__) && !defined(TARGET_IPHONE_SIMULATOR) && !defined(TARGET_OS_IPHONE) &gfx_ctx_cgl, #endif -#ifdef EMSCRIPTEN - &gfx_ctx_emscripten, -#endif #if (defined(HAVE_SDL) || defined(HAVE_SDL2)) && defined(HAVE_OPENGL) &gfx_ctx_sdl_gl, #endif #ifdef HAVE_OSMESA &gfx_ctx_osmesa, #endif +#ifdef EMSCRIPTEN + &gfx_ctx_emscripten, +#endif #if defined(HAVE_VULKAN) && defined(HAVE_VULKAN_DISPLAY) &gfx_ctx_khr_display, #endif