nouveau: hook in nv30.

diff --git a/src/mesa/drivers/dri/nouveau_winsys/Makefile b/src/mesa/drivers/dri/nouveau_winsys/Makefile
index f547ec43766ea28964ea4052e3f25bf183818376..59ba561eb939f68a72f5a722c275cf6a4725c08e 100644 (file)
--- a/src/mesa/drivers/dri/nouveau_winsys/Makefile
+++ b/src/mesa/drivers/dri/nouveau_winsys/Makefile
@@ -8,6 +8,7 @@ MINIGLX_SOURCES =
 
 PIPE_DRIVERS = \
        $(TOP)/src/mesa/pipe/softpipe/libsoftpipe.a \
+       $(TOP)/src/mesa/pipe/nv40/libnv30.a \
        $(TOP)/src/mesa/pipe/nv40/libnv40.a \
        $(TOP)/src/mesa/pipe/nv50/libnv50.a
 

diff --git a/src/mesa/drivers/dri/nouveau_winsys/nouveau_winsys.c b/src/mesa/drivers/dri/nouveau_winsys/nouveau_winsys.c
index 8ffe89feecb38b971b71964614ef60d81f93b934..1494bd48dd425f23e4eece35c153c658c54ad01b 100644 (file)
--- a/src/mesa/drivers/dri/nouveau_winsys/nouveau_winsys.c
+++ b/src/mesa/drivers/dri/nouveau_winsys/nouveau_winsys.c
@@ -80,6 +80,9 @@ nouveau_pipe_create(struct nouveau_context *nv)
                return NULL;
 
        switch (nv->chipset & 0xf0) {
+       case 0x30:
+               hw_create = nv30_create;
+               break;
        case 0x40:
        case 0x60:
                hw_create = nv40_create;

diff --git a/src/mesa/pipe/nouveau/nouveau_winsys.h b/src/mesa/pipe/nouveau/nouveau_winsys.h
index 0b394cfce6b94686e4bcb94c972b8e63b794e6a5..818ae9afae204e17965fbfe507ac6f222f42ebb9 100644 (file)
--- a/src/mesa/pipe/nouveau/nouveau_winsys.h
+++ b/src/mesa/pipe/nouveau/nouveau_winsys.h
@@ -49,6 +49,9 @@ struct nouveau_winsys {
                            unsigned, unsigned, unsigned, unsigned, unsigned);
 };
 
+extern struct pipe_context *
+nv30_create(struct pipe_winsys *, struct nouveau_winsys *, unsigned chipset);
+
 extern struct pipe_context *
 nv40_create(struct pipe_winsys *, struct nouveau_winsys *, unsigned chipset);