From 86d3a346f1576acb6c2f8c3be3853a6a3e226b5c Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 10 Sep 2019 17:06:09 +0100 Subject: [PATCH] egl: fix _EGL_NATIVE_PLATFORM fallback MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit When the X11 or Haiku platforms were compiled in, they would bypass the `_EGL_NATIVE_PLATFORM` fallback by always returning themselves instead. Cc: mesa-stable@lists.freedesktop.org Signed-off-by: Eric Engestrom Reviewed-by: Marek Olšák --- src/egl/main/egldisplay.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/egl/main/egldisplay.c b/src/egl/main/egldisplay.c index aea2156cccf..f6e85c79aa9 100644 --- a/src/egl/main/egldisplay.c +++ b/src/egl/main/egldisplay.c @@ -138,15 +138,6 @@ _eglNativePlatformDetectNativeDisplay(void *nativeDisplay) if (first_pointer == gbm_create_device) return _EGL_PLATFORM_DRM; #endif - -#ifdef HAVE_X11_PLATFORM - /* If not matched to any other platform, fallback to x11. */ - return _EGL_PLATFORM_X11; -#endif - -#ifdef HAVE_HAIKU_PLATFORM - return _EGL_PLATFORM_HAIKU; -#endif } return _EGL_INVALID_PLATFORM; -- 2.30.2