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/nv20/nv20_screen.h | |
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/nv20/nv20_screen.h')
-rw-r--r-- | src/gallium/drivers/nv20/nv20_screen.h | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/src/gallium/drivers/nv20/nv20_screen.h b/src/gallium/drivers/nv20/nv20_screen.h new file mode 100644 index 0000000000..8f2f2e341d --- /dev/null +++ b/src/gallium/drivers/nv20/nv20_screen.h @@ -0,0 +1,22 @@ +#ifndef __NV20_SCREEN_H__ +#define __NV20_SCREEN_H__ + +#include "pipe/p_screen.h" + +struct nv20_screen { + struct pipe_screen pipe; + + struct nouveau_winsys *nvws; + + /* HW graphics objects */ + struct nouveau_grobj *kelvin; + struct nouveau_notifier *sync; +}; + +static INLINE struct nv20_screen * +nv20_screen(struct pipe_screen *screen) +{ + return (struct nv20_screen *)screen; +} + +#endif |