Merge remote branch 'origin/master' into pipe-video

[mesa.git] / configs / linux-dri

diff --git a/configs/linux-dri b/configs/linux-dri
index 22190bfc64f537b4db9b8ae2c6ba24b7c49286f5..ce2da8317d754443ad88d6d75b16f4e84b395ddf 100644 (file)
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -59,12 +59,12 @@ SRC_DIRS := glx egl $(SRC_DIRS)
 EGL_DRIVERS_DIRS = glx
 
 DRIVER_DIRS = dri
+
 GALLIUM_WINSYS_DIRS = sw sw/xlib drm/vmware drm/intel drm/i965
-GALLIUM_TARGET_DIRS = 
-GALLIUM_STATE_TRACKERS_DIRS = egl
+GALLIUM_TARGET_DIRS = egl-swrast
+GALLIUM_STATE_TRACKERS_DIRS = egl vdpau
 
-DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon \
-       savage sis tdfx unichrome swrast
+DRI_DIRS = r300 radeon swrast
 
 INTEL_LIBS = `pkg-config --libs libdrm_intel`
 INTEL_CFLAGS = `pkg-config --cflags libdrm_intel`