diff options
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | docs/egl.html | 2 | ||||
| -rw-r--r-- | src/egl/main/Makefile.am | 4 | ||||
| -rw-r--r-- | src/egl/main/egldisplay.c | 16 | ||||
| -rw-r--r-- | src/egl/main/egldisplay.h | 1 |
5 files changed, 2 insertions, 24 deletions
diff --git a/configure.ac b/configure.ac index b40ea7ff5a8..94e0d879615 100644 --- a/configure.ac +++ b/configure.ac @@ -1781,7 +1781,7 @@ for plat in $egl_platforms; do AC_MSG_ERROR([EGL platform drm requires libdrm >= $LIBDRM_REQUIRED]) ;; - android|fbdev|gdi|null) + android|gdi|null) ;; *) @@ -1810,7 +1810,6 @@ fi AM_CONDITIONAL(HAVE_EGL_PLATFORM_X11, echo "$egl_platforms" | grep -q 'x11') AM_CONDITIONAL(HAVE_EGL_PLATFORM_WAYLAND, echo "$egl_platforms" | grep -q 'wayland') AM_CONDITIONAL(HAVE_EGL_PLATFORM_DRM, echo "$egl_platforms" | grep -q 'drm') -AM_CONDITIONAL(HAVE_EGL_PLATFORM_FBDEV, echo "$egl_platforms" | grep -q 'fbdev') AM_CONDITIONAL(HAVE_EGL_PLATFORM_NULL, echo "$egl_platforms" | grep -q 'null') AM_CONDITIONAL(HAVE_EGL_DRIVER_DRI2, test "x$HAVE_EGL_DRIVER_DRI2" != "x") diff --git a/docs/egl.html b/docs/egl.html index a715a3ad31d..d46181ec279 100644 --- a/docs/egl.html +++ b/docs/egl.html @@ -88,7 +88,7 @@ types such as <code>EGLNativeDisplayType</code> or <code>EGLNativeWindowType</code> defined for.</p> <p>The available platforms are <code>x11</code>, <code>drm</code>, -<code>fbdev</code>, and <code>gdi</code>. The <code>gdi</code> platform can +and <code>gdi</code>. The <code>gdi</code> platform can only be built with SCons. Unless for special needs, the build system should select the right platforms automatically.</p> diff --git a/src/egl/main/Makefile.am b/src/egl/main/Makefile.am index a4db21016e9..893ad266bfe 100644 --- a/src/egl/main/Makefile.am +++ b/src/egl/main/Makefile.am @@ -65,10 +65,6 @@ AM_CFLAGS += -DHAVE_DRM_PLATFORM libEGL_la_LIBADD += ../../gbm/libgbm.la endif -if HAVE_EGL_PLATFORM_FBDEV -AM_CFLAGS += -DHAVE_FBDEV_PLATFORM -endif - if HAVE_EGL_PLATFORM_NULL AM_CFLAGS += -DHAVE_NULL_PLATFORM endif diff --git a/src/egl/main/egldisplay.c b/src/egl/main/egldisplay.c index b7a5b8fb9d9..a3ecba8c41e 100644 --- a/src/egl/main/egldisplay.c +++ b/src/egl/main/egldisplay.c @@ -56,11 +56,6 @@ #ifdef HAVE_DRM_PLATFORM #include <gbm.h> #endif -#ifdef HAVE_FBDEV_PLATFORM -#include <stdint.h> -#include <sys/types.h> -#include <sys/stat.h> -#endif /** @@ -74,7 +69,6 @@ static const struct { { _EGL_PLATFORM_X11, "x11" }, { _EGL_PLATFORM_WAYLAND, "wayland" }, { _EGL_PLATFORM_DRM, "drm" }, - { _EGL_PLATFORM_FBDEV, "fbdev" }, { _EGL_PLATFORM_NULL, "null" }, { _EGL_PLATFORM_ANDROID, "android" }, { _EGL_PLATFORM_HAIKU, "haiku" } @@ -144,19 +138,9 @@ _eglPointerIsDereferencable(void *p) static _EGLPlatformType _eglNativePlatformDetectNativeDisplay(void *nativeDisplay) { -#ifdef HAVE_FBDEV_PLATFORM - struct stat buf; -#endif - if (nativeDisplay == EGL_DEFAULT_DISPLAY) return _EGL_INVALID_PLATFORM; -#ifdef HAVE_FBDEV_PLATFORM - /* fbdev is the only platform that can be a file descriptor. */ - if (fstat((intptr_t) nativeDisplay, &buf) == 0 && S_ISCHR(buf.st_mode)) - return _EGL_PLATFORM_FBDEV; -#endif - if (_eglPointerIsDereferencable(nativeDisplay)) { void *first_pointer = *(void **) nativeDisplay; diff --git a/src/egl/main/egldisplay.h b/src/egl/main/egldisplay.h index 5a845d89962..f8782f917c0 100644 --- a/src/egl/main/egldisplay.h +++ b/src/egl/main/egldisplay.h @@ -44,7 +44,6 @@ enum _egl_platform_type { _EGL_PLATFORM_X11, _EGL_PLATFORM_WAYLAND, _EGL_PLATFORM_DRM, - _EGL_PLATFORM_FBDEV, _EGL_PLATFORM_NULL, _EGL_PLATFORM_ANDROID, _EGL_PLATFORM_HAIKU, |