summaryrefslogtreecommitdiff
path: root/src/gallium/winsys/drm/nouveau
diff options
context:
space:
mode:
authorPekka Paalanen <pq@iki.fi>2008-11-12 23:13:22 +0200
committerPekka Paalanen <pq@iki.fi>2008-11-12 23:13:22 +0200
commit5aaeb13a768f0c7d3706f6c170901b118ae1aa2d (patch)
tree53b72b178245c254cfe2328e9bacba1244833c52 /src/gallium/winsys/drm/nouveau
parent1d6cba6572cc008760e9d4ff803b0b7e1420e41b (diff)
parent94631e63a8d56562b782ec30a6ec5b9d77ca70a0 (diff)
Merge commit 'origin/gallium-0.1' into gallium-0.2
* commit 'origin/gallium-0.1': Mesa: fix number of buffers in st_draw_vbo(). Nouveau: fix nv20_vertex_layout() Nouveau: update nv20 miptree according to nv40. Nouveau: build, link and use nv20. Nouveau: name replace for nv20. Nouveau: Rename nv20/ files as nv20. Nouveau: copy nv30_vertprog.c to nv20. Nouveau: start nv20 by copying the nv10 tree.
Diffstat (limited to 'src/gallium/winsys/drm/nouveau')
-rw-r--r--src/gallium/winsys/drm/nouveau/Makefile1
-rw-r--r--src/gallium/winsys/drm/nouveau/nouveau_winsys.c5
2 files changed, 5 insertions, 1 deletions
diff --git a/src/gallium/winsys/drm/nouveau/Makefile b/src/gallium/winsys/drm/nouveau/Makefile
index be630ff6d1..81562ca78d 100644
--- a/src/gallium/winsys/drm/nouveau/Makefile
+++ b/src/gallium/winsys/drm/nouveau/Makefile
@@ -10,6 +10,7 @@ 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
diff --git a/src/gallium/winsys/drm/nouveau/nouveau_winsys.c b/src/gallium/winsys/drm/nouveau/nouveau_winsys.c
index 0878840dcc..364340e1d3 100644
--- a/src/gallium/winsys/drm/nouveau/nouveau_winsys.c
+++ b/src/gallium/winsys/drm/nouveau/nouveau_winsys.c
@@ -101,10 +101,13 @@ nouveau_pipe_create(struct nouveau_context *nv)
switch (chipset & 0xf0) {
case 0x10:
- case 0x20:
hws_create = nv10_screen_create;
hw_create = nv10_create;
break;
+ case 0x20:
+ hws_create = nv20_screen_create;
+ hw_create = nv20_create;
+ break;
case 0x30:
hws_create = nv30_screen_create;
hw_create = nv30_create;