From: Kenneth Graunke <kenneth@whitecape.org>
Date: Mon, 16 Jan 2012 18:34:56 +0000 (-0800)
Subject: mesa: Support GL_VERTEX_ATTRIB_ARRAY_INTEGER in GL 3.0 contexts.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d56ad273c0ff37d790c614b2d3f04c1249b47307;p=mesa.git

mesa: Support GL_VERTEX_ATTRIB_ARRAY_INTEGER in GL 3.0 contexts.

According to Table 6.8 (Page 348) in the OpenGL 3.0 specification,
glGetVertexAttribiv supports GL_VERTEX_ATTRIB_ARRAY_INTEGER.

NOTE: This is a candidate for the 8.0 branch.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 540e8963c81..9078d116126 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -555,7 +555,7 @@ get_vertex_array_attrib(struct gl_context *ctx, GLuint index, GLenum pname,
    case GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB:
       return array->BufferObj->Name;
    case GL_VERTEX_ATTRIB_ARRAY_INTEGER:
-      if (ctx->Extensions.EXT_gpu_shader4) {
+      if (ctx->VersionMajor >= 3 || ctx->Extensions.EXT_gpu_shader4) {
          return array->Integer;
       }
       goto error;