mesa: Rename ArrayObj to VAO and DefaultArrayObj to DefaultVAO.
authorKenneth Graunke <kenneth@whitecape.org>
Sun, 2 Feb 2014 03:14:38 +0000 (19:14 -0800)
committerKenneth Graunke <kenneth@whitecape.org>
Mon, 3 Feb 2014 08:52:58 +0000 (00:52 -0800)
commit0dfe50f1a6cc5e1f979ac65cca4ed9359d18869d
tree19a18b64de4bbfff6da38a854e8ef1b63d57ab2f
parent81144c049bc7c12e4edcdf28f91c3c024c6e8b2b
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@whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
16 files changed:
src/mesa/drivers/common/meta.c
src/mesa/main/api_arrayelt.c
src/mesa/main/api_validate.c
src/mesa/main/arrayobj.c
src/mesa/main/attrib.c
src/mesa/main/bufferobj.c
src/mesa/main/context.c
src/mesa/main/enable.c
src/mesa/main/ffvertex_prog.c
src/mesa/main/get.c
src/mesa/main/getstring.c
src/mesa/main/mtypes.h
src/mesa/main/state.c
src/mesa/main/varray.c
src/mesa/vbo/vbo_exec_array.c
src/mesa/vbo/vbo_save_api.c