diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-09 13:27:06 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-09 13:27:06 +0100 |
| commit | 8d57b7fcb22cf1a52203ee57c745b64bba649249 (patch) | |
| tree | aaf65faecb30fbffbe7bb11d4bff43ea3297cf2e /mesalib/src/mesa/main/varray.c | |
| parent | 1738a6973deb03f33a71c9527594727cb8bb64b4 (diff) | |
| download | vcxsrv-8d57b7fcb22cf1a52203ee57c745b64bba649249.tar.gz vcxsrv-8d57b7fcb22cf1a52203ee57c745b64bba649249.tar.bz2 vcxsrv-8d57b7fcb22cf1a52203ee57c745b64bba649249.zip | |
mesa git update 9 nov 2012
mesa: 011f8458805e443ac9130865d2840a929a00cabf
Diffstat (limited to 'mesalib/src/mesa/main/varray.c')
| -rw-r--r-- | mesalib/src/mesa/main/varray.c | 16 |
1 files changed, 4 insertions, 12 deletions
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 { |