Module Name: xsrc
Committed By: mrg
Date: Tue Apr 16 21:34:44 UTC 2019
Modified Files:
xsrc/external/mit/libepoxy/dist/src: dispatch_common.h
xsrc/external/mit/xorg-server/include: dix-config.h
Log Message:
- enable EGL on x86/arm64 (XXX also do evbarm32)
- enable gbm/glamor in the server.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/libepoxy/dist/src/dispatch_common.h
cvs rdiff -u -r1.33 -r1.34 xsrc/external/mit/xorg-server/include/dix-config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libepoxy/dist/src/dispatch_common.h
diff -u xsrc/external/mit/libepoxy/dist/src/dispatch_common.h:1.2 xsrc/external/mit/libepoxy/dist/src/dispatch_common.h:1.3
--- xsrc/external/mit/libepoxy/dist/src/dispatch_common.h:1.2 Thu Aug 18 03:26:04 2016
+++ xsrc/external/mit/libepoxy/dist/src/dispatch_common.h Tue Apr 16 21:34:44 2019
@@ -39,8 +39,12 @@
#define PLATFORM_HAS_WGL 0
#define EPOXY_IMPORTEXPORT
#else
-#ifdef __NetBSD__ /* XXX enable egl in xsrc */
-#define PLATFORM_HAS_EGL 0
+#ifdef __NetBSD__
+# if defined(__amd64__) || defined(__i386__) || defined(__aarch64__) // XXX evbarm32
+# define PLATFORM_HAS_EGL 1
+# else
+# define PLATFORM_HAS_EGL 0
+# endif
#else
#define PLATFORM_HAS_EGL 1
#endif
Index: xsrc/external/mit/xorg-server/include/dix-config.h
diff -u xsrc/external/mit/xorg-server/include/dix-config.h:1.33 xsrc/external/mit/xorg-server/include/dix-config.h:1.34
--- xsrc/external/mit/xorg-server/include/dix-config.h:1.33 Sun Mar 3 22:01:09 2019
+++ xsrc/external/mit/xorg-server/include/dix-config.h Tue Apr 16 21:34:44 2019
@@ -488,10 +488,8 @@
/* Build GLAMOR */
#define GLAMOR 1
-#if 0
/* Build glamor's GBM-based EGL support */
#define GLAMOR_HAS_GBM 1
-#endif
/* Build glamor/gbm has linear support */
#define GLAMOR_HAS_GBM_LINEAR 1
