diff options
| author | Marek Olšák <[email protected]> | 2012-04-24 01:23:33 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2012-04-24 01:39:22 +0200 |
| commit | 2a311b18fce9ea6538b0997ad23d86a061fb273c (patch) | |
| tree | 0d6aecf67a9735039eba8f4c9598821ed18b8c86 /src/gallium/drivers/radeonsi/radeonsi_pipe.h | |
| parent | 89c488871056185b8633aae7e7573b398827b038 (diff) | |
radeonsi: stop using u_vbuf and adapt to gallium interface changes
Diffstat (limited to 'src/gallium/drivers/radeonsi/radeonsi_pipe.h')
| -rw-r--r-- | src/gallium/drivers/radeonsi/radeonsi_pipe.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/gallium/drivers/radeonsi/radeonsi_pipe.h b/src/gallium/drivers/radeonsi/radeonsi_pipe.h index f4a1219d860..64ddd5de253 100644 --- a/src/gallium/drivers/radeonsi/radeonsi_pipe.h +++ b/src/gallium/drivers/radeonsi/radeonsi_pipe.h @@ -34,7 +34,6 @@ #include "util/u_format.h" #include "util/u_math.h" #include "util/u_slab.h" -#include "util/u_vbuf.h" #include "r600.h" #include "radeonsi_public.h" #include "r600_resource.h" @@ -161,7 +160,6 @@ struct r600_vertex_element { unsigned count; struct pipe_vertex_element elements[PIPE_MAX_ATTRIBS]; - struct u_vbuf_elements *vmgr_elements; unsigned fs_size; struct r600_pipe_state rstate; /* if offset is to big for fetch instructio we need to alterate @@ -286,7 +284,7 @@ struct r600_context { struct r600_textures_info ps_samplers; boolean shader_dirty; - struct u_vbuf *vbuf_mgr; + struct u_upload_mgr *uploader; struct util_slab_mempool pool_transfers; boolean have_depth_texture, have_depth_fb; @@ -326,6 +324,12 @@ struct r600_context { unsigned streamout_append_bitmask; unsigned *vs_so_stride_in_dw; unsigned *vs_shader_so_strides; + + /* Vertex and index buffers. */ + bool vertex_buffers_dirty; + struct pipe_index_buffer index_buffer; + struct pipe_vertex_buffer vertex_buffer[PIPE_MAX_ATTRIBS]; + unsigned nr_vertex_buffers; }; static INLINE void r600_emit_atom(struct r600_context *rctx, struct r600_atom *atom) |