diff options
Diffstat (limited to 'src/gallium/drivers/nvfx/nvfx_screen.h')
| -rw-r--r-- | src/gallium/drivers/nvfx/nvfx_screen.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/gallium/drivers/nvfx/nvfx_screen.h b/src/gallium/drivers/nvfx/nvfx_screen.h index baa848c47a..127d8919af 100644 --- a/src/gallium/drivers/nvfx/nvfx_screen.h +++ b/src/gallium/drivers/nvfx/nvfx_screen.h @@ -1,8 +1,10 @@ #ifndef __NVFX_SCREEN_H__ #define __NVFX_SCREEN_H__ +#include "util/u_double_list.h" #include "nouveau/nouveau_screen.h" #include "nv04_surface_2d.h" +#include "nvfx_context.h" struct nvfx_screen { struct nouveau_screen base; @@ -12,7 +14,9 @@ struct nvfx_screen { struct nvfx_context *cur_ctx; unsigned is_nv4x; /* either 0 or ~0 */ - int vertex_buffer_flags; + boolean force_swtnl; + unsigned vertex_buffer_reloc_flags; + unsigned index_buffer_reloc_flags; /* HW graphics objects */ struct nv04_surface_2d *eng2d; @@ -22,13 +26,11 @@ struct nvfx_screen { /* Query object resources */ struct nouveau_notifier *query; struct nouveau_resource *query_heap; + struct list_head query_list; /* Vtxprog resources */ struct nouveau_resource *vp_exec_heap; struct nouveau_resource *vp_data_heap; - - /* Current 3D state of channel */ - struct nouveau_stateobj *state[NVFX_STATE_MAX]; }; static INLINE struct nvfx_screen * |