X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=configs%2Flinux-dri;h=0998ba8549d9dc5a6ad741a48b350cb05d3cfaaf;hb=4d99e1453552847c2a67f723adc2764443c995d7;hp=eb6f307dac55b6c87df8f4fc0960ed999a572ee0;hpb=3a40dee3eb5151a282ce831b67427f3aa625de28;p=mesa.git

diff --git a/configs/linux-dri b/configs/linux-dri
index eb6f307dac5..0998ba8549d 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -52,31 +52,16 @@ GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
 
 # Directories
 SRC_DIRS := glx/x11 egl $(SRC_DIRS)
-
-
-# Directories
-ifeq ($(USING_EGL), 1)
-SRC_DIRS = egl glx/x11 gallium mesa glu glut/glx glw
-PROGRAM_DIRS = egl xdemos
-else
-SRC_DIRS = glx/x11 gallium mesa glu glut/glx glw
-PROGRAM_DIRS = xdemos
-endif
+PROGRAM_DIRS := egl $(PROGRAM_DIRS)
 
 # EGL directories
-EGL_DRIVERS_DIRS = demo dri xdri
+EGL_DRIVERS_DIRS = demo glx
 
-DRIVER_DIRS =
+DRIVER_DIRS = dri
 WINDOW_SYSTEM = dri
-GALLIUM_WINSYS_DIRS = drm egl_xlib
-
-# gamma are missing because they have not been converted to use the new
-# interface.
-
-# XXX: need to figure out a way for gallium and non-gallium builds to
-# coexist:
-#
+GALLIUM_WINSYS_DIRS = drm
+GALLIUM_WINSYS_DRM_DIRS = intel
+GALLIUM_STATE_TRACKERS_DIRS = egl
 
-#DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \
-#	savage sis tdfx trident unichrome ffb
-DRI_DIRS = intel 
+DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \
+	savage sis tdfx trident unichrome ffb swrast