Mesa (19.3): egl: fix _EGL_NATIVE_PLATFORM fallback
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Nov 13 19:28:39 UTC 2019
Module: Mesa
Branch: 19.3
Commit: 3c1b3656b9e13fab42aa40ac554fa8045a076f09
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3c1b3656b9e13fab42aa40ac554fa8045a076f09
Author: Eric Engestrom <eric.engestrom at intel.com>
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: mesa-stable at lists.freedesktop.org
Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
(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 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;
More information about the mesa-commit
mailing list