Mesa (master): mesa: Update some comments relating to VAOs.
Kenneth Graunke
kwg at kemper.freedesktop.org
Mon Feb 3 09:03:32 UTC 2014
Module: Mesa
Branch: master
Commit: cf62e5967340b97030e3e1f07c8ead14efc7414a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cf62e5967340b97030e3e1f07c8ead14efc7414a
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Sat Feb 1 20:17:06 2014 -0800
mesa: Update some comments relating to VAOs.
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/main/arrayobj.c | 5 ++++-
src/mesa/main/mtypes.h | 15 +++++++++++----
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index 46ccbdc..0b9592f 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -27,7 +27,10 @@
/**
* \file arrayobj.c
- * Functions for the GL_APPLE_vertex_array_object extension.
+ *
+ * Implementation of Vertex Array Objects (VAOs), from OpenGL 3.1+,
+ * the GL_ARB_vertex_array_object extension, or the older
+ * GL_APPLE_vertex_array_object extension.
*
* \todo
* The code in this file borrows a lot from bufferobj.c. There's a certain
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 609c63f..5fc15af 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1551,12 +1551,13 @@ struct gl_vertex_buffer_binding
/**
- * Collection of vertex arrays. Defined by the GL_APPLE_vertex_array_object
- * extension, but a nice encapsulation in any case.
+ * A representation of "Vertex Array Objects" (VAOs) from OpenGL 3.1+,
+ * GL_ARB_vertex_array_object, or the original GL_APPLE_vertex_array_object
+ * extension.
*/
struct gl_vertex_array_object
{
- /** Name of the array object as received from glGenVertexArrayAPPLE. */
+ /** Name of the VAO as received from glGenVertexArray. */
GLuint Name;
GLchar *Label; /**< GL_KHR_debug */
@@ -1584,7 +1585,12 @@ struct gl_vertex_array_object
*/
GLboolean EverBound;
- /** Derived vertex attribute arrays */
+ /**
+ * Derived vertex attribute arrays
+ *
+ * This is a legacy data structure created from gl_vertex_attrib_array and
+ * gl_vertex_buffer_binding, for compatibility with existing driver code.
+ */
struct gl_client_array _VertexAttrib[VERT_ATTRIB_MAX];
/** Vertex attribute arrays */
@@ -1605,6 +1611,7 @@ struct gl_vertex_array_object
*/
GLuint _MaxElement;
+ /** The index buffer (also known as the element array buffer in OpenGL). */
struct gl_buffer_object *IndexBufferObj;
};
More information about the mesa-commit
mailing list