mesa: Remove build infrastructure for r300c and r600c.

These drivers have been superseded by the gallium equivalents.

diff --git a/configs/freebsd-dri b/configs/freebsd-dri
index 9e810c4b8f8149ca342fee713dfa86cac275032c..b18ac51e395160f66f43f898e549caf29d8e87a6 100644 (file)
--- 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 aa2dddc1cd3ba497803da4d98b7dbe21e61b7bc9..44c0c3d1d9b3517e26d1d3a6aa15b2089884a00b 100644 (file)
--- 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 c42654ce3e2f1b90d717126fb49b1266a003fd56..a1a4465d8eb1b6bf3d9d7167b378535e36ac47a3 100644 (file)
--- 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 cc1ab9c4ff849d917e4c8c0c0a9b27e582dfd6c8..5dd3615fff5e1a3f21e1bc8c16f8d1baddbd5384 100644 (file)
--- 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 84f547812a89c546637b722310e65770cabead94..c1dff630ff8da53c6b8818f60e4d868843edcf6a 100644 (file)
--- 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 6968bebe4506d7767dbd68b589d81566d2a983b4..85665207be12966f70188f2a789f5d308764f79e 100644 (file)
--- 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 36961452866f8065c0ea4aa601cb1a9a3b4cd65c..11d81bca28a50db6829fd997096beb000fcd8d97 100644 (file)
--- 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,