diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2011-08-24 15:21:58 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2011-08-26 23:31:22 -0700 |
| commit | e4344161bde2e24fcfba65d30d58f087bd8bf94d (patch) | |
| tree | 0909a7ecd6418db9249572b5d3b55a6b35549123 /configs | |
| parent | 117042b46fc174107a6e28babb9353f9f1e5b981 (diff) | |
dri: Remove all DRI1 drivers
Acked-by: Kristian Høgsberg <krh@bitplanet.net>
Acked-by: Marek Olšák <maraeo@gmail.com>
Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Jakob Bornecrantz <jakob@vmware.com>
Acked-by: Dave Airlie <airlied@redhat.com>
Build-Tested-by: Jakob Bornecrantz <jakob@vmware.com>
Tested-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/freebsd-dri | 3 | ||||
| -rw-r--r-- | configs/linux-dri | 3 | ||||
| -rw-r--r-- | configs/linux-dri-debug | 2 | ||||
| -rw-r--r-- | configs/linux-dri-ppc | 2 | ||||
| -rw-r--r-- | configs/linux-dri-x86-64 | 6 | ||||
| -rw-r--r-- | configs/linux-dri-xcb | 3 |
6 files changed, 5 insertions, 14 deletions
diff --git a/configs/freebsd-dri b/configs/freebsd-dri index 3c83872c08c..c4169b81d4e 100644 --- a/configs/freebsd-dri +++ b/configs/freebsd-dri @@ -47,6 +47,5 @@ DRIVER_DIRS = dri DRM_SOURCE_PATH=$(TOP)/../drm -DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon tdfx \ - unichrome savage sis +DRI_DIRS = i915 i965 r200 r300 radeon diff --git a/configs/linux-dri b/configs/linux-dri index b82481e0f73..26c73ccf019 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -62,8 +62,7 @@ GALLIUM_WINSYS_DIRS = sw sw/xlib drm/vmware drm/intel drm/i965 GALLIUM_TARGET_DIRS = GALLIUM_STATE_TRACKERS_DIRS = egl -DRI_DIRS = i810 i915 i965 mach64 mga nouveau r128 r200 r300 r600 radeon \ - savage sis tdfx unichrome swrast +DRI_DIRS = i915 i965 nouveau r200 r300 r600 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 0dbf428830a..c42654ce3e2 100644 --- a/configs/linux-dri-debug +++ b/configs/linux-dri-debug @@ -11,6 +11,4 @@ ARCH_FLAGS = -DDEBUG #DRI_DIRS = i915tex i915 #DRI_DIRS = i965 #DRI_DIRS = radeon r200 r300 -#DRI_DIRS = unichrome sis -#DRI_DIRS = i810 mga r128 tdfx diff --git a/configs/linux-dri-ppc b/configs/linux-dri-ppc index a3a3ca83cb3..cc1ab9c4ff8 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 = mach64 r128 r200 r300 radeon tdfx +DRI_DIRS = r200 r300 radeon diff --git a/configs/linux-dri-x86-64 b/configs/linux-dri-x86-64 index 656cf6140d7..84f547812a8 100644 --- a/configs/linux-dri-x86-64 +++ b/configs/linux-dri-x86-64 @@ -16,9 +16,5 @@ LIB_DIR = lib64 # Library/program dependencies EXTRA_LIB_PATH=-L/usr/X11R6/lib64 -# sis is missing because it has not been converted to use -# the new interface. i810 are missing because there is no x86-64 -# system where they could *ever* be used. -# -DRI_DIRS = i915 i965 mach64 mga r128 r200 r300 radeon savage tdfx unichrome +DRI_DIRS = i915 i965 r200 r300 radeon diff --git a/configs/linux-dri-xcb b/configs/linux-dri-xcb index 15702da1904..a845f71d231 100644 --- a/configs/linux-dri-xcb +++ b/configs/linux-dri-xcb @@ -52,5 +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 = i810 i915 mach64 mga r128 r200 r300 radeon \ - savage sis tdfx unichrome +DRI_DIRS = i915 r200 r300 radeon |