#include "c11/threads.h"
#include "eglglobals.h"
+#include "egldevice.h"
#include "egldisplay.h"
#include "egldriver.h"
-#include "egllog.h"
+
+#include "util/macros.h"
#ifdef HAVE_MINCORE
#include <unistd.h>
{
.Mutex = &_eglGlobalMutex,
.DisplayList = NULL,
- .NumAtExitCalls = 2,
+ .DeviceList = &_eglSoftwareDevice,
+ .NumAtExitCalls = 3,
.AtExitCalls = {
/* default AtExitCalls, called in reverse order */
- _eglUnloadDrivers, /* always called last */
- _eglFiniDisplay
+ _eglFiniDevice, /* always called last */
+ _eglUnloadDrivers,
+ _eglFiniDisplay,
},
+#if USE_LIBGLVND
.ClientOnlyExtensionString =
+#else
+ .ClientExtensionString =
+#endif
"EGL_EXT_client_extensions"
+ " EGL_EXT_device_base"
+ " EGL_EXT_device_enumeration"
+ " EGL_EXT_device_query"
" EGL_EXT_platform_base"
" EGL_KHR_client_get_all_proc_addresses"
- " EGL_KHR_debug",
+ " EGL_KHR_debug"
+#if USE_LIBGLVND
+ ,
.PlatformExtensionString =
+#else
+ " "
+#endif
+
+ "EGL_EXT_platform_device"
#ifdef HAVE_WAYLAND_PLATFORM
" EGL_EXT_platform_wayland"
+ " EGL_KHR_platform_wayland"
#endif
#ifdef HAVE_X11_PLATFORM
" EGL_EXT_platform_x11"
+ " EGL_KHR_platform_x11"
#endif
#ifdef HAVE_DRM_PLATFORM
" EGL_MESA_platform_gbm"
+ " EGL_KHR_platform_gbm"
#endif
-#ifdef HAVE_SURFACELESS_PLATFORM
" EGL_MESA_platform_surfaceless"
-#endif
"",
- .ClientExtensionString = NULL,
-
.debugCallback = NULL,
.debugTypesEnabled = _EGL_DEBUG_BIT_CRITICAL | _EGL_DEBUG_BIT_ERROR,
};
}
}
-const char *
-_eglGetClientExtensionString(void)
-{
- const char *ret;
-
- mtx_lock(_eglGlobal.Mutex);
-
- if (_eglGlobal.ClientExtensionString == NULL) {
- size_t clientLen = strlen(_eglGlobal.ClientOnlyExtensionString);
- size_t platformLen = strlen(_eglGlobal.PlatformExtensionString);
-
- _eglGlobal.ClientExtensionString = (char *) malloc(clientLen + platformLen + 1);
- if (_eglGlobal.ClientExtensionString != NULL) {
- char *ptr = _eglGlobal.ClientExtensionString;
-
- memcpy(ptr, _eglGlobal.ClientOnlyExtensionString, clientLen);
- ptr += clientLen;
-
- if (platformLen > 0) {
- // Note that if PlatformExtensionString is not empty, then it will
- // already have a leading space.
- assert(_eglGlobal.PlatformExtensionString[0] == ' ');
- memcpy(ptr, _eglGlobal.PlatformExtensionString, platformLen);
- ptr += platformLen;
- }
- *ptr = '\0';
- }
- }
- ret = _eglGlobal.ClientExtensionString;
-
- mtx_unlock(_eglGlobal.Mutex);
- return ret;
-}
-
EGLBoolean
_eglPointerIsDereferencable(void *p)
{
-#ifdef HAVE_MINCORE
uintptr_t addr = (uintptr_t) p;
- unsigned char valid = 0;
const long page_size = getpagesize();
+#ifdef HAVE_MINCORE
+ unsigned char valid = 0;
if (p == NULL)
return EGL_FALSE;
addr &= ~(page_size - 1);
if (mincore((void *) addr, page_size, &valid) < 0) {
- _eglLog(_EGL_DEBUG, "mincore failed: %m");
return EGL_FALSE;
}
*/
return EGL_TRUE;
#else
- return p != NULL;
+ // Without mincore(), we just assume that the first page is unmapped.
+ return addr >= page_size;
#endif
}