summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorPekka Paalanen <pq@iki.fi>2008-11-12 23:13:22 +0200
committerPekka Paalanen <pq@iki.fi>2008-11-12 23:13:22 +0200
commit5aaeb13a768f0c7d3706f6c170901b118ae1aa2d (patch)
tree53b72b178245c254cfe2328e9bacba1244833c52 /configs
parent1d6cba6572cc008760e9d4ff803b0b7e1420e41b (diff)
parent94631e63a8d56562b782ec30a6ec5b9d77ca70a0 (diff)
downloadexternal_mesa3d-5aaeb13a768f0c7d3706f6c170901b118ae1aa2d.zip
external_mesa3d-5aaeb13a768f0c7d3706f6c170901b118ae1aa2d.tar.gz
external_mesa3d-5aaeb13a768f0c7d3706f6c170901b118ae1aa2d.tar.bz2
Merge commit 'origin/gallium-0.1' into gallium-0.2
* commit 'origin/gallium-0.1': Mesa: fix number of buffers in st_draw_vbo(). Nouveau: fix nv20_vertex_layout() Nouveau: update nv20 miptree according to nv40. Nouveau: build, link and use nv20. Nouveau: name replace for nv20. Nouveau: Rename nv20/ files as nv20. Nouveau: copy nv30_vertprog.c to nv20. Nouveau: start nv20 by copying the nv10 tree.
Diffstat (limited to 'configs')
-rw-r--r--configs/default2
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/default b/configs/default
index 6f55f7f..d3efc4b 100644
--- a/configs/default
+++ b/configs/default
@@ -89,7 +89,7 @@ EGL_DRIVERS_DIRS = demo
# Gallium directories and
GALLIUM_AUXILIARY_DIRS = draw translate cso_cache pipebuffer tgsi sct rtasm util
GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a)
-GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple nv04 nv10 nv30 nv40 nv50 failover
+GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple nv04 nv10 nv20 nv30 nv40 nv50 failover
GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVER_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
GALLIUM_WINSYS_DIRS = xlib egl_xlib