From e538dc52c13eb9225afd8cb6c1099e97e723a558 Mon Sep 17 00:00:00 2001 From: Stephane Marchesin Date: Fri, 15 Feb 2008 02:25:17 +0100 Subject: [PATCH] nouveau: hook in nv30. --- src/mesa/drivers/dri/nouveau_winsys/Makefile | 1 + src/mesa/drivers/dri/nouveau_winsys/nouveau_winsys.c | 3 +++ src/mesa/pipe/nouveau/nouveau_winsys.h | 3 +++ 3 files changed, 7 insertions(+) diff --git a/src/mesa/drivers/dri/nouveau_winsys/Makefile b/src/mesa/drivers/dri/nouveau_winsys/Makefile index f547ec43766..59ba561eb93 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 8ffe89feecb..1494bd48dd4 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 0b394cfce6b..818ae9afae2 100644 --- 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); -- 2.30.2