summaryrefslogtreecommitdiffstats
path: root/src/gallium/winsys
diff options
context:
space:
mode:
authorStephane Marchesin <[email protected]>2008-03-15 05:37:57 +0100
committerStephane Marchesin <[email protected]>2008-03-15 05:37:57 +0100
commitd493203045b214770473f8afeaa610542fe42c2a (patch)
treeec1f1b7d30a8f45ee7be7f82ae581d784d001dc7 /src/gallium/winsys
parent509044609d5121b2a09d64bd24d7aa37e3744a77 (diff)
nv10.
Diffstat (limited to 'src/gallium/winsys')
-rw-r--r--src/gallium/winsys/dri/nouveau/Makefile1
-rw-r--r--src/gallium/winsys/dri/nouveau/nouveau_context.c3
-rw-r--r--src/gallium/winsys/dri/nouveau/nouveau_winsys.c5
3 files changed, 9 insertions, 0 deletions
diff --git a/src/gallium/winsys/dri/nouveau/Makefile b/src/gallium/winsys/dri/nouveau/Makefile
index b463f218fd5..f637b2cebfc 100644
--- a/src/gallium/winsys/dri/nouveau/Makefile
+++ b/src/gallium/winsys/dri/nouveau/Makefile
@@ -8,6 +8,7 @@ MINIGLX_SOURCES =
PIPE_DRIVERS = \
$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
+ $(TOP)/src/gallium/drivers/nv10/libnv10.a \
$(TOP)/src/gallium/drivers/nv30/libnv30.a \
$(TOP)/src/gallium/drivers/nv40/libnv40.a \
$(TOP)/src/gallium/drivers/nv50/libnv50.a
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_context.c b/src/gallium/winsys/dri/nouveau/nouveau_context.c
index 8b20b3689c6..336dd65847b 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_context.c
+++ b/src/gallium/winsys/dri/nouveau/nouveau_context.c
@@ -119,6 +119,9 @@ nouveau_context_create(const __GLcontextModes *glVis,
}
switch (nv->chipset & 0xf0) {
+ case 0x10:
+ case 0x20:
+ /* NV10 */
case 0x30:
/* NV30 */
case 0x40:
diff --git a/src/gallium/winsys/dri/nouveau/nouveau_winsys.c b/src/gallium/winsys/dri/nouveau/nouveau_winsys.c
index 64e84fb68e4..6c85aab9f5f 100644
--- a/src/gallium/winsys/dri/nouveau/nouveau_winsys.c
+++ b/src/gallium/winsys/dri/nouveau/nouveau_winsys.c
@@ -82,6 +82,11 @@ nouveau_pipe_create(struct nouveau_context *nv)
return NULL;
switch (nv->chipset & 0xf0) {
+ case 0x10:
+ case 0x20:
+ hws_create = nv10_screen_create;
+ hw_create = nv10_create;
+ break;
case 0x30:
hws_create = nv30_screen_create;
hw_create = nv30_create;