Module: Mesa Branch: staging/19.2 Commit: ba12d7cb8d45d5675d10a54fe0186f17cc206a09 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ba12d7cb8d45d5675d10a54fe0186f17cc206a09
Author: Eric Engestrom <[email protected]> Date: Tue Sep 10 17:06:09 2019 +0100 egl: fix _EGL_NATIVE_PLATFORM fallback When the X11 or Haiku platforms were compiled in, they would bypass the `_EGL_NATIVE_PLATFORM` fallback by always returning themselves instead. Cc: [email protected] Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Marek Olšák <[email protected]> (cherry picked from commit 86d3a346f1576acb6c2f8c3be3853a6a3e226b5c) --- 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 05720015c24..86e0084f85d 100644 --- a/src/egl/main/egldisplay.c +++ b/src/egl/main/egldisplay.c @@ -135,15 +135,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; _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
