Mesa (master): mesa: Rename ArrayObj to VAO and DefaultArrayObj to DefaultVAO.
Kenneth Graunke
kwg at kemper.freedesktop.org
Mon Feb 3 09:03:31 UTC 2014
Module: Mesa
Branch: master
Commit: 0dfe50f1a6cc5e1f979ac65cca4ed9359d18869d
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0dfe50f1a6cc5e1f979ac65cca4ed9359d18869d
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Sat Feb 1 19:14:38 2014 -0800
mesa: Rename ArrayObj to VAO and DefaultArrayObj to DefaultVAO.
When reading through the Mesa drawing code, it's not immediately obvious
to me that "ArrayObj" (gl_array_object) is the Vertex Array Object (VAO)
state. The comment above the structure explains this, but readers still
have to remember this and translate accordingly.
Out of context, "array object" is a fairly vague. Even in context,
"array" has a lot of meanings: glDrawArrays, vertex data stored in user
arrays, gl_client_arrays, gl_vertex_attrib_arrays, and so on.
Using the term "VAO" immediately associates these fields with the OpenGL
concept, clarifying the situation and aiding programmer sanity.
Completely generated by:
$ find . -type f -print0 | xargs -0 sed -i \
-e 's/ArrayObj;/VAO;/g' \
-e 's/->ArrayObj/->VAO/g' \
-e 's/Array\.ArrayObj/Array.VAO/g' \
-e 's/Array\.DefaultArrayObj/Array.DefaultVAO/g'
v2: Rerun command to resolve conflicts with Ian's meta patches.
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
---
src/mesa/drivers/common/meta.c | 138 ++++++++++++++++++++--------------------
src/mesa/main/api_arrayelt.c | 4 +-
src/mesa/main/api_validate.c | 36 +++++------
src/mesa/main/arrayobj.c | 8 +--
src/mesa/main/attrib.c | 32 +++++-----
src/mesa/main/bufferobj.c | 8 +--
src/mesa/main/context.c | 4 +-
src/mesa/main/enable.c | 20 +++---
src/mesa/main/ffvertex_prog.c | 2 +-
src/mesa/main/get.c | 18 +++---
src/mesa/main/getstring.c | 18 +++---
src/mesa/main/mtypes.h | 4 +-
src/mesa/main/state.c | 6 +-
src/mesa/main/varray.c | 54 ++++++++--------
src/mesa/vbo/vbo_exec_array.c | 42 ++++++------
src/mesa/vbo/vbo_save_api.c | 4 +-
16 files changed, 199 insertions(+), 199 deletions(-)
Diff: http://cgit.freedesktop.org/mesa/mesa/diff/?id=0dfe50f1a6cc5e1f979ac65cca4ed9359d18869d
More information about the mesa-commit
mailing list