Mesa (8.0): mesa: Support GL_VERTEX_ATTRIB_ARRAY_INTEGER in GL 3.0 contexts .

Ian Romanick idr at kemper.freedesktop.org
Thu Jan 19 20:35:08 UTC 2012


Module: Mesa
Branch: 8.0
Commit: 41c1a7311ecae6d8f4cfe8cd76e1d64d8466ca43
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=41c1a7311ecae6d8f4cfe8cd76e1d64d8466ca43

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Mon Jan 16 10:34:56 2012 -0800

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 at whitecape.org>
(cherry picked from commit d56ad273c0ff37d790c614b2d3f04c1249b47307)

---

 src/mesa/main/varray.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 540e896..9078d11 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;




More information about the mesa-commit mailing list