xserver: Branch 'server-1.20-branch' - 2 commits

[GitLab Mirror]

 configure.ac                                     |    4 ++++
 hw/xfree86/drivers/modesetting/drmmode_display.c |    1 +
 include/dix-config.h.in                          |    3 +++
 3 files changed, 8 insertions(+)

New commits:
commit c2ef88c4d3a551ff7646bfb86550cae32b02a510
Author: Michel Dänzer <mdaenzer at redhat.com>
Date:   Tue Jan 14 09:23:34 2020 +0100

    modesetting: Explicitly #include "mi.h"
    
    For the miClearDrawable prototype. Apparently it doesn't get pulled in
    for some build configurations, breaking the build.
    
    Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
    (cherry picked from commit a24a786fc8490fda08b15c3dab6fa6750f008ecb)

diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
index e18cc379f..3874f6e21 100644
--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
@@ -36,6 +36,7 @@
 #include "dumb_bo.h"
 #include "xf86str.h"
 #include "X11/Xatom.h"
+#include "mi.h"
 #include "micmap.h"
 #include "xf86cmap.h"
 #include "xf86DDC.h"
commit ad7364d8d7f936b9b08195e47d2f6ee9329ff687
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>
    (cherry picked from commit 25ca99df38a2c28c25ab20a917e68442285f2353)

diff --git a/configure.ac b/configure.ac
index 9f82e2a7d..231515f0c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2053,6 +2053,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 c18f62370..d02bb1b81 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -485,6 +485,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