[PATCH 5/5] dix: Remove the remains of DRI1
Adam Jackson
ajax at redhat.com
Tue Dec 8 14:41:40 PST 2015
Signed-off-by: Adam Jackson <ajax at redhat.com>
---
configure.ac | 18 +-----------------
dix/protocol.txt | 16 ----------------
glx/Makefile.am | 1 -
include/protocol-versions.h | 5 -----
include/xorg-config.h.in | 3 ---
include/xorg-server.h.in | 3 ---
os/utils.c | 3 ---
test/Makefile.am | 6 +-----
8 files changed, 2 insertions(+), 53 deletions(-)
diff --git a/configure.ac b/configure.ac
index 323d206..9fb723d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -379,7 +379,6 @@ AM_CONDITIONAL(I386_VIDEO, [test "x$I386_VIDEO" = xyes])
AM_CONDITIONAL(PPC_VIDEO, [test "x$PPC_VIDEO" = xyes])
AM_CONDITIONAL(SPARC64_VIDEO, [test "x$SPARC64_VIDEO" = xyes])
-DRI=no
USE_SIGIO_BY_DEFAULT="yes"
dnl it would be nice to autodetect these *CONS_SUPPORTs
case $host_os in
@@ -391,14 +390,12 @@ case $host_os in
AC_DEFINE(PCCONS_SUPPORT, 1, [System has PC console])
AC_DEFINE(PCVT_SUPPORT, 1, [System has PCVT console])
AC_DEFINE(SYSCONS_SUPPORT, 1, [System has syscons console])
- DRI=yes
;;
*netbsd*)
AC_DEFINE(CSRG_BASED, 1, [System is BSD-like])
AC_DEFINE(PCCONS_SUPPORT, 1, [System has PC console])
AC_DEFINE(PCVT_SUPPORT, 1, [System has PCVT console])
AC_DEFINE(WSCONS_SUPPORT, 1, [System has wscons console])
- DRI=yes
;;
*openbsd*)
AC_DEFINE(CSRG_BASED, 1, [System is BSD-like])
@@ -406,10 +403,8 @@ case $host_os in
AC_DEFINE(WSCONS_SUPPORT, 1, [System has wscons console])
;;
*linux*)
- DRI=yes
;;
*solaris*)
- PKG_CHECK_EXISTS(libdrm, DRI=yes, DRI=no)
# Disable use of SIGIO by default until some system bugs are
# fixed - see Sun/OpenSolaris bug id 6879897
USE_SIGIO_BY_DEFAULT="no"
@@ -590,7 +585,6 @@ AC_ARG_ENABLE(screensaver, AS_HELP_STRING([--disable-screensaver], [Build Scr
AC_ARG_ENABLE(xdmcp, AS_HELP_STRING([--disable-xdmcp], [Build XDMCP extension (default: auto)]), [XDMCP=$enableval], [XDMCP=auto])
AC_ARG_ENABLE(xdm-auth-1, AS_HELP_STRING([--disable-xdm-auth-1], [Build XDM-Auth-1 extension (default: auto)]), [XDMAUTH=$enableval], [XDMAUTH=auto])
AC_ARG_ENABLE(glx, AS_HELP_STRING([--disable-glx], [Build GLX extension (default: enabled)]), [GLX=$enableval], [GLX=yes])
-AC_ARG_ENABLE(dri, AS_HELP_STRING([--enable-dri], [Build DRI extension (default: auto)]), [DRI=$enableval])
AC_ARG_ENABLE(dri2, AS_HELP_STRING([--enable-dri2], [Build DRI2 extension (default: auto)]), [DRI2=$enableval], [DRI2=auto])
AC_ARG_ENABLE(dri3, AS_HELP_STRING([--enable-dri3], [Build DRI3 extension (default: auto)]), [DRI3=$enableval], [DRI3=auto])
AC_ARG_ENABLE(present, AS_HELP_STRING([--disable-present], [Build Present extension (default: enabled)]), [PRESENT=$enableval], [PRESENT=yes])
@@ -1103,13 +1097,6 @@ fi
AC_MSG_RESULT([$CLIENTIDS])
AM_CONDITIONAL(CLIENTIDS, [test "x$CLIENTIDS" = xyes])
-AM_CONDITIONAL(DRI, test "x$DRI" = xyes)
-if test "x$DRI" = xyes; then
- AC_DEFINE(XF86DRI, 1, [Build DRI extension])
- REQUIRED_MODULES="$REQUIRED_MODULES $DRIPROTO $GLPROTO $LIBDRI"
- SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $DRIPROTO $GLPROTO $LIBDRI"
-fi
-
PKG_CHECK_MODULES([DRI2PROTO], $DRI2PROTO,
[HAVE_DRI2PROTO=yes], [HAVE_DRI2PROTO=no])
case "$DRI2,$HAVE_DRI2PROTO" in
@@ -1283,7 +1270,7 @@ esac
AM_CONDITIONAL(DRI3, test "x$DRI3" = xyes)
-if test "x$DRI" = xyes || test "x$DRI2" = xyes || test "x$DRI3" = xyes || test "x$CONFIG_UDEV_KMS" = xyes; then
+if test "x$DRI2" = xyes || test "x$DRI3" = xyes || test "x$CONFIG_UDEV_KMS" = xyes; then
if test "x$DRM" = xyes; then
AC_DEFINE(WITH_LIBDRM, 1, [Building with libdrm support])
PKG_CHECK_MODULES([LIBDRM], $LIBDRM)
@@ -2398,9 +2385,6 @@ if test "$KDRIVE" = yes; then
if test "x$XV" = xyes; then
XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS xcb-xv"
fi
- if test "x$DRI" = xyes && test "x$GLX" = xyes; then
- XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS libdrm xcb-glx xcb-xf86dri > 1.6"
- fi
if test "x$GLAMOR" = xyes; then
XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS x11-xcb"
fi
diff --git a/dix/protocol.txt b/dix/protocol.txt
index 244556a..437a352 100644
--- a/dix/protocol.txt
+++ b/dix/protocol.txt
@@ -679,22 +679,6 @@ E001 XFree86-DGA:NoDirectVideoMode
E002 XFree86-DGA:ScreenNotActive
E003 XFree86-DGA:DirectNotActivated
E004 XFree86-DGA:OperationNotSupported
-R000 XFree86-DRI:QueryVersion
-R001 XFree86-DRI:QueryDirectRenderingCapable
-R002 XFree86-DRI:OpenConnection
-R003 XFree86-DRI:CloseConnection
-R004 XFree86-DRI:GetClientDriverName
-R005 XFree86-DRI:CreateContext
-R006 XFree86-DRI:DestroyContext
-R007 XFree86-DRI:CreateDrawable
-R008 XFree86-DRI:DestroyDrawable
-R009 XFree86-DRI:GetDrawableInfo
-R010 XFree86-DRI:GetDeviceInfo
-R011 XFree86-DRI:AuthConnection
-R012 XFree86-DRI:OpenFullScreen
-R013 XFree86-DRI:CloseFullScreen
-E000 XFree86-DRI:ClientNotLocal
-E001 XFree86-DRI:OperationNotSupported
R000 XFree86-Misc:QueryVersion
R001 XFree86-Misc:GetSaver
R002 XFree86-Misc:SetSaver
diff --git a/glx/Makefile.am b/glx/Makefile.am
index 54e8140..37ab6b9 100644
--- a/glx/Makefile.am
+++ b/glx/Makefile.am
@@ -19,7 +19,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/hw/xfree86/os-support \
-I$(top_srcdir)/hw/xfree86/os-support/bus \
-I$(top_srcdir)/hw/xfree86/common \
- -I$(top_srcdir)/hw/xfree86/dri \
-I$(top_srcdir)/mi \
-I$(top_srcdir)/present
diff --git a/include/protocol-versions.h b/include/protocol-versions.h
index be532ff..c011c63 100644
--- a/include/protocol-versions.h
+++ b/include/protocol-versions.h
@@ -124,11 +124,6 @@
#define SERVER_XF86BIGFONT_MAJOR_VERSION 1
#define SERVER_XF86BIGFONT_MINOR_VERSION 1
-/* DRI */
-#define SERVER_XF86DRI_MAJOR_VERSION 4
-#define SERVER_XF86DRI_MINOR_VERSION 1
-#define SERVER_XF86DRI_PATCH_VERSION 20040604
-
/* Vidmode */
#define SERVER_XF86VIDMODE_MAJOR_VERSION 2
#define SERVER_XF86VIDMODE_MINOR_VERSION 2
diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in
index 7c03126..c303f88 100644
--- a/include/xorg-config.h.in
+++ b/include/xorg-config.h.in
@@ -57,9 +57,6 @@
/* Default log dir under XDG_DATA_HOME */
#undef DEFAULT_XDG_DATA_HOME_LOGDIR
-/* Building DRI-capable DDX. */
-#undef XF86DRI
-
/* Build DRI2 extension */
#undef DRI2
diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
index e46ccec..855db3b 100644
--- a/include/xorg-server.h.in
+++ b/include/xorg-server.h.in
@@ -137,9 +137,6 @@
/* Support loadable input and output drivers */
#undef XLOADABLE
-/* Build DRI extension */
-#undef XF86DRI
-
/* Build DRI2 extension */
#undef DRI2
diff --git a/os/utils.c b/os/utils.c
index ef7a2cc..f528ed7 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -163,9 +163,6 @@ Bool noXFree86BigfontExtension = FALSE;
#ifdef XFreeXDGA
Bool noXFree86DGAExtension = FALSE;
#endif
-#ifdef XF86DRI
-Bool noXFree86DRIExtension = FALSE;
-#endif
#ifdef XF86VIDMODE
Bool noXFree86VidModeExtension = FALSE;
#endif
diff --git a/test/Makefile.am b/test/Makefile.am
index d151b02..43e4b6f 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -21,7 +21,7 @@ if XORG
AM_CPPFLAGS += -I$(top_srcdir)/hw/xfree86/parser \
-I$(top_srcdir)/hw/xfree86/ddc \
-I$(top_srcdir)/hw/xfree86/i2c -I$(top_srcdir)/hw/xfree86/modes \
- -I$(top_srcdir)/hw/xfree86/ramdac -I$(top_srcdir)/hw/xfree86/dri \
+ -I$(top_srcdir)/hw/xfree86/ramdac \
-I$(top_srcdir)/hw/xfree86/dri2 -I$(top_srcdir)/dri3
endif
TEST_LDADD=libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLX_SYS_LIBS)
@@ -64,10 +64,6 @@ CLEANFILES = sdksyms.c
sdksyms.c: $(top_builddir)/hw/xfree86/sdksyms.c
$(AM_V_GEN)$(LN_S) $(top_builddir)/hw/xfree86/sdksyms.c
-if DRI
-libxservertest_la_LIBADD += $(top_builddir)/hw/xfree86/dri/libdri.la
-endif
-
if DRI2
libxservertest_la_LIBADD += $(top_builddir)/hw/xfree86/dri2/libdri2.la
endif
--
2.5.0
More information about the xorg-devel
mailing list