xserver: Branch 'master'

[Ian Romanick]

 glx/indirect_dispatch.h |    4 ++--
 glx/indirect_size_get.c |   12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit b84a27fd9fdcb579437cfa38f10cb12cf55dc7c3
Author: Ian Romanick <idr at us.ibm.com>
Date:   Wed Jul 2 06:25:03 2008 -0700

    VBO: Regenerate files based on recent changes to gl_API.xml
    
    Since GL_ARB_vertex_buffer_object protocol isn't supported yet, these
    changes are innocuous.

diff --git a/glx/indirect_dispatch.h b/glx/indirect_dispatch.h
index e81c382..014e417 100644
--- a/glx/indirect_dispatch.h
+++ b/glx/indirect_dispatch.h
@@ -251,8 +251,6 @@ extern HIDDEN int __glXDisp_AreTexturesResident(struct __GLXclientStateRec *, GL
 extern HIDDEN int __glXDispSwap_AreTexturesResident(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDisp_AreTexturesResidentEXT(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDispSwap_AreTexturesResidentEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDisp_IsRenderbufferEXT(struct __GLXclientStateRec *, GLbyte *);
-extern HIDDEN int __glXDispSwap_IsRenderbufferEXT(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN void __glXDisp_PointParameterfvEXT(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_PointParameterfvEXT(GLbyte * pc);
 extern HIDDEN void __glXDisp_Color3bv(GLbyte * pc);
@@ -423,6 +421,8 @@ extern HIDDEN void __glXDisp_FramebufferTexture1DEXT(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_FramebufferTexture1DEXT(GLbyte * pc);
 extern HIDDEN int __glXDisp_GetDrawableAttributes(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDispSwap_GetDrawableAttributes(struct __GLXclientStateRec *, GLbyte *);
+extern HIDDEN int __glXDisp_IsRenderbufferEXT(struct __GLXclientStateRec *, GLbyte *);
+extern HIDDEN int __glXDispSwap_IsRenderbufferEXT(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN void __glXDisp_RasterPos2sv(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_RasterPos2sv(GLbyte * pc);
 extern HIDDEN void __glXDisp_Color4ubv(GLbyte * pc);
diff --git a/glx/indirect_size_get.c b/glx/indirect_size_get.c
index 8f72690..80f81de 100644
--- a/glx/indirect_size_get.c
+++ b/glx/indirect_size_get.c
@@ -714,6 +714,17 @@ __glGetBooleanv_size(GLenum e)
     case GL_MAX_TEXTURE_COORDS_ARB:
     case GL_MAX_TEXTURE_IMAGE_UNITS_ARB:
     case GL_DEPTH_BOUNDS_TEST_EXT:
+    case GL_ARRAY_BUFFER_BINDING_ARB:
+    case GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB:
+    case GL_VERTEX_ARRAY_BUFFER_BINDING_ARB:
+    case GL_NORMAL_ARRAY_BUFFER_BINDING_ARB:
+    case GL_COLOR_ARRAY_BUFFER_BINDING_ARB:
+    case GL_INDEX_ARRAY_BUFFER_BINDING_ARB:
+    case GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB:
+    case GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB:
+    case GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB:
+    case GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB:
+    case GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB:
     case GL_MAX_ARRAY_TEXTURE_LAYERS_EXT:
     case GL_STENCIL_TEST_TWO_SIDE_EXT:
     case GL_ACTIVE_STENCIL_FACE_EXT:
@@ -1072,6 +1083,7 @@ __glGetVertexAttribdvARB_size(GLenum e)
     case GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB:
     case GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB:
     case GL_CURRENT_VERTEX_ATTRIB_ARB:
+    case GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB:
         return 1;
     default:
         return 0;