OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

egl/main: drop platform fbdev specific code

Browse Source 
st/egl was the only one which had support for this platform.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Emil Velikov
2015-03-14 22:36:28 +00:00
parent 65a8d4d6dd
commit 0d6e7620f3
5 changed files with 2 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@@ -1781,7 +1781,7 @@ for plat in $egl_platforms; do
AC_MSG_ERROR([EGL platform drm requires libdrm >= $LIBDRM_REQUIRED]) 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_X11, echo "$egl_platforms" | grep -q 'x11')
AM_CONDITIONAL(HAVE_EGL_PLATFORM_WAYLAND, echo "$egl_platforms" | grep -q 'wayland') 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_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_PLATFORM_NULL, echo "$egl_platforms" | grep -q 'null')
AM_CONDITIONAL(HAVE_EGL_DRIVER_DRI2, test "x$HAVE_EGL_DRIVER_DRI2" != "x") AM_CONDITIONAL(HAVE_EGL_DRIVER_DRI2, test "x$HAVE_EGL_DRIVER_DRI2" != "x")

2
docs/egl.html
View File

@@ -88,7 +88,7 @@ types such as <code>EGLNativeDisplayType</code> or
<code>EGLNativeWindowType</code> defined for.</p> <code>EGLNativeWindowType</code> defined for.</p>
<p>The available platforms are <code>x11</code>, <code>drm</code>, <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 only be built with SCons. Unless for special needs, the build system should
select the right platforms automatically.</p> select the right platforms automatically.</p>

4
src/egl/main/Makefile.am
View File

@@ -65,10 +65,6 @@ AM_CFLAGS += -DHAVE_DRM_PLATFORM
libEGL_la_LIBADD += ../../gbm/libgbm.la libEGL_la_LIBADD += ../../gbm/libgbm.la
endif endif
if HAVE_EGL_PLATFORM_FBDEV
AM_CFLAGS += -DHAVE_FBDEV_PLATFORM
endif
if HAVE_EGL_PLATFORM_NULL if HAVE_EGL_PLATFORM_NULL
AM_CFLAGS += -DHAVE_NULL_PLATFORM AM_CFLAGS += -DHAVE_NULL_PLATFORM
endif endif

16
src/egl/main/egldisplay.c
View File

@@ -56,11 +56,6 @@
#ifdef HAVE_DRM_PLATFORM #ifdef HAVE_DRM_PLATFORM
#include <gbm.h> #include <gbm.h>
#endif #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_X11, "x11" },
{ _EGL_PLATFORM_WAYLAND, "wayland" }, { _EGL_PLATFORM_WAYLAND, "wayland" },
{ _EGL_PLATFORM_DRM, "drm" }, { _EGL_PLATFORM_DRM, "drm" },
{ _EGL_PLATFORM_FBDEV, "fbdev" },
{ _EGL_PLATFORM_NULL, "null" }, { _EGL_PLATFORM_NULL, "null" },
{ _EGL_PLATFORM_ANDROID, "android" }, { _EGL_PLATFORM_ANDROID, "android" },
{ _EGL_PLATFORM_HAIKU, "haiku" } { _EGL_PLATFORM_HAIKU, "haiku" }
@@ -144,19 +138,9 @@ _eglPointerIsDereferencable(void *p)
static _EGLPlatformType static _EGLPlatformType
_eglNativePlatformDetectNativeDisplay(void *nativeDisplay) _eglNativePlatformDetectNativeDisplay(void *nativeDisplay)
{ {
#ifdef HAVE_FBDEV_PLATFORM
struct stat buf;
#endif
if (nativeDisplay == EGL_DEFAULT_DISPLAY) if (nativeDisplay == EGL_DEFAULT_DISPLAY)
return _EGL_INVALID_PLATFORM; 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)) { if (_eglPointerIsDereferencable(nativeDisplay)) {
void *first_pointer = *(void **) nativeDisplay; void *first_pointer = *(void **) nativeDisplay;

1
src/egl/main/egldisplay.h
View File

@@ -44,7 +44,6 @@ enum _egl_platform_type {
_EGL_PLATFORM_X11, _EGL_PLATFORM_X11,
_EGL_PLATFORM_WAYLAND, _EGL_PLATFORM_WAYLAND,
_EGL_PLATFORM_DRM, _EGL_PLATFORM_DRM,
_EGL_PLATFORM_FBDEV,
_EGL_PLATFORM_NULL, _EGL_PLATFORM_NULL,
_EGL_PLATFORM_ANDROID, _EGL_PLATFORM_ANDROID,
_EGL_PLATFORM_HAIKU, _EGL_PLATFORM_HAIKU,