diff options
| author | Brian Paul <[email protected]> | 2016-10-26 09:33:49 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2016-10-28 09:25:30 -0700 |
| commit | c538846e313c43858fb118db012b592513c0ed29 (patch) | |
| tree | 6135053f2f97c58a680462a523471db4b3095802 /src/mesa/tnl | |
| parent | 161db1335b8dd1f3e2a9abbe82d3b8921d2da314 (diff) | |
mesa: rename gl_client_array -> gl_vertex_array
The term "client array" is a legacy thing dating back to the pre-VBO
era when _all_ vertex arrays lived in client memory.
Nowadays, it only contains vertex array state which is derived from
gl_array_attributes and gl_vertex_buffer_binding. It's used by the
VBO module and some drivers.
Reviewed-by: Anuj Phogat <[email protected]>
Diffstat (limited to 'src/mesa/tnl')
| -rw-r--r-- | src/mesa/tnl/t_draw.c | 12 | ||||
| -rw-r--r-- | src/mesa/tnl/tnl.h | 2 |
2 files changed, 7 insertions, 7 deletions
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; |