From: Ben Skeggs <skeggsb@gmail.com>
Date: Wed, 10 Sep 2008 20:09:05 +0000 (+1000)
Subject: Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7158203b081ad34c03382f07e0df748eae235e9b;p=mesa.git

Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1

Conflicts:
	configs/default
---

7158203b081ad34c03382f07e0df748eae235e9b
diff --cc configs/default
index 14435146069,cd2c39c3650..263955dde90
--- a/configs/default
+++ b/configs/default
@@@ -72,8 -72,7 +72,7 @@@ EGL_DRIVERS_DIRS = dem
  # 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 failover
 +GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple nv04 nv10 nv30 nv40 nv50 failover
- GALLIUM_WINSYS_COMMON_DIRS =
  GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVER_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
  GALLIUM_WINSYS_DIRS = xlib egl_xlib