Mesa (master): nouveau: reenable all the non-nv50 pipe drivers

[Ben Skeggs]

Module: Mesa
Branch: master
Commit: 8cf997b7c8a2c8eb347ce06d0e8bfaf2e9d4bd9d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8cf997b7c8a2c8eb347ce06d0e8bfaf2e9d4bd9d

Author: Ben Skeggs <bskeggs at redhat.com>
Date:   Fri Feb 20 09:47:56 2009 +1000

nouveau: reenable all the non-nv50 pipe drivers

They still won't build yet, but anyway..

---

 .../winsys/drm/nouveau/common/nouveau_winsys.c     |    2 --
 src/gallium/winsys/drm/nouveau/dri/Makefile        |   10 +++++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/gallium/winsys/drm/nouveau/common/nouveau_winsys.c b/src/gallium/winsys/drm/nouveau/common/nouveau_winsys.c
index 89824b2..b6199f8 100644
--- a/src/gallium/winsys/drm/nouveau/common/nouveau_winsys.c
+++ b/src/gallium/winsys/drm/nouveau/common/nouveau_winsys.c
@@ -77,7 +77,6 @@ nouveau_pipe_create(struct nouveau_context *nv)
 		return NULL;
 
 	switch (chipset & 0xf0) {
-#if 0
 	case 0x00:
 		hws_create = nv04_screen_create;
 		hw_create = nv04_create;
@@ -99,7 +98,6 @@ nouveau_pipe_create(struct nouveau_context *nv)
 		hws_create = nv40_screen_create;
 		hw_create = nv40_create;
 		break;
-#endif
 	case 0x50:
 	case 0x80:
 	case 0x90:
diff --git a/src/gallium/winsys/drm/nouveau/dri/Makefile b/src/gallium/winsys/drm/nouveau/dri/Makefile
index 2e7a3a7..a73e8d5 100644
--- a/src/gallium/winsys/drm/nouveau/dri/Makefile
+++ b/src/gallium/winsys/drm/nouveau/dri/Makefile
@@ -7,12 +7,12 @@ MINIGLX_SOURCES =
 
 PIPE_DRIVERS = \
 	$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
+	$(TOP)/src/gallium/drivers/nv04/libnv04.a \
+	$(TOP)/src/gallium/drivers/nv10/libnv10.a \
+	$(TOP)/src/gallium/drivers/nv20/libnv20.a \
+	$(TOP)/src/gallium/drivers/nv30/libnv30.a \
+	$(TOP)/src/gallium/drivers/nv40/libnv40.a \
 	$(TOP)/src/gallium/drivers/nv50/libnv50.a
-#	$(TOP)/src/gallium/drivers/nv04/libnv04.a \
-#	$(TOP)/src/gallium/drivers/nv10/libnv10.a \
-#	$(TOP)/src/gallium/drivers/nv20/libnv20.a \
-#	$(TOP)/src/gallium/drivers/nv30/libnv30.a \
-#	$(TOP)/src/gallium/drivers/nv40/libnv40.a \
 	
 DRIVER_SOURCES = \
 	nouveau_context_dri.c \