diff options
| author | Jakob Bornecrantz <jakob@vmware.com> | 2009-02-11 02:25:10 +0100 |
|---|---|---|
| committer | Jakob Bornecrantz <jakob@vmware.com> | 2009-02-11 02:43:27 +0100 |
| commit | e94b4dd4f0c7f2e199e4fb2d1b81ac818d0d6078 (patch) | |
| tree | 3e2bdef9b01952c1d4912d44da0312bbc4221ce1 | |
| parent | 9c101c44c4455e0404be482610fbe015fa012be0 (diff) | |
gallium: Disable nouveau by default
Most piep drivers should be able to build by default, but since
the nouveau ones depend drm they can't be enabled by default.
| -rw-r--r-- | configs/default | 2 | ||||
| -rw-r--r-- | configs/linux-dri | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/configs/default b/configs/default index 4c8698ccc46..a90d46f18e1 100644 --- a/configs/default +++ b/configs/default @@ -92,7 +92,7 @@ EGL_DRIVERS_DIRS = demo GALLIUM_DIRS = auxiliary drivers state_trackers GALLIUM_AUXILIARY_DIRS = draw translate cso_cache pipebuffer tgsi sct rtasm util indices GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a) -GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple nv04 nv10 nv20 nv30 nv40 nv50 failover trace +GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple failover trace GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVER_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a) GALLIUM_WINSYS_DIRS = xlib egl_xlib GALLIUM_WINSYS_DRM_DIRS = diff --git a/configs/linux-dri b/configs/linux-dri index 8632170408e..c5e30d30608 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -60,7 +60,7 @@ EGL_DRIVERS_DIRS = demo glx DRIVER_DIRS = dri WINDOW_SYSTEM = dri GALLIUM_WINSYS_DIRS = drm -GALLIUM_WINSYS_DRM_DIRS = intel nouveau +GALLIUM_WINSYS_DRM_DIRS = intel GALLIUM_STATE_TRACKERS_DIRS = egl DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \ diff --git a/configure.ac b/configure.ac index 451902dd38f..d94cfd26fc1 100644 --- a/configure.ac +++ b/configure.ac @@ -427,7 +427,7 @@ dri) DRIVER_DIRS="" WINDOW_SYSTEM="dri" GALLIUM_WINSYS_DIRS="drm $GALLIUM_WINSYS_DIRS" - GALLIUM_DRIVER_DIRS="$GALLIUM_DRIVER_DIRS i915simple i965simple nv04 nv10 nv20 nv30 nv40 nv50" + GALLIUM_DRIVER_DIRS="$GALLIUM_DRIVER_DIRS i915simple i965simple" ;; osmesa) DRIVER_DIRS="osmesa" |