diff options
author | Pekka Paalanen <pq@iki.fi> | 2008-11-12 23:13:22 +0200 |
---|---|---|
committer | Pekka Paalanen <pq@iki.fi> | 2008-11-12 23:13:22 +0200 |
commit | 5aaeb13a768f0c7d3706f6c170901b118ae1aa2d (patch) | |
tree | 53b72b178245c254cfe2328e9bacba1244833c52 /src/gallium/drivers/nouveau | |
parent | 1d6cba6572cc008760e9d4ff803b0b7e1420e41b (diff) | |
parent | 94631e63a8d56562b782ec30a6ec5b9d77ca70a0 (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/drivers/nouveau')
-rw-r--r-- | src/gallium/drivers/nouveau/nouveau_winsys.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h index 48feeba309..a89b056244 100644 --- a/src/gallium/drivers/nouveau/nouveau_winsys.h +++ b/src/gallium/drivers/nouveau/nouveau_winsys.h @@ -70,6 +70,12 @@ extern struct pipe_context * nv10_create(struct pipe_screen *, unsigned pctx_id); extern struct pipe_screen * +nv20_screen_create(struct pipe_winsys *ws, struct nouveau_winsys *); + +extern struct pipe_context * +nv20_create(struct pipe_screen *, unsigned pctx_id); + +extern struct pipe_screen * nv30_screen_create(struct pipe_winsys *ws, struct nouveau_winsys *); extern struct pipe_context * |