xf86-video-intel: 2 commits - configure.ac src/uxa/intel.h

[Chris Wilson]

 configure.ac    |   14 ++++++++++----
 src/uxa/intel.h |    3 +++
 2 files changed, 13 insertions(+), 4 deletions(-)

New commits:
commit 067115a51b2646538a38ba603c688233c61e23cd
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Sep 15 08:44:41 2014 +0100

    uxa: Stub out intel_sync_init|fini when not compiled in
    
    In order to fix the build without DRI3, we need to stub out the
    functions not compiled in, such as intel_sync_fini().
    
    Reported-by: Sedat Dilek <sedat.dilek at gmail.com>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/uxa/intel.h b/src/uxa/intel.h
index 52de980..3a1641f 100644
--- a/src/uxa/intel.h
+++ b/src/uxa/intel.h
@@ -516,6 +516,9 @@ intel_pixmap_pitch(PixmapPtr pixmap)
 #if HAVE_DRI3
 Bool intel_sync_init(ScreenPtr screen);
 void intel_sync_close(ScreenPtr screen);
+#else
+static inline Bool intel_sync_init(ScreenPtr screen) { return 0; }
+static inline void intel_sync_close(ScreenPtr screen) { }
 #endif
 
 /*
commit 0d451ee3891d87268322dc3b72b487fdd2fbade6
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Sep 15 08:15:04 2014 +0100

    configure: Require the presence of xorg/glamor.h for --enable-glamor
    
    Check that we have the required Xorg headers for glamor if the user
    requests --enable-glamor. There is a possiblity that the headers
    mismatch as they don't have internal versioning, but this should catch
    the majority of errors early on.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/configure.ac b/configure.ac
index 0191bd5..8b34c77 100644
--- a/configure.ac
+++ b/configure.ac
@@ -424,6 +424,9 @@ if test "x$UXA" != "xno"; then
 	UXA=yes
 fi
 
+PKG_CHECK_MODULES(XORG, [xorg-server >= $required_xorg_server_version xproto fontsproto pixman-1 >= $required_pixman_version $REQUIRED_MODULES])
+ABI_VERSION=`$PKG_CONFIG --variable=abi_videodrv xorg-server`
+
 AC_ARG_ENABLE(glamor,
 	      AS_HELP_STRING([--enable-glamor],
 			     [Enable glamor, a new GL-based acceleration [default=no]]),
@@ -434,7 +437,13 @@ if test "x$GLAMOR" != "xno"; then
 		AC_MSG_ERROR([Glamor acceleration requested but UXA is not enabled])
 	fi
 	if pkg-config --exists "xorg-server >= 1.15.99.901"; then
-		GLAMOR="yes (using Xorg glamor module)"
+		save_CPPFLAGS=$CPPFLAGS
+		CPPFLAGS="$XORG_CFLAGS"
+		AC_CHECK_HEADER([glamor.h],
+				[GLAMOR="yes (using Xorg glamor module)"],
+				[test "x$GLAMOR" != "xauto" && AC_MSG_ERROR("failed to find required Xorg headers for glamor")
+				GLAMOR="no"], [#include <xorg-server.h>])
+		CPPFLAGS=$save_CPPFLAGS
 	else
 		PKG_CHECK_MODULES(LIBGLAMOR, [glamor >= 0.6.0])
 		PKG_CHECK_MODULES(LIBGLAMOR_EGL, [glamor-egl])
@@ -443,9 +452,6 @@ if test "x$GLAMOR" != "xno"; then
 	AC_DEFINE(USE_GLAMOR, 1, [Enable glamor acceleration])
 fi
 
-PKG_CHECK_MODULES(XORG, [xorg-server >= $required_xorg_server_version xproto fontsproto pixman-1 >= $required_pixman_version $REQUIRED_MODULES])
-ABI_VERSION=`$PKG_CONFIG --variable=abi_videodrv xorg-server`
-
 if test "x$ONLY_UMS" = "xyes"; then
 	UMS="yes"
 	KMS="no"