Mesa (master): mesa: Remove build infrastructure for r300c and r600c.
Eric Anholt
anholt at kemper.freedesktop.org
Fri Oct 28 18:22:05 UTC 2011
Module: Mesa
Branch: master
Commit: 2f4c7ebea683de1d84501cfd11dbb963e7c027f6
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2f4c7ebea683de1d84501cfd11dbb963e7c027f6
Author: Eric Anholt <eric at anholt.net>
Date: Thu Oct 20 14:55:53 2011 -0700
mesa: Remove build infrastructure for r300c and r600c.
These drivers have been superseded by the gallium equivalents.
---
configs/freebsd-dri | 2 +-
configs/linux-dri | 2 +-
configs/linux-dri-debug | 2 +-
configs/linux-dri-ppc | 2 +-
configs/linux-dri-x86-64 | 2 +-
configs/linux-dri-xcb | 2 +-
configure.ac | 12 ++++++------
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/configs/freebsd-dri b/configs/freebsd-dri
index 9e810c4..b18ac51 100644
--- a/configs/freebsd-dri
+++ b/configs/freebsd-dri
@@ -47,5 +47,5 @@ DRIVER_DIRS = dri
DRM_SOURCE_PATH=$(TOP)/../drm
-DRI_DIRS = i915 i965 r200 r300 radeon
+DRI_DIRS = i915 i965 r200 radeon
diff --git a/configs/linux-dri b/configs/linux-dri
index aa2dddc..44c0c3d 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -62,7 +62,7 @@ GALLIUM_WINSYS_DIRS = sw sw/xlib drm/vmware drm/intel drm/i965 svga/drm
GALLIUM_TARGET_DIRS = dri-vmwgfx
GALLIUM_STATE_TRACKERS_DIRS = egl dri
-DRI_DIRS = i915 i965 nouveau r200 r300 r600 radeon swrast
+DRI_DIRS = i915 i965 nouveau r200 radeon swrast
INTEL_LIBS = $(shell $(PKG_CONFIG) --libs libdrm_intel)
INTEL_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm_intel)
diff --git a/configs/linux-dri-debug b/configs/linux-dri-debug
index c42654c..a1a4465 100644
--- a/configs/linux-dri-debug
+++ b/configs/linux-dri-debug
@@ -10,5 +10,5 @@ ARCH_FLAGS = -DDEBUG
# Helpful to reduce the amount of stuff that gets built sometimes:
#DRI_DIRS = i915tex i915
#DRI_DIRS = i965
-#DRI_DIRS = radeon r200 r300
+#DRI_DIRS = radeon r200
diff --git a/configs/linux-dri-ppc b/configs/linux-dri-ppc
index cc1ab9c..5dd3615 100644
--- a/configs/linux-dri-ppc
+++ b/configs/linux-dri-ppc
@@ -13,5 +13,5 @@ MESA_ASM_SOURCES = $(PPC_SOURCES)
# Build only the drivers for cards that exist on PowerPC. At some point MGA
# will be added, but not yet.
-DRI_DIRS = r200 r300 radeon
+DRI_DIRS = r200 radeon
diff --git a/configs/linux-dri-x86-64 b/configs/linux-dri-x86-64
index 84f5478..c1dff63 100644
--- a/configs/linux-dri-x86-64
+++ b/configs/linux-dri-x86-64
@@ -16,5 +16,5 @@ LIB_DIR = lib64
# Library/program dependencies
EXTRA_LIB_PATH=-L/usr/X11R6/lib64
-DRI_DIRS = i915 i965 r200 r300 radeon
+DRI_DIRS = i915 i965 r200 radeon
diff --git a/configs/linux-dri-xcb b/configs/linux-dri-xcb
index 6968beb..8566520 100644
--- a/configs/linux-dri-xcb
+++ b/configs/linux-dri-xcb
@@ -52,4 +52,4 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \
SRC_DIRS = glx gallium mesa glu
DRIVER_DIRS = dri
-DRI_DIRS = i915 r200 r300 radeon
+DRI_DIRS = i915 r200 radeon
diff --git a/configure.ac b/configure.ac
index 3696145..11d81bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1185,19 +1185,19 @@ if test "x$enable_dri" = xyes; then
case "$host_cpu" in
x86_64)
if test "x$DRI_DIRS" = "xyes"; then
- DRI_DIRS="i915 i965 nouveau r200 r300 r600 radeon swrast"
+ DRI_DIRS="i915 i965 nouveau r200 radeon swrast"
fi
;;
powerpc*)
# Build only the drivers for cards that exist on PowerPC.
if test "x$DRI_DIRS" = "xyes"; then
- DRI_DIRS="r200 r300 r600 radeon swrast"
+ DRI_DIRS="r200 radeon swrast"
fi
;;
sparc*)
# Build only the drivers for cards that exist on sparc
if test "x$DRI_DIRS" = "xyes"; then
- DRI_DIRS="r200 r300 r600 radeon swrast"
+ DRI_DIRS="r200 radeon swrast"
fi
;;
esac
@@ -1207,7 +1207,7 @@ if test "x$enable_dri" = xyes; then
DEFINES="$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS"
if test "x$DRI_DIRS" = "xyes"; then
- DRI_DIRS="i915 i965 nouveau r200 r300 r600 radeon swrast"
+ DRI_DIRS="i915 i965 nouveau r200 radeon swrast"
fi
;;
gnu*)
@@ -1227,7 +1227,7 @@ if test "x$enable_dri" = xyes; then
# default drivers
if test "x$DRI_DIRS" = "xyes"; then
- DRI_DIRS="i915 i965 nouveau r200 r300 r600 radeon swrast"
+ DRI_DIRS="i915 i965 nouveau r200 radeon swrast"
fi
DRI_DIRS=`echo "$DRI_DIRS" | $SED 's/ */ /g'`
@@ -1276,7 +1276,7 @@ case $DRI_DIRS in
esac
case $DRI_DIRS in
-*radeon*|*r200*|*r300*|*r600*)
+*radeon*|*r200*)
PKG_CHECK_MODULES([LIBDRM_RADEON],
[libdrm_radeon >= $LIBDRM_RADEON_REQUIRED],
HAVE_LIBDRM_RADEON=yes,
More information about the mesa-commit
mailing list