diff options
| author | Kenneth Graunke <[email protected]> | 2014-02-01 20:48:51 -0800 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2014-02-03 00:53:07 -0800 |
| commit | de47fd2668961503bbdaaf1194e7bb435ad5dbb7 (patch) | |
| tree | 70ecd5828312061a0a76bf1837b53615d692efa8 /src/mesa/drivers | |
| parent | aac1415b66fafedc50c4346dae2d652723156ed9 (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/drivers')
| -rw-r--r-- | src/mesa/drivers/common/driverfuncs.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/common/meta.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c index 6d56838cd3c..6ece5d80e1a 100644 --- a/src/mesa/drivers/common/driverfuncs.c +++ b/src/mesa/drivers/common/driverfuncs.c @@ -180,8 +180,8 @@ _mesa_init_driver_functions(struct dd_function_table *driver) _mesa_init_texture_barrier_functions(driver); /* APPLE_vertex_array_object */ - driver->NewArrayObject = _mesa_new_array_object; - driver->DeleteArrayObject = _mesa_delete_array_object; + driver->NewArrayObject = _mesa_new_vao; + driver->DeleteArrayObject = _mesa_delete_vao; driver->BindArrayObject = NULL; _mesa_init_shader_object_functions(driver); diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index 65ba9e41879..f12bcaab1c4 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -729,7 +729,7 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state) if (state & MESA_META_VERTEX) { /* save vertex array object state */ - _mesa_reference_array_object(ctx, &save->VAO, + _mesa_reference_vao(ctx, &save->VAO, ctx->Array.VAO); _mesa_reference_buffer_object(ctx, &save->ArrayBufferObj, ctx->Array.ArrayBufferObj); @@ -1096,7 +1096,7 @@ _mesa_meta_end(struct gl_context *ctx) /* restore vertex array object */ _mesa_BindVertexArray(save->VAO->Name); - _mesa_reference_array_object(ctx, &save->VAO, NULL); + _mesa_reference_vao(ctx, &save->VAO, NULL); } if (state & MESA_META_VIEWPORT) { |