<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Mar 18, 2015 at 4:18 PM, Fredrik Höglund <span dir="ltr"><<a href="mailto:fredrik@kde.org" target="_blank">fredrik@kde.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">This is needed to implement glGetVertexArrayIndexediv and<br>
glGetVertexArrayIndexed64iv.<br>
---<br>
src/mesa/main/varray.c | 22 ++++++++++++++--------<br>
1 file changed, 14 insertions(+), 8 deletions(-)<br>
<br>
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c<br>
index 0faf158..13b9c01 100644<br>
--- a/src/mesa/main/varray.c<br>
+++ b/src/mesa/main/varray.c<br>
@@ -832,10 +832,11 @@ _mesa_DisableVertexArrayAttrib(GLuint vaobj, GLuint index)<br>
* not handle the 4-element GL_CURRENT_VERTEX_ATTRIB_ARB query.<br>
*/<br>
static GLuint<br>
-get_vertex_array_attrib(struct gl_context *ctx, GLuint index, GLenum pname,<br>
- const char *caller)<br>
+get_vertex_array_attrib(struct gl_context *ctx,<br></blockquote><div>This drops the const specifier on vao below. <br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
+ struct gl_vertex_array_object *vao,<br></blockquote><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
+ GLuint index, GLenum pname,<br>
+ const char *caller)<br>
{<br>
- const struct gl_vertex_array_object *vao = ctx->Array.VAO;<br>
const struct gl_vertex_attrib_array *array;<br>
<br>
if (index >= ctx->Const.Program[MESA_SHADER_VERTEX].MaxAttribs) {<br>
@@ -926,7 +927,8 @@ _mesa_GetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params)<br>
}<br>
}<br>
else {<br>
- params[0] = (GLfloat) get_vertex_array_attrib(ctx, index, pname,<br>
+ params[0] = (GLfloat) get_vertex_array_attrib(ctx, ctx->Array.VAO,<br>
+ index, pname,<br>
"glGetVertexAttribfv");<br>
}<br>
}<br>
@@ -947,7 +949,8 @@ _mesa_GetVertexAttribdv(GLuint index, GLenum pname, GLdouble *params)<br>
}<br>
}<br>
else {<br>
- params[0] = (GLdouble) get_vertex_array_attrib(ctx, index, pname,<br>
+ params[0] = (GLdouble) get_vertex_array_attrib(ctx, ctx->Array.VAO,<br>
+ index, pname,<br>
"glGetVertexAttribdv");<br>
}<br>
}<br>
@@ -969,7 +972,8 @@ _mesa_GetVertexAttribiv(GLuint index, GLenum pname, GLint *params)<br>
}<br>
}<br>
else {<br>
- params[0] = (GLint) get_vertex_array_attrib(ctx, index, pname,<br>
+ params[0] = (GLint) get_vertex_array_attrib(ctx, ctx->Array.VAO,<br>
+ index, pname,<br>
"glGetVertexAttribiv");<br>
}<br>
}<br>
@@ -989,7 +993,8 @@ _mesa_GetVertexAttribIiv(GLuint index, GLenum pname, GLint *params)<br>
}<br>
}<br>
else {<br>
- params[0] = (GLint) get_vertex_array_attrib(ctx, index, pname,<br>
+ params[0] = (GLint) get_vertex_array_attrib(ctx, ctx->Array.VAO,<br>
+ index, pname,<br>
"glGetVertexAttribIiv");<br>
}<br>
}<br>
@@ -1009,7 +1014,8 @@ _mesa_GetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params)<br>
}<br>
}<br>
else {<br>
- params[0] = get_vertex_array_attrib(ctx, index, pname,<br>
+ params[0] = get_vertex_array_attrib(ctx, ctx->Array.VAO,<br>
+ index, pname,<br>
"glGetVertexAttribIuiv");<br>
}<br>
}<br>
<span class=""><font color="#888888">--<br>
1.8.5.3<br>
<br>
_______________________________________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a><br>
<a href="http://lists.freedesktop.org/mailman/listinfo/mesa-dev" target="_blank">http://lists.freedesktop.org/mailman/listinfo/mesa-dev</a><br>
</font></span></blockquote></div><br></div></div>