[Mesa-dev] [PATCH 18/22] mesa: Add a vao parameter to get_vertex_array_attrib

[Laura Ekstrand]

On Wed, Mar 18, 2015 at 4:18 PM, Fredrik Höglund <fredrik at kde.org> wrote:

> This is needed to implement glGetVertexArrayIndexediv and
> glGetVertexArrayIndexed64iv.
> ---
>  src/mesa/main/varray.c | 22 ++++++++++++++--------
>  1 file changed, 14 insertions(+), 8 deletions(-)
>
> diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
> index 0faf158..13b9c01 100644
> --- a/src/mesa/main/varray.c
> +++ b/src/mesa/main/varray.c
> @@ -832,10 +832,11 @@ _mesa_DisableVertexArrayAttrib(GLuint vaobj, GLuint
> index)
>   * not handle the 4-element GL_CURRENT_VERTEX_ATTRIB_ARB query.
>   */
>  static GLuint
> -get_vertex_array_attrib(struct gl_context *ctx, GLuint index, GLenum
> pname,
> -                  const char *caller)
> +get_vertex_array_attrib(struct gl_context *ctx,
>
This drops the const specifier on vao below.

> +                        struct gl_vertex_array_object *vao,
>
+                        GLuint index, GLenum pname,
> +                        const char *caller)
>  {
> -   const struct gl_vertex_array_object *vao = ctx->Array.VAO;
>     const struct gl_vertex_attrib_array *array;
>
>     if (index >= ctx->Const.Program[MESA_SHADER_VERTEX].MaxAttribs) {
> @@ -926,7 +927,8 @@ _mesa_GetVertexAttribfv(GLuint index, GLenum pname,
> GLfloat *params)
>        }
>     }
>     else {
> -      params[0] = (GLfloat) get_vertex_array_attrib(ctx, index, pname,
> +      params[0] = (GLfloat) get_vertex_array_attrib(ctx, ctx->Array.VAO,
> +                                                    index, pname,
>
>  "glGetVertexAttribfv");
>     }
>  }
> @@ -947,7 +949,8 @@ _mesa_GetVertexAttribdv(GLuint index, GLenum pname,
> GLdouble *params)
>        }
>     }
>     else {
> -      params[0] = (GLdouble) get_vertex_array_attrib(ctx, index, pname,
> +      params[0] = (GLdouble) get_vertex_array_attrib(ctx, ctx->Array.VAO,
> +                                                     index, pname,
>
> "glGetVertexAttribdv");
>     }
>  }
> @@ -969,7 +972,8 @@ _mesa_GetVertexAttribiv(GLuint index, GLenum pname,
> GLint *params)
>        }
>     }
>     else {
> -      params[0] = (GLint) get_vertex_array_attrib(ctx, index, pname,
> +      params[0] = (GLint) get_vertex_array_attrib(ctx, ctx->Array.VAO,
> +                                                  index, pname,
>                                                    "glGetVertexAttribiv");
>     }
>  }
> @@ -989,7 +993,8 @@ _mesa_GetVertexAttribIiv(GLuint index, GLenum pname,
> GLint *params)
>        }
>     }
>     else {
> -      params[0] = (GLint) get_vertex_array_attrib(ctx, index, pname,
> +      params[0] = (GLint) get_vertex_array_attrib(ctx, ctx->Array.VAO,
> +                                                  index, pname,
>                                                    "glGetVertexAttribIiv");
>     }
>  }
> @@ -1009,7 +1014,8 @@ _mesa_GetVertexAttribIuiv(GLuint index, GLenum
> pname, GLuint *params)
>        }
>     }
>     else {
> -      params[0] = get_vertex_array_attrib(ctx, index, pname,
> +      params[0] = get_vertex_array_attrib(ctx, ctx->Array.VAO,
> +                                          index, pname,
>                                            "glGetVertexAttribIuiv");
>     }
>  }
> --
> 1.8.5.3
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20150320/24668c1c/attachment.html>