summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Engestrom <eric.engestrom@intel.com>2019-09-10 17:06:09 +0100
committerDylan Baker <dylan@pnwbakers.com>2019-11-11 11:44:26 -0800
commit3c1b3656b9e13fab42aa40ac554fa8045a076f09 (patch)
tree3c6bd8c066062aefd960daa6b3037d0b27c7ee8e
parent05be7259233443ac71095c174b65d69bd223dbe3 (diff)
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@lists.freedesktop.org Signed-off-by: Eric Engestrom <eric.engestrom@intel.com> Reviewed-by: Marek Olšák <marek.olsak@amd.com> (cherry picked from commit 86d3a346f1576acb6c2f8c3be3853a6a3e226b5c)
-rw-r--r--src/egl/main/egldisplay.c9
1 files changed, 0 insertions, 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;