diff options
31 files changed, 114 insertions, 112 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h index 5c64c2f2710..308ba99a318 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/src/mesa/drivers/dri/i965/brw_context.h @@ -532,7 +532,7 @@ struct brw_vertex_buffer { GLuint step_rate; }; struct brw_vertex_element { - const struct gl_client_array *glarray; + const struct gl_vertex_array *glarray; int buffer; @@ -1461,7 +1461,7 @@ gl_clip_plane *brw_select_clip_planes(struct gl_context *ctx); /* brw_draw_upload.c */ unsigned brw_get_vertex_surface_type(struct brw_context *brw, - const struct gl_client_array *glarray); + const struct gl_vertex_array *glarray); static inline unsigned brw_get_index_type(GLenum type) diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c index 26d0a6ae009..af370db6b30 100644 --- a/src/mesa/drivers/dri/i965/brw_draw.c +++ b/src/mesa/drivers/dri/i965/brw_draw.c @@ -285,7 +285,7 @@ brw_emit_prim(struct brw_context *brw, static void brw_merge_inputs(struct brw_context *brw, - const struct gl_client_array *arrays[]) + const struct gl_vertex_array *arrays[]) { const struct gl_context *ctx = &brw->ctx; GLuint i; @@ -420,7 +420,7 @@ brw_predraw_set_aux_buffers(struct brw_context *brw) */ static void brw_try_draw_prims(struct gl_context *ctx, - const struct gl_client_array *arrays[], + const struct gl_vertex_array *arrays[], const struct _mesa_prim *prims, GLuint nr_prims, const struct _mesa_index_buffer *ib, @@ -631,7 +631,7 @@ brw_draw_prims(struct gl_context *ctx, struct gl_buffer_object *indirect) { struct brw_context *brw = brw_context(ctx); - const struct gl_client_array **arrays = ctx->Array._DrawArrays; + const struct gl_vertex_array **arrays = ctx->Array._DrawArrays; struct brw_transform_feedback_object *xfb_obj = (struct brw_transform_feedback_object *) gl_xfb_obj; diff --git a/src/mesa/drivers/dri/i965/brw_draw_upload.c b/src/mesa/drivers/dri/i965/brw_draw_upload.c index 993b21c30ef..da13e7acc74 100644 --- a/src/mesa/drivers/dri/i965/brw_draw_upload.c +++ b/src/mesa/drivers/dri/i965/brw_draw_upload.c @@ -245,7 +245,7 @@ double_types(struct brw_context *brw, */ unsigned brw_get_vertex_surface_type(struct brw_context *brw, - const struct gl_client_array *glarray) + const struct gl_vertex_array *glarray) { int size = glarray->Size; const bool is_ivybridge_or_older = @@ -490,7 +490,7 @@ brw_prepare_vertices(struct brw_context *brw) for (i = j = 0; i < brw->vb.nr_enabled; i++) { struct brw_vertex_element *input = brw->vb.enabled[i]; - const struct gl_client_array *glarray = input->glarray; + const struct gl_vertex_array *glarray = input->glarray; if (_mesa_is_bufferobj(glarray->BufferObj)) { struct intel_buffer_object *intel_buffer = @@ -522,7 +522,7 @@ brw_prepare_vertices(struct brw_context *brw) */ unsigned k; for (k = 0; k < i; k++) { - const struct gl_client_array *other = brw->vb.enabled[k]->glarray; + const struct gl_vertex_array *other = brw->vb.enabled[k]->glarray; if (glarray->BufferObj == other->BufferObj && glarray->StrideB == other->StrideB && glarray->InstanceDivisor == other->InstanceDivisor && diff --git a/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c b/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c index a3fbad07e66..51ffd5aef54 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c +++ b/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c @@ -40,7 +40,7 @@ * structures. */ static int -get_array_stride(struct gl_context *ctx, const struct gl_client_array *a) +get_array_stride(struct gl_context *ctx, const struct gl_vertex_array *a) { struct nouveau_render_state *render = to_render_state(ctx); @@ -53,7 +53,7 @@ get_array_stride(struct gl_context *ctx, const struct gl_client_array *a) static void vbo_init_arrays(struct gl_context *ctx, const struct _mesa_index_buffer *ib, - const struct gl_client_array **arrays) + const struct gl_vertex_array **arrays) { struct nouveau_render_state *render = to_render_state(ctx); GLboolean imm = (render->mode == IMM); @@ -64,7 +64,7 @@ vbo_init_arrays(struct gl_context *ctx, const struct _mesa_index_buffer *ib, ib->obj, ib->ptr, GL_TRUE, ctx); FOR_EACH_BOUND_ATTR(render, i, attr) { - const struct gl_client_array *array = arrays[attr]; + const struct gl_vertex_array *array = arrays[attr]; nouveau_init_array(&render->attrs[attr], attr, get_array_stride(ctx, array), @@ -76,7 +76,7 @@ vbo_init_arrays(struct gl_context *ctx, const struct _mesa_index_buffer *ib, static void vbo_deinit_arrays(struct gl_context *ctx, const struct _mesa_index_buffer *ib, - const struct gl_client_array **arrays) + const struct gl_vertex_array **arrays) { struct nouveau_render_state *render = to_render_state(ctx); int i, attr; @@ -100,7 +100,7 @@ vbo_deinit_arrays(struct gl_context *ctx, const struct _mesa_index_buffer *ib, /* Make some rendering decisions from the GL context. */ static void -vbo_choose_render_mode(struct gl_context *ctx, const struct gl_client_array **arrays) +vbo_choose_render_mode(struct gl_context *ctx, const struct gl_vertex_array **arrays) { struct nouveau_render_state *render = to_render_state(ctx); int i; @@ -118,12 +118,12 @@ vbo_choose_render_mode(struct gl_context *ctx, const struct gl_client_array **ar } static void -vbo_emit_attr(struct gl_context *ctx, const struct gl_client_array **arrays, +vbo_emit_attr(struct gl_context *ctx, const struct gl_vertex_array **arrays, int attr) { struct nouveau_pushbuf *push = context_push(ctx); struct nouveau_render_state *render = to_render_state(ctx); - const struct gl_client_array *array = arrays[attr]; + const struct gl_vertex_array *array = arrays[attr]; struct nouveau_array *a = &render->attrs[attr]; RENDER_LOCALS(ctx); @@ -158,7 +158,7 @@ vbo_emit_attr(struct gl_context *ctx, const struct gl_client_array **arrays, #define MAT(a) (VERT_ATTRIB_GENERIC0 + MAT_ATTRIB_##a) static void -vbo_choose_attrs(struct gl_context *ctx, const struct gl_client_array **arrays) +vbo_choose_attrs(struct gl_context *ctx, const struct gl_vertex_array **arrays) { struct nouveau_render_state *render = to_render_state(ctx); int i; @@ -201,13 +201,13 @@ vbo_choose_attrs(struct gl_context *ctx, const struct gl_client_array **arrays) } static int -get_max_client_stride(struct gl_context *ctx, const struct gl_client_array **arrays) +get_max_client_stride(struct gl_context *ctx, const struct gl_vertex_array **arrays) { struct nouveau_render_state *render = to_render_state(ctx); int i, attr, s = 0; FOR_EACH_BOUND_ATTR(render, i, attr) { - const struct gl_client_array *a = arrays[attr]; + const struct gl_vertex_array *a = arrays[attr]; if (!_mesa_is_bufferobj(a->BufferObj)) s = MAX2(s, get_array_stride(ctx, a)); @@ -227,7 +227,7 @@ TAG(vbo_render_prims)(struct gl_context *ctx, struct gl_buffer_object *indirect); static GLboolean -vbo_maybe_split(struct gl_context *ctx, const struct gl_client_array **arrays, +vbo_maybe_split(struct gl_context *ctx, const struct gl_vertex_array **arrays, const struct _mesa_prim *prims, GLuint nr_prims, const struct _mesa_index_buffer *ib, GLuint min_index, GLuint max_index) @@ -287,7 +287,7 @@ check_update_array(struct nouveau_array *a, unsigned offset, } static void -vbo_bind_vertices(struct gl_context *ctx, const struct gl_client_array **arrays, +vbo_bind_vertices(struct gl_context *ctx, const struct gl_vertex_array **arrays, int base, unsigned min_index, unsigned max_index, int *pdelta) { struct nouveau_render_state *render = to_render_state(ctx); @@ -301,7 +301,7 @@ vbo_bind_vertices(struct gl_context *ctx, const struct gl_client_array **arrays, *pdelta = -1; FOR_EACH_BOUND_ATTR(render, i, attr) { - const struct gl_client_array *array = arrays[attr]; + const struct gl_vertex_array *array = arrays[attr]; struct gl_buffer_object *obj = array->BufferObj; struct nouveau_array *a = &render->attrs[attr]; unsigned delta = (base + min_index) * array->StrideB; @@ -355,7 +355,7 @@ vbo_bind_vertices(struct gl_context *ctx, const struct gl_client_array **arrays, } static void -vbo_draw_vbo(struct gl_context *ctx, const struct gl_client_array **arrays, +vbo_draw_vbo(struct gl_context *ctx, const struct gl_vertex_array **arrays, const struct _mesa_prim *prims, GLuint nr_prims, const struct _mesa_index_buffer *ib, GLuint min_index, GLuint max_index) @@ -405,7 +405,7 @@ extract_id(struct nouveau_array *a, int i, int j) } static void -vbo_draw_imm(struct gl_context *ctx, const struct gl_client_array **arrays, +vbo_draw_imm(struct gl_context *ctx, const struct gl_vertex_array **arrays, const struct _mesa_prim *prims, GLuint nr_prims, const struct _mesa_index_buffer *ib, GLuint min_index, GLuint max_index) @@ -460,7 +460,7 @@ TAG(vbo_render_prims)(struct gl_context *ctx, struct gl_buffer_object *indirect) { struct nouveau_render_state *render = to_render_state(ctx); - const struct gl_client_array **arrays = ctx->Array._DrawArrays; + const struct gl_vertex_array **arrays = ctx->Array._DrawArrays; if (!index_bounds_valid) vbo_get_minmax_indices(ctx, prims, ib, &min_index, &max_index, diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c index a54889bbe1a..ab1b834b6d9 100644 --- a/src/mesa/main/arrayobj.c +++ b/src/mesa/main/arrayobj.c @@ -340,7 +340,7 @@ remove_array_object(struct gl_context *ctx, struct gl_vertex_array_object *vao) /** - * Updates the derived gl_client_arrays when a gl_vertex_attrib_array + * Updates the derived gl_vertex_arrays when a gl_vertex_attrib_array * or a gl_vertex_buffer_binding has changed. */ void @@ -351,7 +351,7 @@ _mesa_update_vao_client_arrays(struct gl_context *ctx, while (arrays) { const int attrib = u_bit_scan64(&arrays); - struct gl_client_array *client_array = &vao->_VertexAttrib[attrib]; + struct gl_vertex_array *client_array = &vao->_VertexAttrib[attrib]; const struct gl_array_attributes *attrib_array = &vao->VertexAttrib[attrib]; const struct gl_vertex_buffer_binding *buffer_binding = diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 210a161de6f..75764cc4e45 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1332,9 +1332,11 @@ struct gl_pixelstore_attrib /** - * Client vertex array attributes + * Vertex array information which is derived from gl_array_attributes + * and gl_vertex_buffer_binding information. Used by the VBO module and + * device drivers. */ -struct gl_client_array +struct gl_vertex_array { GLint Size; /**< components per element (1,2,3,4) */ GLenum Type; /**< datatype: GL_FLOAT, GL_INT, etc */ @@ -1439,7 +1441,7 @@ struct gl_vertex_array_object * This is a legacy data structure created from gl_vertex_attrib_array and * gl_vertex_buffer_binding, for compatibility with existing driver code. */ - struct gl_client_array _VertexAttrib[VERT_ATTRIB_MAX]; + struct gl_vertex_array _VertexAttrib[VERT_ATTRIB_MAX]; /** Vertex attribute arrays */ struct gl_array_attributes VertexAttrib[VERT_ATTRIB_MAX]; @@ -1530,7 +1532,7 @@ struct gl_array_attrib * Vertex arrays as consumed by a driver. * The array pointer is set up only by the VBO module. */ - const struct gl_client_array **_DrawArrays; /**< 0..VERT_ATTRIB_MAX-1 */ + const struct gl_vertex_array **_DrawArrays; /**< 0..VERT_ATTRIB_MAX-1 */ /** Legal array datatypes and the API for which they have been computed */ GLbitfield LegalTypesMask; diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c index 59f1779b0c5..656cb3479c7 100644 --- a/src/mesa/main/varray.c +++ b/src/mesa/main/varray.c @@ -2313,8 +2313,8 @@ _mesa_VertexArrayBindingDivisor(GLuint vaobj, GLuint bindingIndex, */ void _mesa_copy_client_array(struct gl_context *ctx, - struct gl_client_array *dst, - struct gl_client_array *src) + struct gl_vertex_array *dst, + struct gl_vertex_array *src) { dst->Size = src->Size; dst->Type = src->Type; diff --git a/src/mesa/main/varray.h b/src/mesa/main/varray.h index bc1c0c6f720..8c30d16ea3a 100644 --- a/src/mesa/main/varray.h +++ b/src/mesa/main/varray.h @@ -31,7 +31,7 @@ #include "glheader.h" #include "bufferobj.h" -struct gl_client_array; +struct gl_vertex_array; struct gl_context; /** @@ -50,12 +50,12 @@ _mesa_vertex_attrib_address(const struct gl_array_attributes *array, } /** - * Sets the fields in a gl_client_array to values derived from a + * Sets the fields in a gl_vertex_array to values derived from a * gl_vertex_attrib_array and a gl_vertex_buffer_binding. */ static inline void _mesa_update_client_array(struct gl_context *ctx, - struct gl_client_array *dst, + struct gl_vertex_array *dst, const struct gl_array_attributes *src, const struct gl_vertex_buffer_binding *binding) { @@ -373,8 +373,8 @@ _mesa_VertexArrayBindingDivisor(GLuint vaobj, GLuint bindingIndex, GLuint diviso extern void _mesa_copy_client_array(struct gl_context *ctx, - struct gl_client_array *dst, - struct gl_client_array *src); + struct gl_vertex_array *dst, + struct gl_vertex_array *src); extern void _mesa_copy_vertex_attrib_array(struct gl_context *ctx, diff --git a/src/mesa/state_tracker/st_atom.c b/src/mesa/state_tracker/st_atom.c index 6f06d64d202..65ac5170fdf 100644 --- a/src/mesa/state_tracker/st_atom.c +++ b/src/mesa/state_tracker/st_atom.c @@ -120,7 +120,7 @@ static void check_program_state( struct st_context *st ) static void check_attrib_edgeflag(struct st_context *st) { - const struct gl_client_array **arrays = st->ctx->Array._DrawArrays; + const struct gl_vertex_array **arrays = st->ctx->Array._DrawArrays; GLboolean vertdata_edgeflags, edgeflag_culls_prims, edgeflags_enabled; struct gl_program *vp = st->ctx->VertexProgram._Current; diff --git a/src/mesa/state_tracker/st_atom_array.c b/src/mesa/state_tracker/st_atom_array.c index e5b949fbaec..5ab10de83a2 100644 --- a/src/mesa/state_tracker/st_atom_array.c +++ b/src/mesa/state_tracker/st_atom_array.c @@ -310,9 +310,9 @@ st_pipe_vertex_format(GLenum type, GLuint size, GLenum format, return PIPE_FORMAT_NONE; /* silence compiler warning */ } -static const struct gl_client_array * +static const struct gl_vertex_array * get_client_array(const struct st_vertex_program *vp, - const struct gl_client_array **arrays, + const struct gl_vertex_array **arrays, int attr) { const GLuint mesaAttr = vp->index_to_input[attr]; @@ -329,7 +329,7 @@ get_client_array(const struct st_vertex_program *vp, static GLboolean is_interleaved_arrays(const struct st_vertex_program *vp, const struct st_vp_variant *vpv, - const struct gl_client_array **arrays) + const struct gl_vertex_array **arrays) { GLuint attr; const struct gl_buffer_object *firstBufObj = NULL; @@ -338,7 +338,7 @@ is_interleaved_arrays(const struct st_vertex_program *vp, GLboolean userSpaceBuffer = GL_FALSE; for (attr = 0; attr < vpv->num_inputs; attr++) { - const struct gl_client_array *array; + const struct gl_vertex_array *array; const struct gl_buffer_object *bufObj; GLsizei stride; @@ -444,7 +444,7 @@ static boolean setup_interleaved_attribs(struct st_context *st, const struct st_vertex_program *vp, const struct st_vp_variant *vpv, - const struct gl_client_array **arrays, + const struct gl_vertex_array **arrays, struct pipe_vertex_buffer *vbuffer, struct pipe_vertex_element velements[]) { @@ -458,7 +458,7 @@ setup_interleaved_attribs(struct st_context *st, * Init bufobj and stride. */ if (vpv->num_inputs) { - const struct gl_client_array *array; + const struct gl_vertex_array *array; array = get_client_array(vp, arrays, 0); assert(array); @@ -492,7 +492,7 @@ setup_interleaved_attribs(struct st_context *st, usingVBO = _mesa_is_bufferobj(bufobj); for (attr = 0; attr < vpv->num_inputs;) { - const struct gl_client_array *array; + const struct gl_vertex_array *array; unsigned src_offset; unsigned src_format; @@ -557,7 +557,7 @@ static boolean setup_non_interleaved_attribs(struct st_context *st, const struct st_vertex_program *vp, const struct st_vp_variant *vpv, - const struct gl_client_array **arrays, + const struct gl_vertex_array **arrays, struct pipe_vertex_buffer vbuffer[], struct pipe_vertex_element velements[], unsigned *num_vbuffers) @@ -569,7 +569,7 @@ setup_non_interleaved_attribs(struct st_context *st, for (attr = 0; attr < vpv->num_inputs;) { const GLuint mesaAttr = vp->index_to_input[attr]; - const struct gl_client_array *array; + const struct gl_vertex_array *array; struct gl_buffer_object *bufobj; GLsizei stride; unsigned src_format; @@ -587,7 +587,7 @@ setup_non_interleaved_attribs(struct st_context *st, if (_mesa_is_bufferobj(bufobj)) { /* Attribute data is in a VBO. - * Recall that for VBOs, the gl_client_array->Ptr field is + * Recall that for VBOs, the gl_vertex_array->Ptr field is * really an offset from the start of the VBO, not a pointer. */ struct st_buffer_object *stobj = st_buffer_object(bufobj); @@ -640,7 +640,7 @@ setup_non_interleaved_attribs(struct st_context *st, static void update_array(struct st_context *st) { struct gl_context *ctx = st->ctx; - const struct gl_client_array **arrays = ctx->Array._DrawArrays; + const struct gl_vertex_array **arrays = ctx->Array._DrawArrays; const struct st_vertex_program *vp; const struct st_vp_variant *vpv; struct pipe_vertex_buffer vbuffer[PIPE_MAX_SHADER_INPUTS]; diff --git a/src/mesa/state_tracker/st_cb_rasterpos.c b/src/mesa/state_tracker/st_cb_rasterpos.c index 5dda0e2c8b7..85184540553 100644 --- a/src/mesa/state_tracker/st_cb_rasterpos.c +++ b/src/mesa/state_tracker/st_cb_rasterpos.c @@ -59,8 +59,8 @@ struct rastpos_stage struct gl_context *ctx; /**< Rendering context */ /* vertex attrib info we can setup once and re-use */ - struct gl_client_array array[VERT_ATTRIB_MAX]; - const struct gl_client_array *arrays[VERT_ATTRIB_MAX]; + struct gl_vertex_array array[VERT_ATTRIB_MAX]; + const struct gl_vertex_array *arrays[VERT_ATTRIB_MAX]; struct _mesa_prim prim; }; @@ -221,7 +221,7 @@ st_RasterPos(struct gl_context *ctx, const GLfloat v[4]) struct st_context *st = st_context(ctx); struct draw_context *draw = st_get_draw_context(st); struct rastpos_stage *rs; - const struct gl_client_array **saved_arrays = ctx->Array._DrawArrays; + const struct gl_vertex_array **saved_arrays = ctx->Array._DrawArrays; if (!st->draw) return; diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c index e9f25b625fd..c1a1d2d1419 100644 --- a/src/mesa/state_tracker/st_draw.c +++ b/src/mesa/state_tracker/st_draw.c @@ -71,7 +71,7 @@ * only interested in per-vertex data. See bug 38626. */ static GLboolean -all_varyings_in_vbos(const struct gl_client_array *arrays[]) +all_varyings_in_vbos(const struct gl_vertex_array *arrays[]) { GLuint i; @@ -187,7 +187,7 @@ st_draw_vbo(struct gl_context *ctx, struct st_context *st = st_context(ctx); struct pipe_index_buffer ibuffer = {0}; struct pipe_draw_info info; - const struct gl_client_array **arrays = ctx->Array._DrawArrays; + const struct gl_vertex_array **arrays = ctx->Array._DrawArrays; unsigned i; /* Mesa core state should have been validated already */ diff --git a/src/mesa/state_tracker/st_draw.h b/src/mesa/state_tracker/st_draw.h index fc863819c7e..2c69ca4c478 100644 --- a/src/mesa/state_tracker/st_draw.h +++ b/src/mesa/state_tracker/st_draw.h @@ -39,7 +39,7 @@ struct _mesa_index_buffer; struct _mesa_prim; -struct gl_client_array; +struct gl_vertex_array; struct gl_context; struct st_context; diff --git a/src/mesa/state_tracker/st_draw_feedback.c b/src/mesa/state_tracker/st_draw_feedback.c index 6cc7dd77701..fac83b97d9c 100644 --- a/src/mesa/state_tracker/st_draw_feedback.c +++ b/src/mesa/state_tracker/st_draw_feedback.c @@ -131,7 +131,7 @@ st_feedback_draw_vbo(struct gl_context *ctx, struct pipe_index_buffer ibuffer; struct pipe_transfer *vb_transfer[PIPE_MAX_ATTRIBS] = {NULL}; struct pipe_transfer *ib_transfer = NULL; - const struct gl_client_array **arrays = ctx->Array._DrawArrays; + const struct gl_vertex_array **arrays = ctx->Array._DrawArrays; GLuint attr, i; const GLubyte *low_addr = NULL; const void *mapped_indices = NULL; @@ -188,7 +188,7 @@ st_feedback_draw_vbo(struct gl_context *ctx, if (bufobj && bufobj->Name) { /* Attribute data is in a VBO. - * Recall that for VBOs, the gl_client_array->Ptr field is + * Recall that for VBOs, the gl_vertex_array->Ptr field is * really an offset from the start of the VBO, not a pointer. */ struct st_buffer_object *stobj = st_buffer_object(bufobj); diff --git a/src/mesa/tnl/t_draw.c b/src/mesa/tnl/t_draw.c index 6f29abbe1ba..24d74c0e1f1 100644 --- a/src/mesa/tnl/t_draw.c +++ b/src/mesa/tnl/t_draw.c @@ -95,7 +95,7 @@ static void free_space(struct gl_context *ctx) * \param fptr output/float array */ static void -convert_bgra_to_float(const struct gl_client_array *input, +convert_bgra_to_float(const struct gl_vertex_array *input, const GLubyte *ptr, GLfloat *fptr, GLuint count ) { @@ -113,7 +113,7 @@ convert_bgra_to_float(const struct gl_client_array *input, } static void -convert_half_to_float(const struct gl_client_array *input, +convert_half_to_float(const struct gl_vertex_array *input, const GLubyte *ptr, GLfloat *fptr, GLuint count, GLuint sz) { @@ -140,7 +140,7 @@ convert_half_to_float(const struct gl_client_array *input, * is used to map the fixed-point numbers into the range [-1, 1]. */ static void -convert_fixed_to_float(const struct gl_client_array *input, +convert_fixed_to_float(const struct gl_vertex_array *input, const GLubyte *ptr, GLfloat *fptr, GLuint count) { @@ -173,7 +173,7 @@ convert_fixed_to_float(const struct gl_client_array *input, static void _tnl_import_array( struct gl_context *ctx, GLuint attrib, GLuint count, - const struct gl_client_array *input, + const struct gl_vertex_array *input, const GLubyte *ptr ) { TNLcontext *tnl = TNL_CONTEXT(ctx); @@ -267,7 +267,7 @@ static GLboolean *_tnl_import_edgeflag( struct gl_context *ctx, static void bind_inputs( struct gl_context *ctx, - const struct gl_client_array *inputs[], + const struct gl_vertex_array *inputs[], GLint count, struct gl_buffer_object **bo, GLuint *nr_bo ) @@ -430,7 +430,7 @@ void _tnl_draw_prims(struct gl_context *ctx, struct gl_buffer_object *indirect) { TNLcontext *tnl = TNL_CONTEXT(ctx); - const struct gl_client_array **arrays = ctx->Array._DrawArrays; + const struct gl_vertex_array **arrays = ctx->Array._DrawArrays; const GLuint TEST_SPLIT = 0; const GLint max = TEST_SPLIT ? 8 : tnl->vb.Size - MAX_CLIPPED_VERTICES; GLint max_basevertex = prim->basevertex; diff --git a/src/mesa/tnl/tnl.h b/src/mesa/tnl/tnl.h index 5a9938e7afb..7f425a58d28 100644 --- a/src/mesa/tnl/tnl.h +++ b/src/mesa/tnl/tnl.h @@ -30,7 +30,7 @@ #include "main/glheader.h" -struct gl_client_array; +struct gl_vertex_array; struct gl_context; struct gl_program; diff --git a/src/mesa/vbo/vbo.h b/src/mesa/vbo/vbo.h index 73478e666dc..d62ab4e674b 100644 --- a/src/mesa/vbo/vbo.h +++ b/src/mesa/vbo/vbo.h @@ -39,7 +39,7 @@ extern "C" { #endif -struct gl_client_array; +struct gl_vertex_array; struct gl_context; struct gl_transform_feedback_object; @@ -139,7 +139,7 @@ struct split_limits { void vbo_split_prims( struct gl_context *ctx, - const struct gl_client_array *arrays[], + const struct gl_vertex_array *arrays[], const struct _mesa_prim *prim, GLuint nr_prims, const struct _mesa_index_buffer *ib, @@ -151,11 +151,11 @@ void vbo_split_prims( struct gl_context *ctx, /* Helpers for dealing translating away non-zero min_index. */ -GLboolean vbo_all_varyings_in_vbos( const struct gl_client_array *arrays[] ); -GLboolean vbo_any_varyings_in_vbos( const struct gl_client_array *arrays[] ); +GLboolean vbo_all_varyings_in_vbos( const struct gl_vertex_array *arrays[] ); +GLboolean vbo_any_varyings_in_vbos( const struct gl_vertex_array *arrays[] ); void vbo_rebase_prims( struct gl_context *ctx, - const struct gl_client_array *arrays[], + const struct gl_vertex_array *arrays[], const struct _mesa_prim *prim, GLuint nr_prims, const struct _mesa_index_buffer *ib, diff --git a/src/mesa/vbo/vbo_context.c b/src/mesa/vbo/vbo_context.c index 7a5bd5184f0..7022fe96cab 100644 --- a/src/mesa/vbo/vbo_context.c +++ b/src/mesa/vbo/vbo_context.c @@ -47,7 +47,7 @@ static GLuint check_size( const GLfloat *attr ) * Helper for initializing a vertex array. */ static void -init_array(struct gl_context *ctx, struct gl_client_array *cl, +init_array(struct gl_context *ctx, struct gl_vertex_array *cl, unsigned size, const void *pointer) { memset(cl, 0, sizeof(*cl)); @@ -77,7 +77,7 @@ static void init_legacy_currval(struct gl_context *ctx) * attribute: */ for (i = 0; i < VERT_ATTRIB_FF_MAX; i++) { - struct gl_client_array *cl = &vbo->currval[VERT_ATTRIB_FF(i)]; + struct gl_vertex_array *cl = &vbo->currval[VERT_ATTRIB_FF(i)]; init_array(ctx, cl, check_size(ctx->Current.Attrib[i]), @@ -92,7 +92,7 @@ static void init_generic_currval(struct gl_context *ctx) GLuint i; for (i = 0; i < VERT_ATTRIB_GENERIC_MAX; i++) { - struct gl_client_array *cl = &vbo->currval[VBO_ATTRIB_GENERIC0 + i]; + struct gl_vertex_array *cl = &vbo->currval[VBO_ATTRIB_GENERIC0 + i]; init_array(ctx, cl, 1, ctx->Current.Attrib[VERT_ATTRIB_GENERIC0 + i]); } @@ -108,7 +108,7 @@ static void init_mat_currval(struct gl_context *ctx) * attribute: */ for (i = 0; i < MAT_ATTRIB_MAX; i++) { - struct gl_client_array *cl = + struct gl_vertex_array *cl = &vbo->currval[VBO_ATTRIB_MAT_FRONT_AMBIENT + i]; unsigned size; diff --git a/src/mesa/vbo/vbo_context.h b/src/mesa/vbo/vbo_context.h index 11f9b17c7c4..5cf399ffcd7 100644 --- a/src/mesa/vbo/vbo_context.h +++ b/src/mesa/vbo/vbo_context.h @@ -63,7 +63,7 @@ extern "C" { #endif struct vbo_context { - struct gl_client_array currval[VBO_ATTRIB_MAX]; + struct gl_vertex_array currval[VBO_ATTRIB_MAX]; /** Map VERT_ATTRIB_x to VBO_ATTRIB_y */ GLuint map_vp_none[VERT_ATTRIB_MAX]; diff --git a/src/mesa/vbo/vbo_exec.h b/src/mesa/vbo/vbo_exec.h index b1508839450..9358ca2acf1 100644 --- a/src/mesa/vbo/vbo_exec.h +++ b/src/mesa/vbo/vbo_exec.h @@ -109,13 +109,13 @@ struct vbo_exec_context /** pointers into the current 'vertex' array, declared above */ fi_type *attrptr[VBO_ATTRIB_MAX]; - struct gl_client_array arrays[VERT_ATTRIB_MAX]; + struct gl_vertex_array arrays[VERT_ATTRIB_MAX]; /* According to program mode, the values above plus current * values are squashed down to the 32 attributes passed to the * vertex program below: */ - const struct gl_client_array *inputs[VERT_ATTRIB_MAX]; + const struct gl_vertex_array *inputs[VERT_ATTRIB_MAX]; } vtx; struct { @@ -129,7 +129,7 @@ struct vbo_exec_context * mode, etc. These are the attributes as seen by vertex * programs: */ - const struct gl_client_array *inputs[VERT_ATTRIB_MAX]; + const struct gl_vertex_array *inputs[VERT_ATTRIB_MAX]; GLboolean recalculate_inputs; } array; diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c index cbf78b49631..fffff0b3bf0 100644 --- a/src/mesa/vbo/vbo_exec_api.c +++ b/src/mesa/vbo/vbo_exec_api.c @@ -1182,13 +1182,13 @@ vbo_exec_vtx_init(struct vbo_exec_context *exec) } { - struct gl_client_array *arrays = exec->vtx.arrays; + struct gl_vertex_array *arrays = exec->vtx.arrays; unsigned i; memcpy(arrays, &vbo->currval[VBO_ATTRIB_POS], VERT_ATTRIB_FF_MAX * sizeof(arrays[0])); for (i = 0; i < VERT_ATTRIB_FF_MAX; ++i) { - struct gl_client_array *array; + struct gl_vertex_array *array; array = &arrays[VERT_ATTRIB_FF(i)]; array->BufferObj = NULL; _mesa_reference_buffer_object(ctx, &array->BufferObj, @@ -1200,7 +1200,7 @@ vbo_exec_vtx_init(struct vbo_exec_context *exec) VERT_ATTRIB_GENERIC_MAX * sizeof(arrays[0])); for (i = 0; i < VERT_ATTRIB_GENERIC_MAX; ++i) { - struct gl_client_array *array; + struct gl_vertex_array *array; array = &arrays[VERT_ATTRIB_GENERIC(i)]; array->BufferObj = NULL; _mesa_reference_buffer_object(ctx, &array->BufferObj, diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c index 08030c454ce..6a96167fbbc 100644 --- a/src/mesa/vbo/vbo_exec_array.c +++ b/src/mesa/vbo/vbo_exec_array.c @@ -243,8 +243,8 @@ recalculate_input_bindings(struct gl_context *ctx) struct vbo_context *vbo = vbo_context(ctx); struct vbo_exec_context *exec = &vbo->exec; const struct gl_array_attributes *array = ctx->Array.VAO->VertexAttrib; - struct gl_client_array *vertexAttrib = ctx->Array.VAO->_VertexAttrib; - const struct gl_client_array **inputs = &exec->array.inputs[0]; + struct gl_vertex_array *vertexAttrib = ctx->Array.VAO->_VertexAttrib; + const struct gl_vertex_array **inputs = &exec->array.inputs[0]; GLbitfield64 const_inputs = 0x0; GLuint i; diff --git a/src/mesa/vbo/vbo_exec_draw.c b/src/mesa/vbo/vbo_exec_draw.c index 3d1b2f71648..c2fcb663cbe 100644 --- a/src/mesa/vbo/vbo_exec_draw.c +++ b/src/mesa/vbo/vbo_exec_draw.c @@ -174,7 +174,7 @@ vbo_exec_bind_arrays( struct gl_context *ctx ) { struct vbo_context *vbo = vbo_context(ctx); struct vbo_exec_context *exec = &vbo->exec; - struct gl_client_array *arrays = exec->vtx.arrays; + struct gl_vertex_array *arrays = exec->vtx.arrays; const GLuint *map; GLuint attr; GLbitfield64 varying_inputs = 0x0; diff --git a/src/mesa/vbo/vbo_rebase.c b/src/mesa/vbo/vbo_rebase.c index 24c04ca7e6a..f40c59fdf35 100644 --- a/src/mesa/vbo/vbo_rebase.c +++ b/src/mesa/vbo/vbo_rebase.c @@ -79,7 +79,7 @@ REBASE(GLuint) REBASE(GLushort) REBASE(GLubyte) -GLboolean vbo_all_varyings_in_vbos( const struct gl_client_array *arrays[] ) +GLboolean vbo_all_varyings_in_vbos( const struct gl_vertex_array *arrays[] ) { GLuint i; @@ -91,7 +91,7 @@ GLboolean vbo_all_varyings_in_vbos( const struct gl_client_array *arrays[] ) return GL_TRUE; } -GLboolean vbo_any_varyings_in_vbos( const struct gl_client_array *arrays[] ) +GLboolean vbo_any_varyings_in_vbos( const struct gl_vertex_array *arrays[] ) { GLuint i; @@ -122,7 +122,7 @@ GLboolean vbo_any_varyings_in_vbos( const struct gl_client_array *arrays[] ) * all or nothing. */ void vbo_rebase_prims( struct gl_context *ctx, - const struct gl_client_array *arrays[], + const struct gl_vertex_array *arrays[], const struct _mesa_prim *prim, GLuint nr_prims, const struct _mesa_index_buffer *ib, @@ -130,12 +130,12 @@ void vbo_rebase_prims( struct gl_context *ctx, GLuint max_index, vbo_draw_func draw ) { - struct gl_client_array tmp_arrays[VERT_ATTRIB_MAX]; - const struct gl_client_array *tmp_array_pointers[VERT_ATTRIB_MAX]; + struct gl_vertex_array tmp_arrays[VERT_ATTRIB_MAX]; + const struct gl_vertex_array *tmp_array_pointers[VERT_ATTRIB_MAX]; struct _mesa_index_buffer tmp_ib; struct _mesa_prim *tmp_prims = NULL; - const struct gl_client_array **saved_arrays = ctx->Array._DrawArrays; + const struct gl_vertex_array **saved_arrays = ctx->Array._DrawArrays; void *tmp_indices = NULL; GLuint i; diff --git a/src/mesa/vbo/vbo_save.c b/src/mesa/vbo/vbo_save.c index 79603e9b32e..9e83b59623c 100644 --- a/src/mesa/vbo/vbo_save.c +++ b/src/mesa/vbo/vbo_save.c @@ -46,13 +46,13 @@ void vbo_save_init( struct gl_context *ctx ) vbo_save_api_init( save ); { - struct gl_client_array *arrays = save->arrays; + struct gl_vertex_array *arrays = save->arrays; unsigned i; memcpy(arrays, &vbo->currval[VBO_ATTRIB_POS], VERT_ATTRIB_FF_MAX * sizeof(arrays[0])); for (i = 0; i < VERT_ATTRIB_FF_MAX; ++i) { - struct gl_client_array *array; + struct gl_vertex_array *array; array = &arrays[VERT_ATTRIB_FF(i)]; array->BufferObj = NULL; _mesa_reference_buffer_object(ctx, &arrays->BufferObj, @@ -64,7 +64,7 @@ void vbo_save_init( struct gl_context *ctx ) VERT_ATTRIB_GENERIC_MAX * sizeof(arrays[0])); for (i = 0; i < VERT_ATTRIB_GENERIC_MAX; ++i) { - struct gl_client_array *array; + struct gl_vertex_array *array; array = &arrays[VERT_ATTRIB_GENERIC(i)]; array->BufferObj = NULL; _mesa_reference_buffer_object(ctx, &array->BufferObj, diff --git a/src/mesa/vbo/vbo_save.h b/src/mesa/vbo/vbo_save.h index d1d7fb07395..485b7b17c70 100644 --- a/src/mesa/vbo/vbo_save.h +++ b/src/mesa/vbo/vbo_save.h @@ -124,8 +124,8 @@ struct vbo_save_context { struct gl_context *ctx; GLvertexformat vtxfmt; GLvertexformat vtxfmt_noop; /**< Used if out_of_memory is true */ - struct gl_client_array arrays[VBO_ATTRIB_MAX]; - const struct gl_client_array *inputs[VBO_ATTRIB_MAX]; + struct gl_vertex_array arrays[VBO_ATTRIB_MAX]; + const struct gl_vertex_array *inputs[VBO_ATTRIB_MAX]; GLbitfield64 enabled; /**< mask of enabled vbo arrays. */ GLubyte attrsz[VBO_ATTRIB_MAX]; /**< 1, 2, 3 or 4 */ diff --git a/src/mesa/vbo/vbo_save_draw.c b/src/mesa/vbo/vbo_save_draw.c index 2aa00952037..e718f29496a 100644 --- a/src/mesa/vbo/vbo_save_draw.c +++ b/src/mesa/vbo/vbo_save_draw.c @@ -135,7 +135,7 @@ static void vbo_bind_vertex_list(struct gl_context *ctx, { struct vbo_context *vbo = vbo_context(ctx); struct vbo_save_context *save = &vbo->save; - struct gl_client_array *arrays = save->arrays; + struct gl_vertex_array *arrays = save->arrays; GLuint buffer_offset = node->buffer_offset; const GLuint *map; GLuint attr; diff --git a/src/mesa/vbo/vbo_split.c b/src/mesa/vbo/vbo_split.c index 79d7dd40834..611d4cafbdf 100644 --- a/src/mesa/vbo/vbo_split.c +++ b/src/mesa/vbo/vbo_split.c @@ -99,7 +99,7 @@ GLboolean split_prim_inplace(GLenum mode, GLuint *first, GLuint *incr) void vbo_split_prims( struct gl_context *ctx, - const struct gl_client_array *arrays[], + const struct gl_vertex_array *arrays[], const struct _mesa_prim *prim, GLuint nr_prims, const struct _mesa_index_buffer *ib, diff --git a/src/mesa/vbo/vbo_split.h b/src/mesa/vbo/vbo_split.h index 16276ecc33f..a8c940da934 100644 --- a/src/mesa/vbo/vbo_split.h +++ b/src/mesa/vbo/vbo_split.h @@ -50,7 +50,7 @@ GLboolean split_prim_inplace(GLenum mode, GLuint *first, GLuint *incr); void vbo_split_inplace( struct gl_context *ctx, - const struct gl_client_array *arrays[], + const struct gl_vertex_array *arrays[], const struct _mesa_prim *prim, GLuint nr_prims, const struct _mesa_index_buffer *ib, @@ -62,7 +62,7 @@ void vbo_split_inplace( struct gl_context *ctx, /* Requires ib != NULL: */ void vbo_split_copy( struct gl_context *ctx, - const struct gl_client_array *arrays[], + const struct gl_vertex_array *arrays[], const struct _mesa_prim *prim, GLuint nr_prims, const struct _mesa_index_buffer *ib, diff --git a/src/mesa/vbo/vbo_split_copy.c b/src/mesa/vbo/vbo_split_copy.c index ac4fe9e8127..ce8831dbb0c 100644 --- a/src/mesa/vbo/vbo_split_copy.c +++ b/src/mesa/vbo/vbo_split_copy.c @@ -52,7 +52,7 @@ struct copy_context { struct gl_context *ctx; - const struct gl_client_array **array; + const struct gl_vertex_array **array; const struct _mesa_prim *prim; GLuint nr_prims; const struct _mesa_index_buffer *ib; @@ -63,15 +63,15 @@ struct copy_context { struct { GLuint attr; GLuint size; - const struct gl_client_array *array; + const struct gl_vertex_array *array; const GLubyte *src_ptr; - struct gl_client_array dstarray; + struct gl_vertex_array dstarray; } varying[VERT_ATTRIB_MAX]; GLuint nr_varying; - const struct gl_client_array *dstarray_ptr[VERT_ATTRIB_MAX]; + const struct gl_vertex_array *dstarray_ptr[VERT_ATTRIB_MAX]; struct _mesa_index_buffer dstib; GLuint *translated_elt_buf; @@ -104,7 +104,7 @@ struct copy_context { }; -static GLuint attr_size( const struct gl_client_array *array ) +static GLuint attr_size( const struct gl_vertex_array *array ) { return array->Size * _mesa_sizeof_type(array->Type); } @@ -140,7 +140,7 @@ check_flush( struct copy_context *copy ) */ static void dump_draw_info(struct gl_context *ctx, - const struct gl_client_array **arrays, + const struct gl_vertex_array **arrays, const struct _mesa_prim *prims, GLuint nr_prims, const struct _mesa_index_buffer *ib, @@ -174,7 +174,7 @@ static void flush( struct copy_context *copy ) { struct gl_context *ctx = copy->ctx; - const struct gl_client_array **saved_arrays = ctx->Array._DrawArrays; + const struct gl_vertex_array **saved_arrays = ctx->Array._DrawArrays; GLuint i; /* Set some counters: @@ -258,7 +258,7 @@ elt(struct copy_context *copy, GLuint elt_idx) /* printf(" --> emit to dstelt %d\n", copy->dstbuf_nr); */ for (i = 0; i < copy->nr_varying; i++) { - const struct gl_client_array *srcarray = copy->varying[i].array; + const struct gl_vertex_array *srcarray = copy->varying[i].array; const GLubyte *srcptr = copy->varying[i].src_ptr + elt * srcarray->StrideB; memcpy(csr, srcptr, copy->varying[i].size); @@ -521,8 +521,8 @@ replay_init( struct copy_context *copy ) /* Setup new vertex arrays to point into the output buffer: */ for (offset = 0, i = 0; i < copy->nr_varying; i++) { - const struct gl_client_array *src = copy->varying[i].array; - struct gl_client_array *dst = ©->varying[i].dstarray; + const struct gl_vertex_array *src = copy->varying[i].array; + struct gl_vertex_array *dst = ©->varying[i].dstarray; dst->Size = src->Size; dst->Type = src->Type; @@ -593,7 +593,7 @@ replay_finish( struct copy_context *copy ) * Split VBO into smaller pieces, draw the pieces. */ void vbo_split_copy( struct gl_context *ctx, - const struct gl_client_array *arrays[], + const struct gl_vertex_array *arrays[], const struct _mesa_prim *prim, GLuint nr_prims, const struct _mesa_index_buffer *ib, diff --git a/src/mesa/vbo/vbo_split_inplace.c b/src/mesa/vbo/vbo_split_inplace.c index cff4bcd30ff..1430ac98960 100644 --- a/src/mesa/vbo/vbo_split_inplace.c +++ b/src/mesa/vbo/vbo_split_inplace.c @@ -42,7 +42,7 @@ */ struct split_context { struct gl_context *ctx; - const struct gl_client_array **array; + const struct gl_vertex_array **array; const struct _mesa_prim *prim; GLuint nr_prims; const struct _mesa_index_buffer *ib; @@ -63,7 +63,7 @@ struct split_context { static void flush_vertex( struct split_context *split ) { struct gl_context *ctx = split->ctx; - const struct gl_client_array **saved_arrays = ctx->Array._DrawArrays; + const struct gl_vertex_array **saved_arrays = ctx->Array._DrawArrays; struct _mesa_index_buffer ib; GLuint i; @@ -262,7 +262,7 @@ static void split_prims( struct split_context *split) void vbo_split_inplace( struct gl_context *ctx, - const struct gl_client_array *arrays[], + const struct gl_vertex_array *arrays[], const struct _mesa_prim *prim, GLuint nr_prims, const struct _mesa_index_buffer *ib, |