Merge branch 'master' into pr/old-mesa

configure.ac

@@ -119,18 +119,6 @@ AC_ARG_ENABLE(glamor,
 
 if test "x$GLAMOR" != "xno"; then
 	AC_CHECK_HEADERS([glamor.h], [GLAMOR_H="yes"], [GLAMOR_H="no"], [#include "xorg-server.h"])
-
-	if test "x$GLAMOR_H" = xyes; then
-		AC_CHECK_DECL(GLAMOR_NO_DRI3,
-			      [GLAMOR_XSERVER="yes"], [GLAMOR_XSERVER="no"],
-			      [#include "xorg-server.h"
-			       #include "glamor.h"])
-	fi
-
-	if test "x$GLAMOR_XSERVER" != xyes; then
-		PKG_CHECK_MODULES(LIBGLAMOR, [glamor >= 0.6.0])
-		PKG_CHECK_MODULES(LIBGLAMOR_EGL, [glamor-egl])
-	fi
 	AC_DEFINE(USE_GLAMOR, 1, [Enable glamor acceleration])
 else
 	AC_MSG_RESULT([$GLAMOR])

src/Makefile.am

@@ -49,8 +49,6 @@ amdgpu_drv_la_SOURCES = \
 	amdgpu_misc.c amdgpu_probe.c \
 	$(AMDGPU_KMS_SRCS)
 
-AM_CFLAGS += @LIBGLAMOR_CFLAGS@
-amdgpu_drv_la_LIBADD += @LIBGLAMOR_LIBS@
 amdgpu_drv_la_SOURCES += \
 	amdgpu_glamor.c \
 	amdgpu_glamor_wrappers.c \

src/amdgpu_dri3.c

@@ -25,8 +25,6 @@
 
 #include "amdgpu_drv.h"
 
-#ifdef HAVE_DRI3_H
-
 #include "amdgpu_glamor.h"
 #include "amdgpu_pixmap.h"
 #include "dri3.h"
@@ -241,17 +239,3 @@ amdgpu_dri3_screen_init(ScreenPtr screen)
 
 	return TRUE;
 }
-
-#else /* !HAVE_DRI3_H */
-
-Bool
-amdgpu_dri3_screen_init(ScreenPtr screen)
-{
-	xf86DrvMsg(xf86ScreenToScrn(screen)->scrnIndex, X_INFO,
-		   "Can't initialize DRI3 because dri3.h not available at "
-		   "build time\n");
-
-	return FALSE;
-}
-
-#endif