diff options
| author | Patrice Mandin <pmandin@caramail.com> | 2008-04-11 23:39:29 +0200 |
|---|---|---|
| committer | Patrice Mandin <pmandin@caramail.com> | 2008-04-11 23:39:29 +0200 |
| commit | 186277ee928a7c9ad8a31776f93e502613ad94fd (patch) | |
| tree | f67f7b44cd1b3058157ce9e746f800abd4cce060 /src/gallium/drivers/nv30/nv30_screen.h | |
| parent | 4c498c1b0c38a3ba93649fa4435937d15689bae1 (diff) | |
nv30: Move some structures and functions from context to screen
Diffstat (limited to 'src/gallium/drivers/nv30/nv30_screen.h')
| -rw-r--r-- | src/gallium/drivers/nv30/nv30_screen.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/gallium/drivers/nv30/nv30_screen.h b/src/gallium/drivers/nv30/nv30_screen.h index f878f81e11..56f8776a17 100644 --- a/src/gallium/drivers/nv30/nv30_screen.h +++ b/src/gallium/drivers/nv30/nv30_screen.h @@ -4,10 +4,25 @@ #include "pipe/p_screen.h" struct nv30_screen { - struct pipe_screen screen; + struct pipe_screen pipe; struct nouveau_winsys *nvws; unsigned chipset; + + /* HW graphics objects */ + struct nouveau_grobj *rankine; + struct nouveau_notifier *sync; + + /* Query object resources */ + struct nouveau_notifier *query; + struct nouveau_resource *query_heap; + + /* Vtxprog resources */ + struct nouveau_resource *vp_exec_heap; + struct nouveau_resource *vp_data_heap; + + /* Current 3D state of channel */ + struct nouveau_stateobj *state[NV30_STATE_MAX]; }; static INLINE struct nv30_screen * |