diff options
| author | Stephane Marchesin <marchesin@icps.u-strasbg.fr> | 2008-02-15 02:25:17 +0100 |
|---|---|---|
| committer | Stephane Marchesin <marchesin@icps.u-strasbg.fr> | 2008-02-15 02:26:03 +0100 |
| commit | e538dc52c13eb9225afd8cb6c1099e97e723a558 (patch) | |
| tree | 9a42629d920ddbfcc8ac61c5f208b7d65e24bcf3 | |
| parent | e713cb26c9adeff4e35a9b2cac35e7c025ef72b4 (diff) | |
nouveau: hook in nv30.
| -rw-r--r-- | src/mesa/drivers/dri/nouveau_winsys/Makefile | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/nouveau_winsys/nouveau_winsys.c | 3 | ||||
| -rw-r--r-- | src/mesa/pipe/nouveau/nouveau_winsys.h | 3 |
3 files changed, 7 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/nouveau_winsys/Makefile b/src/mesa/drivers/dri/nouveau_winsys/Makefile index f547ec4376..59ba561eb9 100644 --- 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 8ffe89feec..1494bd48dd 100644 --- 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 0b394cfce6..818ae9afae 100644 --- a/src/mesa/pipe/nouveau/nouveau_winsys.h +++ b/src/mesa/pipe/nouveau/nouveau_winsys.h @@ -50,6 +50,9 @@ struct nouveau_winsys { }; 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); extern struct pipe_context * |