summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/varray.c
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2014-02-01 20:48:51 -0800
committerKenneth Graunke <[email protected]>2014-02-03 00:53:07 -0800
commitde47fd2668961503bbdaaf1194e7bb435ad5dbb7 (patch)
tree70ecd5828312061a0a76bf1837b53615d692efa8 /src/mesa/main/varray.c
parentaac1415b66fafedc50c4346dae2d652723156ed9 (diff)
mesa: Rename _mesa_..._array_obj functions to _mesa_..._vao.
_mesa_update_vao_client_arrays() is less of a mouthful than _mesa_update_array_object_client_arrays(), and generally clearer. Generated by: $ find . -type f -print0 | xargs -0 sed -i \ 's/_mesa_\([^_]*\)_array_object/_mesa_\1_vao/g' with manual whitespace and indentation fixes applied. Signed-off-by: Kenneth Graunke <[email protected]> Reviewed-by: Jordan Justen <[email protected]> Reviewed-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/main/varray.c')
-rw-r--r--src/mesa/main/varray.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 068200c846f..44db2cbcd47 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -1761,7 +1761,7 @@ _mesa_print_arrays(struct gl_context *ctx)
struct gl_vertex_array_object *vao = ctx->Array.VAO;
GLuint i;
- _mesa_update_array_object_max_element(ctx, vao);
+ _mesa_update_vao_max_element(ctx, vao);
printf("Array Object %u\n", vao->Name);
if (vao->_VertexAttrib[VERT_ATTRIB_POS].Enabled)
@@ -1787,8 +1787,7 @@ void
_mesa_init_varray(struct gl_context *ctx)
{
ctx->Array.DefaultVAO = ctx->Driver.NewArrayObject(ctx, 0);
- _mesa_reference_array_object(ctx, &ctx->Array.VAO,
- ctx->Array.DefaultVAO);
+ _mesa_reference_vao(ctx, &ctx->Array.VAO, ctx->Array.DefaultVAO);
ctx->Array.ActiveTexture = 0; /* GL_ARB_multitexture */
ctx->Array.Objects = _mesa_NewHashTable();
@@ -1803,7 +1802,7 @@ delete_arrayobj_cb(GLuint id, void *data, void *userData)
{
struct gl_vertex_array_object *vao = (struct gl_vertex_array_object *) data;
struct gl_context *ctx = (struct gl_context *) userData;
- _mesa_delete_array_object(ctx, vao);
+ _mesa_delete_vao(ctx, vao);
}