xserver: Branch 'master'

[GitLab Mirror]

 configure.ac            |    4 ++++
 include/dix-config.h.in |    3 +++
 2 files changed, 7 insertions(+)

New commits:
commit 25ca99df38a2c28c25ab20a917e68442285f2353
Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Mon Jan 13 23:34:49 2020 -0800

    configure: Define GLAMOR_HAS_EGL_QUERY_DRIVER when available
    
    Commit 195c2ef8f9f07b9bdabc0f554a9033b7857b99c7 added this to the Meson
    build but neglected to add it to autotools.
    
    v2: Also update dix-config.h.in
    
    Fixes: 195c2ef8f ("glamor: Add a function to get the driver name via EGL_MESA_query_driver")
    
    Reviewed-by: Michel Dänzer <mdaenzer at redhat.com> [v1]
    Reviewed-by: Eric Engestrom <eric at engestrom.ch> [v1]
    Reviewed-by: Matt Turner <mattst88 at gmail.com>

diff --git a/configure.ac b/configure.ac
index 56f1164d8..c789c6a49 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2039,6 +2039,10 @@ if test "x$GLAMOR" = xyes; then
 			 [AC_DEFINE(GLAMOR_HAS_EGL_QUERY_DMABUF, 1, [Have GLAMOR_HAS_EGL_QUERY_DMABUF])],
 			 [])
 
+	PKG_CHECK_EXISTS(epoxy >= 1.5.4,
+			 [AC_DEFINE(GLAMOR_HAS_EGL_QUERY_DRIVER, 1, [Have GLAMOR_HAS_EGL_QUERY_DRIVER])],
+			 [])
+
 	PKG_CHECK_MODULES(GBM, "$LIBGBM", [GBM=yes], [GBM=no])
 	if test "x$GBM" = xyes; then
 		AC_DEFINE(GLAMOR_HAS_GBM, 1,
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index 1f91d2709..ca8ac8763 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -479,6 +479,9 @@
 /* Glamor can use eglQueryDmaBuf* functions */
 #undef GLAMOR_HAS_EGL_QUERY_DMABUF
 
+/* Glamor can use EGL_MESA_query_driver functions */
+#undef GLAMOR_HAS_EGL_QUERY_DRIVER
+
 /* byte order */
 #undef X_BYTE_ORDER