From 8d57b7fcb22cf1a52203ee57c745b64bba649249 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 9 Nov 2012 13:27:06 +0100 Subject: mesa git update 9 nov 2012 mesa: 011f8458805e443ac9130865d2840a929a00cabf --- mesalib/src/mesa/main/varray.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'mesalib/src/mesa/main/varray.c') diff --git a/mesalib/src/mesa/main/varray.c b/mesalib/src/mesa/main/varray.c index 522f5a704..3974787b4 100644 --- a/mesalib/src/mesa/main/varray.c +++ b/mesalib/src/mesa/main/varray.c @@ -701,14 +701,10 @@ _mesa_GetVertexAttribIiv(GLuint index, GLenum pname, GLint *params) ASSERT_OUTSIDE_BEGIN_END(ctx); if (pname == GL_CURRENT_VERTEX_ATTRIB_ARB) { - const GLfloat *v = + const GLint *v = (const GLint *) get_current_attrib(ctx, index, "glGetVertexAttribIiv"); if (v != NULL) { - /* XXX we don't have true integer-valued vertex attribs yet */ - params[0] = (GLint) v[0]; - params[1] = (GLint) v[1]; - params[2] = (GLint) v[2]; - params[3] = (GLint) v[3]; + COPY_4V(params, v); } } else { @@ -726,14 +722,10 @@ _mesa_GetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params) ASSERT_OUTSIDE_BEGIN_END(ctx); if (pname == GL_CURRENT_VERTEX_ATTRIB_ARB) { - const GLfloat *v = + const GLuint *v = (const GLuint *) get_current_attrib(ctx, index, "glGetVertexAttribIuiv"); if (v != NULL) { - /* XXX we don't have true integer-valued vertex attribs yet */ - params[0] = (GLuint) v[0]; - params[1] = (GLuint) v[1]; - params[2] = (GLuint) v[2]; - params[3] = (GLuint) v[3]; + COPY_4V(params, v); } } else { -- cgit v1.2.3