Remove GL 2.0 patches; they're not useful at present and need to be

protected by #ifdef statements. Add missing l: to BUILDLINK_TRANSFORM links in buildlink3.mk. Add MESSAGE, update TODO, add drop-in buildlink3.mk for interim use in pkgsrc until real merge. Bump revision.
2007-07-18 19:23:32 +00:00 · 2007-07-18 19:23:32 +00:00 · f09990abb1
commit f09990abb1
parent d9ea8cd5df
12 changed files with 55 additions and 917 deletions
--- a/MesaLib-dri/MESSAGE
+++ b/MesaLib-dri/MESSAGE
@ -0,0 +1,11 @@
+==========================================================================
+$NetBSD: MESSAGE,v 1.1 2007/07/18 19:23:32 bsadewitz Exp $
+
+To use this package as a replacement for graphics/MesaLib, simply copy
+the replacement buildlink3.mk file in this directory to
+${PKGSRCDIR}/graphics/MesaLib/buildlink3.mk.  I hope to soon have the rest
+of the MesaLib packages available; in the meantime, you can try changing
+the version number of the Mesa packages in pkgsrc-wip to 7.0.  If you have
+trouble, please email me at blair.sadewitz@gmail.com and I will 
+endeavor to help you.
+==========================================================================
--- a/MesaLib-dri/Makefile
+++ b/MesaLib-dri/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/07/04 18:41:33 bsadewitz Exp $
+# $NetBSD: Makefile,v 1.7 2007/07/18 19:23:32 bsadewitz Exp $

 DISTNAME=	MesaLib-${MESA_VERSION}
 CATEGORIES=	graphics
@ -10,7 +10,7 @@ HOMEPAGE=	http://www.freedesktop.org/Software/xorg
 COMMENT=	OpenGL library that renders using GLX or DRI

 MESA_VERSION=	7.0
-PKGREVISION=	1
+PKGREVISION=	2

 NO_CONFIGURE=	yes
 USE_TOOLS+=	makedepend gmake
@ -19,10 +19,10 @@ USE_LIBTOOL+=	yes
 PKG_DESTDIR_SUPPORT=user-destdir

 INSTALLATION_DIRS_FROM_PLIST=	yes
+
 DRI_MODULE_PATH?=	lib/xorg/modules/dri
+BUILD_DEFS+=		DRI_MODULE_PATH
 PLIST_SUBST+=		DRI_MODULE_PATH=${DRI_MODULE_PATH}
-#INSTALLATION_DIRS+=	${DRI_MODULE_PATH}
-#INSTALLATION_DIRS+=	include/GL

 GL_HEADERS=	gl.h gl_mangle.h glext.h glx.h glx_mangle.h glxext.h
 GL_HEADERS+=	osmesa.h xmesa.h xmesa_x.h xmesa_xf86.h
--- a/MesaLib-dri/MesaLib-replacement_buildlink3.mk
+++ b/MesaLib-dri/MesaLib-replacement_buildlink3.mk
@ -0,0 +1,28 @@
+# $NetBSD: MesaLib-replacement_buildlink3.mk,v 1.1 2007/07/18 19:23:32 bsadewitz Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+MESALIB_BUILDLINK3_MK:=	${MESALIB_BUILDLINK3_MK}+
+
+.if ${BUILDLINK_DEPTH} == "+"
+BUILDLINK_DEPENDS+=	MesaLib
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NMesaLib}
+BUILDLINK_PACKAGES+=	MesaLib
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}MesaLib
+
+.if ${MESALIB_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.MesaLib+=	MesaLib>=6.4.1
+BUILDLINK_API_DEPENDS.MesaLib+=	MesaLib>=7.0nb2
+BUILDLINK_PKGSRCDIR.MesaLib?=	../../graphics/MesaLib
+BUILDLINK_TRANSFORM+=		l:MesaGL:GL
+BUILDLINK_TRANSFORM+=		l:GL:GL:Xxf86vm:Xfixes:Xdamage:drm
+.endif	# MESALIB_BUILDLINK3_MK
+
+.include "../../x11/libdrm/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXxf86vm/buildlink3.mk"
+.include "../../x11/libXdamage/buildlink3.mk"
+.include "../../x11/libXfixes/buildlink3.mk"
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
--- a/MesaLib-dri/TODO
+++ b/MesaLib-dri/TODO
@ -1,2 +1,8 @@
 --Libtoolize driver build?  Libtoolize mklib instead?
 --Integrate Interix/LP64/etc patches from graphics/MesaLib(?)
+--Seperate out libGL, dri drivers, and perhaps libGLw into their own packages.
+--solidify changes and eliminate subst.mk.
+--update other packages in pkgsrc-wip for 7.0
+--Maintain distribution patchset, ultimately intended for our mirror sites,
+to track changes on the GIT 7.0 branch between releases.  This will simplify
+the patches in MesaLib/patches quite a bit.
--- a/MesaLib-dri/buildlink3.mk
+++ b/MesaLib-dri/buildlink3.mk
@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2007/06/27 19:23:41 bsadewitz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2007/07/18 19:23:32 bsadewitz Exp $

 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 MESALIB_BUILDLINK3_MK:=	${MESALIB_BUILDLINK3_MK}+
@ -12,10 +12,11 @@ BUILDLINK_PACKAGES+=	MesaLib
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}MesaLib

 .if ${MESALIB_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.MesaLib+=	MesaLib>=6.5.3
-BUILDLINK_PKGSRCDIR.MesaLib?=	../../wip/MesaLib-dri
-BUILDLINK_TRANSFORM+=		MesaGL:GL
-BUILDLINK_TRANSFORM+=		GL:GL:Xxf86vm:Xfixes:Xdamage:drm
+BUILDLINK_API_DEPENDS.MesaLib+=	MesaLib>=6.4.1
+BUILDLINK_API_DEPENDS.MesaLib+=	MesaLib>=7.0nb2
+BUILDLINK_PKGSRCDIR.MesaLib?=	../../graphics/MesaLib
+BUILDLINK_TRANSFORM+=		l:MesaGL:GL
+BUILDLINK_TRANSFORM+=		l:GL:GL:Xxf86vm:Xfixes:Xdamage:drm
 .endif	# MESALIB_BUILDLINK3_MK

 .include "../../x11/libdrm/buildlink3.mk"
--- a/MesaLib-dri/patches/patch-ag
+++ b/MesaLib-dri/patches/patch-ag
@ -1,97 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2007/07/04 06:03:37 bsadewitz Exp $
-
--- src/mesa/drivers/dri/common/extension_helper.h.orig	2007-06-21 18:14:38.000000000 -0400
-+++ src/mesa/drivers/dri/common/extension_helper.h
-@@ -1471,9 +1471,10 @@ static const char ImageTransformParamete
-     "";
- #endif
- 
-#if defined(need_GL_ARB_vertex_program)
-+#if defined(need_GL_VERSION_2_0) || defined(need_GL_ARB_vertex_program)
- static const char VertexAttrib4ivARB_names[] = 
-     "ip\0" /* Parameter signature */
-+    "glVertexAttrib4iv\0"
-     "glVertexAttrib4ivARB\0"
-     "";
- #endif
-@@ -1579,9 +1580,10 @@ static const char PixelTransformParamete
-     "";
- #endif
- 
-#if defined(need_GL_ARB_vertex_program)
-+#if defined(need_GL_VERSION_2_0) || defined(need_GL_ARB_vertex_program)
- static const char VertexAttrib4bvARB_names[] = 
-     "ip\0" /* Parameter signature */
-+    "glVertexAttrib4bv\0"
-     "glVertexAttrib4bvARB\0"
-     "";
- #endif
-@@ -2384,9 +2386,10 @@ static const char GetAttribLocationARB_n
-     "";
- #endif
- 
-#if defined(need_GL_ARB_vertex_program)
-+#if defined(need_GL_VERSION_2_0) || defined(need_GL_ARB_vertex_program)
- static const char VertexAttrib4ubvARB_names[] = 
-     "ip\0" /* Parameter signature */
-+    "glVertexAttrib4ubv\0"
-     "glVertexAttrib4ubvARB\0"
-     "";
- #endif
-@@ -2903,9 +2906,10 @@ static const char ReplacementCodeuiColor
-     "";
- #endif
- 
-#if defined(need_GL_ARB_vertex_program)
-+#if defined(need_GL_VERSION_2_0) || defined(need_GL_ARB_vertex_program)
- static const char VertexAttrib4usvARB_names[] = 
-     "ip\0" /* Parameter signature */
-+    "glVertexAttrib4usv\0"
-     "glVertexAttrib4usvARB\0"
-     "";
- #endif
-@@ -4386,9 +4390,10 @@ static const char WindowPos4iMESA_names[
-     "";
- #endif
- 
-#if defined(need_GL_ARB_vertex_program)
-+#if defined(need_GL_VERSION_2_0) || defined(need_GL_ARB_vertex_program)
- static const char VertexAttrib4uivARB_names[] = 
-     "ip\0" /* Parameter signature */
-+    "glVertexAttrib4uiv\0"
-     "glVertexAttrib4uivARB\0"
-     "";
- #endif
-@@ -6243,6 +6248,8 @@ static const struct dri_extension_functi
-     { GetVertexAttribivARB_names, GetVertexAttribivARB_remap_index, -1 },
-     { CreateProgram_names, CreateProgram_remap_index, -1 },
-     { StencilFuncSeparate_names, StencilFuncSeparate_remap_index, -1 },
-+    { VertexAttrib4ivARB_names, VertexAttrib4ivARB_remap_index, -1 },
-+    { VertexAttrib4bvARB_names, VertexAttrib4bvARB_remap_index, -1 },
-     { VertexAttrib3dARB_names, VertexAttrib3dARB_remap_index, -1 },
-     { VertexAttrib4fARB_names, VertexAttrib4fARB_remap_index, -1 },
-     { VertexAttrib4fvARB_names, VertexAttrib4fvARB_remap_index, -1 },
-@@ -6256,6 +6263,7 @@ static const struct dri_extension_functi
-     { VertexAttrib1dvARB_names, VertexAttrib1dvARB_remap_index, -1 },
-     { GetVertexAttribfvARB_names, GetVertexAttribfvARB_remap_index, -1 },
-     { GetAttribLocationARB_names, GetAttribLocationARB_remap_index, -1 },
-+    { VertexAttrib4ubvARB_names, VertexAttrib4ubvARB_remap_index, -1 },
-     { Uniform3ivARB_names, Uniform3ivARB_remap_index, -1 },
-     { VertexAttrib4sARB_names, VertexAttrib4sARB_remap_index, -1 },
-     { VertexAttrib2dvARB_names, VertexAttrib2dvARB_remap_index, -1 },
-@@ -6268,6 +6276,7 @@ static const struct dri_extension_functi
-     { VertexAttrib4NuivARB_names, VertexAttrib4NuivARB_remap_index, -1 },
-     { Uniform4fARB_names, Uniform4fARB_remap_index, -1 },
-     { VertexAttrib1dARB_names, VertexAttrib1dARB_remap_index, -1 },
-+    { VertexAttrib4usvARB_names, VertexAttrib4usvARB_remap_index, -1 },
-     { LinkProgramARB_names, LinkProgramARB_remap_index, -1 },
-     { ShaderSourceARB_names, ShaderSourceARB_remap_index, -1 },
-     { VertexAttrib3svARB_names, VertexAttrib3svARB_remap_index, -1 },
-@@ -6297,6 +6306,7 @@ static const struct dri_extension_functi
-     { DrawBuffersARB_names, DrawBuffersARB_remap_index, -1 },
-     { Uniform1fvARB_names, Uniform1fvARB_remap_index, -1 },
-     { EnableVertexAttribArrayARB_names, EnableVertexAttribArrayARB_remap_index, -1 },
-+    { VertexAttrib4uivARB_names, VertexAttrib4uivARB_remap_index, -1 },
-     { VertexAttrib4svARB_names, VertexAttrib4svARB_remap_index, -1 },
-     { GetShaderiv_names, GetShaderiv_remap_index, -1 },
-     { VertexAttrib2svARB_names, VertexAttrib2svARB_remap_index, -1 },
--- a/MesaLib-dri/patches/patch-ah
+++ b/MesaLib-dri/patches/patch-ah
@ -1,78 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2007/07/04 06:03:37 bsadewitz Exp $
-
--- src/mesa/glapi/glapitemp.h.orig	2007-06-21 18:14:38.000000000 -0400
-+++ src/mesa/glapi/glapitemp.h
-@@ -3284,6 +3284,11 @@ KEYWORD1 void KEYWORD2 NAME(VertexAttrib
-    DISPATCH(VertexAttrib4NusvARB, (index, v), (F, "glVertexAttrib4NusvARB(%d, %p);\n", index, (const void *) v));
- }
- 
-+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4bv)(GLuint index, const GLbyte * v)
-+{
-+   DISPATCH(VertexAttrib4bvARB, (index, v), (F, "glVertexAttrib4bv(%d, %p);\n", index, (const void *) v));
-+}
-+
- KEYWORD1 void KEYWORD2 NAME(VertexAttrib4bvARB)(GLuint index, const GLbyte * v)
- {
-    DISPATCH(VertexAttrib4bvARB, (index, v), (F, "glVertexAttrib4bvARB(%d, %p);\n", index, (const void *) v));
-@@ -3329,6 +3334,11 @@ KEYWORD1 void KEYWORD2 NAME(VertexAttrib
-    DISPATCH(VertexAttrib4fvARB, (index, v), (F, "glVertexAttrib4fvARB(%d, %p);\n", index, (const void *) v));
- }
- 
-+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4iv)(GLuint index, const GLint * v)
-+{
-+   DISPATCH(VertexAttrib4ivARB, (index, v), (F, "glVertexAttrib4iv(%d, %p);\n", index, (const void *) v));
-+}
-+
- KEYWORD1 void KEYWORD2 NAME(VertexAttrib4ivARB)(GLuint index, const GLint * v)
- {
-    DISPATCH(VertexAttrib4ivARB, (index, v), (F, "glVertexAttrib4ivARB(%d, %p);\n", index, (const void *) v));
-@@ -3354,16 +3364,31 @@ KEYWORD1 void KEYWORD2 NAME(VertexAttrib
-    DISPATCH(VertexAttrib4svARB, (index, v), (F, "glVertexAttrib4svARB(%d, %p);\n", index, (const void *) v));
- }
- 
-+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4ubv)(GLuint index, const GLubyte * v)
-+{
-+   DISPATCH(VertexAttrib4ubvARB, (index, v), (F, "glVertexAttrib4ubv(%d, %p);\n", index, (const void *) v));
-+}
-+
- KEYWORD1 void KEYWORD2 NAME(VertexAttrib4ubvARB)(GLuint index, const GLubyte * v)
- {
-    DISPATCH(VertexAttrib4ubvARB, (index, v), (F, "glVertexAttrib4ubvARB(%d, %p);\n", index, (const void *) v));
- }
- 
-+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4uiv)(GLuint index, const GLuint * v)
-+{
-+   DISPATCH(VertexAttrib4uivARB, (index, v), (F, "glVertexAttrib4uiv(%d, %p);\n", index, (const void *) v));
-+}
-+
- KEYWORD1 void KEYWORD2 NAME(VertexAttrib4uivARB)(GLuint index, const GLuint * v)
- {
-    DISPATCH(VertexAttrib4uivARB, (index, v), (F, "glVertexAttrib4uivARB(%d, %p);\n", index, (const void *) v));
- }
- 
-+KEYWORD1 void KEYWORD2 NAME(VertexAttrib4usv)(GLuint index, const GLushort * v)
-+{
-+   DISPATCH(VertexAttrib4usvARB, (index, v), (F, "glVertexAttrib4usv(%d, %p);\n", index, (const void *) v));
-+}
-+
- KEYWORD1 void KEYWORD2 NAME(VertexAttrib4usvARB)(GLuint index, const GLushort * v)
- {
-    DISPATCH(VertexAttrib4usvARB, (index, v), (F, "glVertexAttrib4usvARB(%d, %p);\n", index, (const void *) v));
-@@ -6458,12 +6483,17 @@ static _glapi_proc UNUSED_TABLE_NAME[] =
-    TABLE_ENTRY(VertexAttrib4Nubv),
-    TABLE_ENTRY(VertexAttrib4Nuiv),
-    TABLE_ENTRY(VertexAttrib4Nusv),
-+   TABLE_ENTRY(VertexAttrib4bv),
-    TABLE_ENTRY(VertexAttrib4d),
-    TABLE_ENTRY(VertexAttrib4dv),
-    TABLE_ENTRY(VertexAttrib4f),
-    TABLE_ENTRY(VertexAttrib4fv),
-+   TABLE_ENTRY(VertexAttrib4iv),
-    TABLE_ENTRY(VertexAttrib4s),
-    TABLE_ENTRY(VertexAttrib4sv),
-+   TABLE_ENTRY(VertexAttrib4ubv),
-+   TABLE_ENTRY(VertexAttrib4uiv),
-+   TABLE_ENTRY(VertexAttrib4usv),
-    TABLE_ENTRY(VertexAttribPointer),
-    TABLE_ENTRY(BindBuffer),
-    TABLE_ENTRY(BufferData),
--- a/MesaLib-dri/patches/patch-ai
+++ b/MesaLib-dri/patches/patch-ai
@ -1,306 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2007/07/04 06:03:37 bsadewitz Exp $
-
--- src/mesa/glapi/glprocs.h.orig	2007-06-21 18:14:38.000000000 -0400
-+++ src/mesa/glapi/glprocs.h
-@@ -957,12 +957,17 @@ static const char gl_string_table[] =
-     "glVertexAttrib4Nubv\0"
-     "glVertexAttrib4Nuiv\0"
-     "glVertexAttrib4Nusv\0"
-+    "glVertexAttrib4bv\0"
-     "glVertexAttrib4d\0"
-     "glVertexAttrib4dv\0"
-     "glVertexAttrib4f\0"
-     "glVertexAttrib4fv\0"
-+    "glVertexAttrib4iv\0"
-     "glVertexAttrib4s\0"
-     "glVertexAttrib4sv\0"
-+    "glVertexAttrib4ubv\0"
-+    "glVertexAttrib4uiv\0"
-+    "glVertexAttrib4usv\0"
-     "glVertexAttribPointer\0"
-     "glBindBuffer\0"
-     "glBufferData\0"
-@@ -2100,142 +2105,147 @@ static const glprocs_table_t static_func
-     NAME_FUNC_OFFSET(16268, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, _gloffset_VertexAttrib4NubvARB),
-     NAME_FUNC_OFFSET(16288, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, _gloffset_VertexAttrib4NuivARB),
-     NAME_FUNC_OFFSET(16308, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, _gloffset_VertexAttrib4NusvARB),
-    NAME_FUNC_OFFSET(16328, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, _gloffset_VertexAttrib4dARB),
-    NAME_FUNC_OFFSET(16345, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, _gloffset_VertexAttrib4dvARB),
-    NAME_FUNC_OFFSET(16363, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, _gloffset_VertexAttrib4fARB),
-    NAME_FUNC_OFFSET(16380, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, _gloffset_VertexAttrib4fvARB),
-    NAME_FUNC_OFFSET(16398, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, _gloffset_VertexAttrib4sARB),
-    NAME_FUNC_OFFSET(16415, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, _gloffset_VertexAttrib4svARB),
-    NAME_FUNC_OFFSET(16433, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, _gloffset_VertexAttribPointerARB),
-    NAME_FUNC_OFFSET(16455, glBindBufferARB, glBindBufferARB, NULL, _gloffset_BindBufferARB),
-    NAME_FUNC_OFFSET(16468, glBufferDataARB, glBufferDataARB, NULL, _gloffset_BufferDataARB),
-    NAME_FUNC_OFFSET(16481, glBufferSubDataARB, glBufferSubDataARB, NULL, _gloffset_BufferSubDataARB),
-    NAME_FUNC_OFFSET(16497, glDeleteBuffersARB, glDeleteBuffersARB, NULL, _gloffset_DeleteBuffersARB),
-    NAME_FUNC_OFFSET(16513, glGenBuffersARB, glGenBuffersARB, NULL, _gloffset_GenBuffersARB),
-    NAME_FUNC_OFFSET(16526, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, _gloffset_GetBufferParameterivARB),
-    NAME_FUNC_OFFSET(16549, glGetBufferPointervARB, glGetBufferPointervARB, NULL, _gloffset_GetBufferPointervARB),
-    NAME_FUNC_OFFSET(16569, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, _gloffset_GetBufferSubDataARB),
-    NAME_FUNC_OFFSET(16588, glIsBufferARB, glIsBufferARB, NULL, _gloffset_IsBufferARB),
-    NAME_FUNC_OFFSET(16599, glMapBufferARB, glMapBufferARB, NULL, _gloffset_MapBufferARB),
-    NAME_FUNC_OFFSET(16611, glUnmapBufferARB, glUnmapBufferARB, NULL, _gloffset_UnmapBufferARB),
-    NAME_FUNC_OFFSET(16625, glBeginQueryARB, glBeginQueryARB, NULL, _gloffset_BeginQueryARB),
-    NAME_FUNC_OFFSET(16638, glDeleteQueriesARB, glDeleteQueriesARB, NULL, _gloffset_DeleteQueriesARB),
-    NAME_FUNC_OFFSET(16654, glEndQueryARB, glEndQueryARB, NULL, _gloffset_EndQueryARB),
-    NAME_FUNC_OFFSET(16665, glGenQueriesARB, glGenQueriesARB, NULL, _gloffset_GenQueriesARB),
-    NAME_FUNC_OFFSET(16678, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, _gloffset_GetQueryObjectivARB),
-    NAME_FUNC_OFFSET(16697, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, _gloffset_GetQueryObjectuivARB),
-    NAME_FUNC_OFFSET(16717, glGetQueryivARB, glGetQueryivARB, NULL, _gloffset_GetQueryivARB),
-    NAME_FUNC_OFFSET(16730, glIsQueryARB, glIsQueryARB, NULL, _gloffset_IsQueryARB),
-    NAME_FUNC_OFFSET(16740, glCompileShaderARB, glCompileShaderARB, NULL, _gloffset_CompileShaderARB),
-    NAME_FUNC_OFFSET(16756, glGetActiveUniformARB, glGetActiveUniformARB, NULL, _gloffset_GetActiveUniformARB),
-    NAME_FUNC_OFFSET(16775, glGetShaderSourceARB, glGetShaderSourceARB, NULL, _gloffset_GetShaderSourceARB),
-    NAME_FUNC_OFFSET(16793, glGetUniformLocationARB, glGetUniformLocationARB, NULL, _gloffset_GetUniformLocationARB),
-    NAME_FUNC_OFFSET(16814, glGetUniformfvARB, glGetUniformfvARB, NULL, _gloffset_GetUniformfvARB),
-    NAME_FUNC_OFFSET(16829, glGetUniformivARB, glGetUniformivARB, NULL, _gloffset_GetUniformivARB),
-    NAME_FUNC_OFFSET(16844, glLinkProgramARB, glLinkProgramARB, NULL, _gloffset_LinkProgramARB),
-    NAME_FUNC_OFFSET(16858, glShaderSourceARB, glShaderSourceARB, NULL, _gloffset_ShaderSourceARB),
-    NAME_FUNC_OFFSET(16873, glUniform1fARB, glUniform1fARB, NULL, _gloffset_Uniform1fARB),
-    NAME_FUNC_OFFSET(16885, glUniform1fvARB, glUniform1fvARB, NULL, _gloffset_Uniform1fvARB),
-    NAME_FUNC_OFFSET(16898, glUniform1iARB, glUniform1iARB, NULL, _gloffset_Uniform1iARB),
-    NAME_FUNC_OFFSET(16910, glUniform1ivARB, glUniform1ivARB, NULL, _gloffset_Uniform1ivARB),
-    NAME_FUNC_OFFSET(16923, glUniform2fARB, glUniform2fARB, NULL, _gloffset_Uniform2fARB),
-    NAME_FUNC_OFFSET(16935, glUniform2fvARB, glUniform2fvARB, NULL, _gloffset_Uniform2fvARB),
-    NAME_FUNC_OFFSET(16948, glUniform2iARB, glUniform2iARB, NULL, _gloffset_Uniform2iARB),
-    NAME_FUNC_OFFSET(16960, glUniform2ivARB, glUniform2ivARB, NULL, _gloffset_Uniform2ivARB),
-    NAME_FUNC_OFFSET(16973, glUniform3fARB, glUniform3fARB, NULL, _gloffset_Uniform3fARB),
-    NAME_FUNC_OFFSET(16985, glUniform3fvARB, glUniform3fvARB, NULL, _gloffset_Uniform3fvARB),
-    NAME_FUNC_OFFSET(16998, glUniform3iARB, glUniform3iARB, NULL, _gloffset_Uniform3iARB),
-    NAME_FUNC_OFFSET(17010, glUniform3ivARB, glUniform3ivARB, NULL, _gloffset_Uniform3ivARB),
-    NAME_FUNC_OFFSET(17023, glUniform4fARB, glUniform4fARB, NULL, _gloffset_Uniform4fARB),
-    NAME_FUNC_OFFSET(17035, glUniform4fvARB, glUniform4fvARB, NULL, _gloffset_Uniform4fvARB),
-    NAME_FUNC_OFFSET(17048, glUniform4iARB, glUniform4iARB, NULL, _gloffset_Uniform4iARB),
-    NAME_FUNC_OFFSET(17060, glUniform4ivARB, glUniform4ivARB, NULL, _gloffset_Uniform4ivARB),
-    NAME_FUNC_OFFSET(17073, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, _gloffset_UniformMatrix2fvARB),
-    NAME_FUNC_OFFSET(17092, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, _gloffset_UniformMatrix3fvARB),
-    NAME_FUNC_OFFSET(17111, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, _gloffset_UniformMatrix4fvARB),
-    NAME_FUNC_OFFSET(17130, glUseProgramObjectARB, glUseProgramObjectARB, NULL, _gloffset_UseProgramObjectARB),
-    NAME_FUNC_OFFSET(17143, glValidateProgramARB, glValidateProgramARB, NULL, _gloffset_ValidateProgramARB),
-    NAME_FUNC_OFFSET(17161, glBindAttribLocationARB, glBindAttribLocationARB, NULL, _gloffset_BindAttribLocationARB),
-    NAME_FUNC_OFFSET(17182, glGetActiveAttribARB, glGetActiveAttribARB, NULL, _gloffset_GetActiveAttribARB),
-    NAME_FUNC_OFFSET(17200, glGetAttribLocationARB, glGetAttribLocationARB, NULL, _gloffset_GetAttribLocationARB),
-    NAME_FUNC_OFFSET(17220, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
-    NAME_FUNC_OFFSET(17234, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
-    NAME_FUNC_OFFSET(17251, gl_dispatch_stub_568, gl_dispatch_stub_568, NULL, _gloffset_SampleMaskSGIS),
-    NAME_FUNC_OFFSET(17267, gl_dispatch_stub_569, gl_dispatch_stub_569, NULL, _gloffset_SamplePatternSGIS),
-    NAME_FUNC_OFFSET(17286, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(17304, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(17325, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(17347, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(17366, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(17388, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(17411, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
-    NAME_FUNC_OFFSET(17430, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
-    NAME_FUNC_OFFSET(17450, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
-    NAME_FUNC_OFFSET(17469, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
-    NAME_FUNC_OFFSET(17489, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
-    NAME_FUNC_OFFSET(17508, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
-    NAME_FUNC_OFFSET(17528, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
-    NAME_FUNC_OFFSET(17547, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
-    NAME_FUNC_OFFSET(17567, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
-    NAME_FUNC_OFFSET(17586, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
-    NAME_FUNC_OFFSET(17606, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
-    NAME_FUNC_OFFSET(17626, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
-    NAME_FUNC_OFFSET(17647, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
-    NAME_FUNC_OFFSET(17667, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
-    NAME_FUNC_OFFSET(17688, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
-    NAME_FUNC_OFFSET(17708, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
-    NAME_FUNC_OFFSET(17729, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
-    NAME_FUNC_OFFSET(17753, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
-    NAME_FUNC_OFFSET(17771, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
-    NAME_FUNC_OFFSET(17791, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
-    NAME_FUNC_OFFSET(17809, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
-    NAME_FUNC_OFFSET(17821, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
-    NAME_FUNC_OFFSET(17834, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
-    NAME_FUNC_OFFSET(17846, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
-    NAME_FUNC_OFFSET(17859, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
-    NAME_FUNC_OFFSET(17879, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
-    NAME_FUNC_OFFSET(17903, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-    NAME_FUNC_OFFSET(17917, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-    NAME_FUNC_OFFSET(17934, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-    NAME_FUNC_OFFSET(17949, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-    NAME_FUNC_OFFSET(17967, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-    NAME_FUNC_OFFSET(17981, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-    NAME_FUNC_OFFSET(17998, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-    NAME_FUNC_OFFSET(18013, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-    NAME_FUNC_OFFSET(18031, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-    NAME_FUNC_OFFSET(18045, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-    NAME_FUNC_OFFSET(18062, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-    NAME_FUNC_OFFSET(18077, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-    NAME_FUNC_OFFSET(18095, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-    NAME_FUNC_OFFSET(18109, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-    NAME_FUNC_OFFSET(18126, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-    NAME_FUNC_OFFSET(18141, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-    NAME_FUNC_OFFSET(18159, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-    NAME_FUNC_OFFSET(18173, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-    NAME_FUNC_OFFSET(18190, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-    NAME_FUNC_OFFSET(18205, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-    NAME_FUNC_OFFSET(18223, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-    NAME_FUNC_OFFSET(18237, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-    NAME_FUNC_OFFSET(18254, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-    NAME_FUNC_OFFSET(18269, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-    NAME_FUNC_OFFSET(18287, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-    NAME_FUNC_OFFSET(18301, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-    NAME_FUNC_OFFSET(18318, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-    NAME_FUNC_OFFSET(18333, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-    NAME_FUNC_OFFSET(18351, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-    NAME_FUNC_OFFSET(18365, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-    NAME_FUNC_OFFSET(18382, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-    NAME_FUNC_OFFSET(18397, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-    NAME_FUNC_OFFSET(18415, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
-    NAME_FUNC_OFFSET(18432, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
-    NAME_FUNC_OFFSET(18452, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
-    NAME_FUNC_OFFSET(18469, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-    NAME_FUNC_OFFSET(18495, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-    NAME_FUNC_OFFSET(18524, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
-    NAME_FUNC_OFFSET(18539, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
-    NAME_FUNC_OFFSET(18557, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
-    NAME_FUNC_OFFSET(18576, gl_dispatch_stub_749, gl_dispatch_stub_749, NULL, _gloffset_BlendEquationSeparateEXT),
-    NAME_FUNC_OFFSET(18600, gl_dispatch_stub_749, gl_dispatch_stub_749, NULL, _gloffset_BlendEquationSeparateEXT),
-+    NAME_FUNC_OFFSET(16328, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, _gloffset_VertexAttrib4bvARB),
-+    NAME_FUNC_OFFSET(16346, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, _gloffset_VertexAttrib4dARB),
-+    NAME_FUNC_OFFSET(16363, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, _gloffset_VertexAttrib4dvARB),
-+    NAME_FUNC_OFFSET(16381, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, _gloffset_VertexAttrib4fARB),
-+    NAME_FUNC_OFFSET(16398, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, _gloffset_VertexAttrib4fvARB),
-+    NAME_FUNC_OFFSET(16416, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, _gloffset_VertexAttrib4ivARB),
-+    NAME_FUNC_OFFSET(16434, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, _gloffset_VertexAttrib4sARB),
-+    NAME_FUNC_OFFSET(16451, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, _gloffset_VertexAttrib4svARB),
-+    NAME_FUNC_OFFSET(16469, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, _gloffset_VertexAttrib4ubvARB),
-+    NAME_FUNC_OFFSET(16488, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, _gloffset_VertexAttrib4uivARB),
-+    NAME_FUNC_OFFSET(16507, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, _gloffset_VertexAttrib4usvARB),
-+    NAME_FUNC_OFFSET(16526, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, _gloffset_VertexAttribPointerARB),
-+    NAME_FUNC_OFFSET(16548, glBindBufferARB, glBindBufferARB, NULL, _gloffset_BindBufferARB),
-+    NAME_FUNC_OFFSET(16561, glBufferDataARB, glBufferDataARB, NULL, _gloffset_BufferDataARB),
-+    NAME_FUNC_OFFSET(16574, glBufferSubDataARB, glBufferSubDataARB, NULL, _gloffset_BufferSubDataARB),
-+    NAME_FUNC_OFFSET(16590, glDeleteBuffersARB, glDeleteBuffersARB, NULL, _gloffset_DeleteBuffersARB),
-+    NAME_FUNC_OFFSET(16606, glGenBuffersARB, glGenBuffersARB, NULL, _gloffset_GenBuffersARB),
-+    NAME_FUNC_OFFSET(16619, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, _gloffset_GetBufferParameterivARB),
-+    NAME_FUNC_OFFSET(16642, glGetBufferPointervARB, glGetBufferPointervARB, NULL, _gloffset_GetBufferPointervARB),
-+    NAME_FUNC_OFFSET(16662, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, _gloffset_GetBufferSubDataARB),
-+    NAME_FUNC_OFFSET(16681, glIsBufferARB, glIsBufferARB, NULL, _gloffset_IsBufferARB),
-+    NAME_FUNC_OFFSET(16692, glMapBufferARB, glMapBufferARB, NULL, _gloffset_MapBufferARB),
-+    NAME_FUNC_OFFSET(16704, glUnmapBufferARB, glUnmapBufferARB, NULL, _gloffset_UnmapBufferARB),
-+    NAME_FUNC_OFFSET(16718, glBeginQueryARB, glBeginQueryARB, NULL, _gloffset_BeginQueryARB),
-+    NAME_FUNC_OFFSET(16731, glDeleteQueriesARB, glDeleteQueriesARB, NULL, _gloffset_DeleteQueriesARB),
-+    NAME_FUNC_OFFSET(16747, glEndQueryARB, glEndQueryARB, NULL, _gloffset_EndQueryARB),
-+    NAME_FUNC_OFFSET(16758, glGenQueriesARB, glGenQueriesARB, NULL, _gloffset_GenQueriesARB),
-+    NAME_FUNC_OFFSET(16771, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, _gloffset_GetQueryObjectivARB),
-+    NAME_FUNC_OFFSET(16790, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, _gloffset_GetQueryObjectuivARB),
-+    NAME_FUNC_OFFSET(16810, glGetQueryivARB, glGetQueryivARB, NULL, _gloffset_GetQueryivARB),
-+    NAME_FUNC_OFFSET(16823, glIsQueryARB, glIsQueryARB, NULL, _gloffset_IsQueryARB),
-+    NAME_FUNC_OFFSET(16833, glCompileShaderARB, glCompileShaderARB, NULL, _gloffset_CompileShaderARB),
-+    NAME_FUNC_OFFSET(16849, glGetActiveUniformARB, glGetActiveUniformARB, NULL, _gloffset_GetActiveUniformARB),
-+    NAME_FUNC_OFFSET(16868, glGetShaderSourceARB, glGetShaderSourceARB, NULL, _gloffset_GetShaderSourceARB),
-+    NAME_FUNC_OFFSET(16886, glGetUniformLocationARB, glGetUniformLocationARB, NULL, _gloffset_GetUniformLocationARB),
-+    NAME_FUNC_OFFSET(16907, glGetUniformfvARB, glGetUniformfvARB, NULL, _gloffset_GetUniformfvARB),
-+    NAME_FUNC_OFFSET(16922, glGetUniformivARB, glGetUniformivARB, NULL, _gloffset_GetUniformivARB),
-+    NAME_FUNC_OFFSET(16937, glLinkProgramARB, glLinkProgramARB, NULL, _gloffset_LinkProgramARB),
-+    NAME_FUNC_OFFSET(16951, glShaderSourceARB, glShaderSourceARB, NULL, _gloffset_ShaderSourceARB),
-+    NAME_FUNC_OFFSET(16966, glUniform1fARB, glUniform1fARB, NULL, _gloffset_Uniform1fARB),
-+    NAME_FUNC_OFFSET(16978, glUniform1fvARB, glUniform1fvARB, NULL, _gloffset_Uniform1fvARB),
-+    NAME_FUNC_OFFSET(16991, glUniform1iARB, glUniform1iARB, NULL, _gloffset_Uniform1iARB),
-+    NAME_FUNC_OFFSET(17003, glUniform1ivARB, glUniform1ivARB, NULL, _gloffset_Uniform1ivARB),
-+    NAME_FUNC_OFFSET(17016, glUniform2fARB, glUniform2fARB, NULL, _gloffset_Uniform2fARB),
-+    NAME_FUNC_OFFSET(17028, glUniform2fvARB, glUniform2fvARB, NULL, _gloffset_Uniform2fvARB),
-+    NAME_FUNC_OFFSET(17041, glUniform2iARB, glUniform2iARB, NULL, _gloffset_Uniform2iARB),
-+    NAME_FUNC_OFFSET(17053, glUniform2ivARB, glUniform2ivARB, NULL, _gloffset_Uniform2ivARB),
-+    NAME_FUNC_OFFSET(17066, glUniform3fARB, glUniform3fARB, NULL, _gloffset_Uniform3fARB),
-+    NAME_FUNC_OFFSET(17078, glUniform3fvARB, glUniform3fvARB, NULL, _gloffset_Uniform3fvARB),
-+    NAME_FUNC_OFFSET(17091, glUniform3iARB, glUniform3iARB, NULL, _gloffset_Uniform3iARB),
-+    NAME_FUNC_OFFSET(17103, glUniform3ivARB, glUniform3ivARB, NULL, _gloffset_Uniform3ivARB),
-+    NAME_FUNC_OFFSET(17116, glUniform4fARB, glUniform4fARB, NULL, _gloffset_Uniform4fARB),
-+    NAME_FUNC_OFFSET(17128, glUniform4fvARB, glUniform4fvARB, NULL, _gloffset_Uniform4fvARB),
-+    NAME_FUNC_OFFSET(17141, glUniform4iARB, glUniform4iARB, NULL, _gloffset_Uniform4iARB),
-+    NAME_FUNC_OFFSET(17153, glUniform4ivARB, glUniform4ivARB, NULL, _gloffset_Uniform4ivARB),
-+    NAME_FUNC_OFFSET(17166, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, _gloffset_UniformMatrix2fvARB),
-+    NAME_FUNC_OFFSET(17185, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, _gloffset_UniformMatrix3fvARB),
-+    NAME_FUNC_OFFSET(17204, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, _gloffset_UniformMatrix4fvARB),
-+    NAME_FUNC_OFFSET(17223, glUseProgramObjectARB, glUseProgramObjectARB, NULL, _gloffset_UseProgramObjectARB),
-+    NAME_FUNC_OFFSET(17236, glValidateProgramARB, glValidateProgramARB, NULL, _gloffset_ValidateProgramARB),
-+    NAME_FUNC_OFFSET(17254, glBindAttribLocationARB, glBindAttribLocationARB, NULL, _gloffset_BindAttribLocationARB),
-+    NAME_FUNC_OFFSET(17275, glGetActiveAttribARB, glGetActiveAttribARB, NULL, _gloffset_GetActiveAttribARB),
-+    NAME_FUNC_OFFSET(17293, glGetAttribLocationARB, glGetAttribLocationARB, NULL, _gloffset_GetAttribLocationARB),
-+    NAME_FUNC_OFFSET(17313, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
-+    NAME_FUNC_OFFSET(17327, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
-+    NAME_FUNC_OFFSET(17344, gl_dispatch_stub_568, gl_dispatch_stub_568, NULL, _gloffset_SampleMaskSGIS),
-+    NAME_FUNC_OFFSET(17360, gl_dispatch_stub_569, gl_dispatch_stub_569, NULL, _gloffset_SamplePatternSGIS),
-+    NAME_FUNC_OFFSET(17379, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-+    NAME_FUNC_OFFSET(17397, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-+    NAME_FUNC_OFFSET(17418, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-+    NAME_FUNC_OFFSET(17440, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-+    NAME_FUNC_OFFSET(17459, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-+    NAME_FUNC_OFFSET(17481, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-+    NAME_FUNC_OFFSET(17504, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
-+    NAME_FUNC_OFFSET(17523, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
-+    NAME_FUNC_OFFSET(17543, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
-+    NAME_FUNC_OFFSET(17562, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
-+    NAME_FUNC_OFFSET(17582, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
-+    NAME_FUNC_OFFSET(17601, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
-+    NAME_FUNC_OFFSET(17621, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
-+    NAME_FUNC_OFFSET(17640, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
-+    NAME_FUNC_OFFSET(17660, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
-+    NAME_FUNC_OFFSET(17679, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
-+    NAME_FUNC_OFFSET(17699, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
-+    NAME_FUNC_OFFSET(17719, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
-+    NAME_FUNC_OFFSET(17740, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
-+    NAME_FUNC_OFFSET(17760, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
-+    NAME_FUNC_OFFSET(17781, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
-+    NAME_FUNC_OFFSET(17801, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
-+    NAME_FUNC_OFFSET(17822, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
-+    NAME_FUNC_OFFSET(17846, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
-+    NAME_FUNC_OFFSET(17864, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
-+    NAME_FUNC_OFFSET(17884, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
-+    NAME_FUNC_OFFSET(17902, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
-+    NAME_FUNC_OFFSET(17914, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
-+    NAME_FUNC_OFFSET(17927, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
-+    NAME_FUNC_OFFSET(17939, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
-+    NAME_FUNC_OFFSET(17952, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
-+    NAME_FUNC_OFFSET(17972, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
-+    NAME_FUNC_OFFSET(17996, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-+    NAME_FUNC_OFFSET(18010, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-+    NAME_FUNC_OFFSET(18027, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-+    NAME_FUNC_OFFSET(18042, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-+    NAME_FUNC_OFFSET(18060, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-+    NAME_FUNC_OFFSET(18074, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-+    NAME_FUNC_OFFSET(18091, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-+    NAME_FUNC_OFFSET(18106, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-+    NAME_FUNC_OFFSET(18124, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-+    NAME_FUNC_OFFSET(18138, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-+    NAME_FUNC_OFFSET(18155, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-+    NAME_FUNC_OFFSET(18170, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-+    NAME_FUNC_OFFSET(18188, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-+    NAME_FUNC_OFFSET(18202, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-+    NAME_FUNC_OFFSET(18219, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-+    NAME_FUNC_OFFSET(18234, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-+    NAME_FUNC_OFFSET(18252, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-+    NAME_FUNC_OFFSET(18266, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-+    NAME_FUNC_OFFSET(18283, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-+    NAME_FUNC_OFFSET(18298, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-+    NAME_FUNC_OFFSET(18316, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-+    NAME_FUNC_OFFSET(18330, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-+    NAME_FUNC_OFFSET(18347, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-+    NAME_FUNC_OFFSET(18362, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-+    NAME_FUNC_OFFSET(18380, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-+    NAME_FUNC_OFFSET(18394, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-+    NAME_FUNC_OFFSET(18411, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-+    NAME_FUNC_OFFSET(18426, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-+    NAME_FUNC_OFFSET(18444, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-+    NAME_FUNC_OFFSET(18458, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-+    NAME_FUNC_OFFSET(18475, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-+    NAME_FUNC_OFFSET(18490, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-+    NAME_FUNC_OFFSET(18508, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
-+    NAME_FUNC_OFFSET(18525, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
-+    NAME_FUNC_OFFSET(18545, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
-+    NAME_FUNC_OFFSET(18562, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-+    NAME_FUNC_OFFSET(18588, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-+    NAME_FUNC_OFFSET(18617, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
-+    NAME_FUNC_OFFSET(18632, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
-+    NAME_FUNC_OFFSET(18650, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
-+    NAME_FUNC_OFFSET(18669, gl_dispatch_stub_749, gl_dispatch_stub_749, NULL, _gloffset_BlendEquationSeparateEXT),
-+    NAME_FUNC_OFFSET(18693, gl_dispatch_stub_749, gl_dispatch_stub_749, NULL, _gloffset_BlendEquationSeparateEXT),
-     NAME_FUNC_OFFSET(-1, NULL, NULL, NULL, 0)
- };
- 
--- a/MesaLib-dri/patches/patch-an
+++ b/MesaLib-dri/patches/patch-an
@ -1,22 +0,0 @@
-$NetBSD: patch-an,v 1.3 2007/07/04 06:03:37 bsadewitz Exp $
-
--- src/mesa/sparc/glapi_sparc.S.orig	2007-06-21 18:14:38.000000000 -0400
-+++ src/mesa/sparc/glapi_sparc.S
-@@ -1731,12 +1731,17 @@ _mesa_sparc_glapi_end:
- 	.globl glVertexAttrib4Nubv ; .type glVertexAttrib4Nubv,#function ; glVertexAttrib4Nubv = glVertexAttrib4NubvARB
- 	.globl glVertexAttrib4Nuiv ; .type glVertexAttrib4Nuiv,#function ; glVertexAttrib4Nuiv = glVertexAttrib4NuivARB
- 	.globl glVertexAttrib4Nusv ; .type glVertexAttrib4Nusv,#function ; glVertexAttrib4Nusv = glVertexAttrib4NusvARB
-+	.globl glVertexAttrib4bv ; .type glVertexAttrib4bv,#function ; glVertexAttrib4bv = glVertexAttrib4bvARB
- 	.globl glVertexAttrib4d ; .type glVertexAttrib4d,#function ; glVertexAttrib4d = glVertexAttrib4dARB
- 	.globl glVertexAttrib4dv ; .type glVertexAttrib4dv,#function ; glVertexAttrib4dv = glVertexAttrib4dvARB
- 	.globl glVertexAttrib4f ; .type glVertexAttrib4f,#function ; glVertexAttrib4f = glVertexAttrib4fARB
- 	.globl glVertexAttrib4fv ; .type glVertexAttrib4fv,#function ; glVertexAttrib4fv = glVertexAttrib4fvARB
-+	.globl glVertexAttrib4iv ; .type glVertexAttrib4iv,#function ; glVertexAttrib4iv = glVertexAttrib4ivARB
- 	.globl glVertexAttrib4s ; .type glVertexAttrib4s,#function ; glVertexAttrib4s = glVertexAttrib4sARB
- 	.globl glVertexAttrib4sv ; .type glVertexAttrib4sv,#function ; glVertexAttrib4sv = glVertexAttrib4svARB
-+	.globl glVertexAttrib4ubv ; .type glVertexAttrib4ubv,#function ; glVertexAttrib4ubv = glVertexAttrib4ubvARB
-+	.globl glVertexAttrib4uiv ; .type glVertexAttrib4uiv,#function ; glVertexAttrib4uiv = glVertexAttrib4uivARB
-+	.globl glVertexAttrib4usv ; .type glVertexAttrib4usv,#function ; glVertexAttrib4usv = glVertexAttrib4usvARB
- 	.globl glVertexAttribPointer ; .type glVertexAttribPointer,#function ; glVertexAttribPointer = glVertexAttribPointerARB
- 	.globl glBindBuffer ; .type glBindBuffer,#function ; glBindBuffer = glBindBufferARB
- 	.globl glBufferData ; .type glBufferData,#function ; glBufferData = glBufferDataARB
--- a/MesaLib-dri/patches/patch-ao
+++ b/MesaLib-dri/patches/patch-ao
@ -1,22 +0,0 @@
-$NetBSD: patch-ao,v 1.3 2007/07/04 06:03:37 bsadewitz Exp $
-
--- src/mesa/x86-64/glapi_x86-64.S.orig	2007-06-21 18:14:38.000000000 -0400
-+++ src/mesa/x86-64/glapi_x86-64.S
-@@ -29353,12 +29353,17 @@ GL_PREFIX(_dispatch_stub_771):
- 	.globl GL_PREFIX(VertexAttrib4Nubv) ; .set GL_PREFIX(VertexAttrib4Nubv), GL_PREFIX(VertexAttrib4NubvARB)
- 	.globl GL_PREFIX(VertexAttrib4Nuiv) ; .set GL_PREFIX(VertexAttrib4Nuiv), GL_PREFIX(VertexAttrib4NuivARB)
- 	.globl GL_PREFIX(VertexAttrib4Nusv) ; .set GL_PREFIX(VertexAttrib4Nusv), GL_PREFIX(VertexAttrib4NusvARB)
-+	.globl GL_PREFIX(VertexAttrib4bv) ; .set GL_PREFIX(VertexAttrib4bv), GL_PREFIX(VertexAttrib4bvARB)
- 	.globl GL_PREFIX(VertexAttrib4d) ; .set GL_PREFIX(VertexAttrib4d), GL_PREFIX(VertexAttrib4dARB)
- 	.globl GL_PREFIX(VertexAttrib4dv) ; .set GL_PREFIX(VertexAttrib4dv), GL_PREFIX(VertexAttrib4dvARB)
- 	.globl GL_PREFIX(VertexAttrib4f) ; .set GL_PREFIX(VertexAttrib4f), GL_PREFIX(VertexAttrib4fARB)
- 	.globl GL_PREFIX(VertexAttrib4fv) ; .set GL_PREFIX(VertexAttrib4fv), GL_PREFIX(VertexAttrib4fvARB)
-+	.globl GL_PREFIX(VertexAttrib4iv) ; .set GL_PREFIX(VertexAttrib4iv), GL_PREFIX(VertexAttrib4ivARB)
- 	.globl GL_PREFIX(VertexAttrib4s) ; .set GL_PREFIX(VertexAttrib4s), GL_PREFIX(VertexAttrib4sARB)
- 	.globl GL_PREFIX(VertexAttrib4sv) ; .set GL_PREFIX(VertexAttrib4sv), GL_PREFIX(VertexAttrib4svARB)
-+	.globl GL_PREFIX(VertexAttrib4ubv) ; .set GL_PREFIX(VertexAttrib4ubv), GL_PREFIX(VertexAttrib4ubvARB)
-+	.globl GL_PREFIX(VertexAttrib4uiv) ; .set GL_PREFIX(VertexAttrib4uiv), GL_PREFIX(VertexAttrib4uivARB)
-+	.globl GL_PREFIX(VertexAttrib4usv) ; .set GL_PREFIX(VertexAttrib4usv), GL_PREFIX(VertexAttrib4usvARB)
- 	.globl GL_PREFIX(VertexAttribPointer) ; .set GL_PREFIX(VertexAttribPointer), GL_PREFIX(VertexAttribPointerARB)
- 	.globl GL_PREFIX(BindBuffer) ; .set GL_PREFIX(BindBuffer), GL_PREFIX(BindBufferARB)
- 	.globl GL_PREFIX(BufferData) ; .set GL_PREFIX(BufferData), GL_PREFIX(BufferDataARB)
--- a/MesaLib-dri/patches/patch-ap
+++ b/MesaLib-dri/patches/patch-ap
@ -1,22 +0,0 @@
-$NetBSD: patch-ap,v 1.3 2007/07/04 06:03:37 bsadewitz Exp $
-
--- src/mesa/x86/glapi_x86.S.orig	2007-06-21 18:14:38.000000000 -0400
-+++ src/mesa/x86/glapi_x86.S
-@@ -1128,12 +1128,17 @@ GLNAME(gl_dispatch_functions_start):
- 	GL_STUB_ALIAS(VertexAttrib4Nubv, _gloffset_VertexAttrib4NubvARB, VertexAttrib4Nubv@8, VertexAttrib4NubvARB, VertexAttrib4NubvARB@8)
- 	GL_STUB_ALIAS(VertexAttrib4Nuiv, _gloffset_VertexAttrib4NuivARB, VertexAttrib4Nuiv@8, VertexAttrib4NuivARB, VertexAttrib4NuivARB@8)
- 	GL_STUB_ALIAS(VertexAttrib4Nusv, _gloffset_VertexAttrib4NusvARB, VertexAttrib4Nusv@8, VertexAttrib4NusvARB, VertexAttrib4NusvARB@8)
-+	GL_STUB_ALIAS(VertexAttrib4bv, _gloffset_VertexAttrib4bvARB, VertexAttrib4bv@8, VertexAttrib4bvARB, VertexAttrib4bvARB@8)
- 	GL_STUB_ALIAS(VertexAttrib4d, _gloffset_VertexAttrib4dARB, VertexAttrib4d@36, VertexAttrib4dARB, VertexAttrib4dARB@36)
- 	GL_STUB_ALIAS(VertexAttrib4dv, _gloffset_VertexAttrib4dvARB, VertexAttrib4dv@8, VertexAttrib4dvARB, VertexAttrib4dvARB@8)
- 	GL_STUB_ALIAS(VertexAttrib4f, _gloffset_VertexAttrib4fARB, VertexAttrib4f@20, VertexAttrib4fARB, VertexAttrib4fARB@20)
- 	GL_STUB_ALIAS(VertexAttrib4fv, _gloffset_VertexAttrib4fvARB, VertexAttrib4fv@8, VertexAttrib4fvARB, VertexAttrib4fvARB@8)
-+	GL_STUB_ALIAS(VertexAttrib4iv, _gloffset_VertexAttrib4ivARB, VertexAttrib4iv@8, VertexAttrib4ivARB, VertexAttrib4ivARB@8)
- 	GL_STUB_ALIAS(VertexAttrib4s, _gloffset_VertexAttrib4sARB, VertexAttrib4s@20, VertexAttrib4sARB, VertexAttrib4sARB@20)
- 	GL_STUB_ALIAS(VertexAttrib4sv, _gloffset_VertexAttrib4svARB, VertexAttrib4sv@8, VertexAttrib4svARB, VertexAttrib4svARB@8)
-+	GL_STUB_ALIAS(VertexAttrib4ubv, _gloffset_VertexAttrib4ubvARB, VertexAttrib4ubv@8, VertexAttrib4ubvARB, VertexAttrib4ubvARB@8)
-+	GL_STUB_ALIAS(VertexAttrib4uiv, _gloffset_VertexAttrib4uivARB, VertexAttrib4uiv@8, VertexAttrib4uivARB, VertexAttrib4uivARB@8)
-+	GL_STUB_ALIAS(VertexAttrib4usv, _gloffset_VertexAttrib4usvARB, VertexAttrib4usv@8, VertexAttrib4usvARB, VertexAttrib4usvARB@8)
- 	GL_STUB_ALIAS(VertexAttribPointer, _gloffset_VertexAttribPointerARB, VertexAttribPointer@24, VertexAttribPointerARB, VertexAttribPointerARB@24)
- 	GL_STUB_ALIAS(BindBuffer, _gloffset_BindBufferARB, BindBuffer@8, BindBufferARB, BindBufferARB@8)
- 	GL_STUB_ALIAS(BufferData, _gloffset_BufferDataARB, BufferData@16, BufferDataARB, BufferDataARB@16)
--- a/MesaLib-dri/patches/patch-aq
+++ b/MesaLib-dri/patches/patch-aq
@ -1,361 +0,0 @@
-$NetBSD: patch-aq,v 1.3 2007/07/04 06:03:37 bsadewitz Exp $
-
--- include/GL/gl_mangle.h.orig	2007-06-21 18:10:53.000000000 -0400
-+++ include/GL/gl_mangle.h
-@@ -33,6 +33,7 @@
- #define glActiveStencilFaceEXT		MANGLE(ActiveStencilFaceEXT)
- #define glActiveTextureARB		MANGLE(ActiveTextureARB)
- #define glActiveTexture		MANGLE(ActiveTexture)
-+#define glActiveVaryingNV		MANGLE(ActiveVaryingNV)
- #define glAlphaFragmentOp1ATI		MANGLE(AlphaFragmentOp1ATI)
- #define glAlphaFragmentOp2ATI		MANGLE(AlphaFragmentOp2ATI)
- #define glAlphaFragmentOp3ATI		MANGLE(AlphaFragmentOp3ATI)
-@@ -52,11 +53,16 @@
- #define glBeginOcclusionQueryNV		MANGLE(BeginOcclusionQueryNV)
- #define glBeginQueryARB		MANGLE(BeginQueryARB)
- #define glBeginQuery		MANGLE(BeginQuery)
-+#define glBeginTransformFeedbackNV		MANGLE(BeginTransformFeedbackNV)
- #define glBeginVertexShaderEXT		MANGLE(BeginVertexShaderEXT)
- #define glBindAttribLocationARB		MANGLE(BindAttribLocationARB)
- #define glBindAttribLocation		MANGLE(BindAttribLocation)
- #define glBindBufferARB		MANGLE(BindBufferARB)
-+#define glBindBufferBaseNV		MANGLE(BindBufferBaseNV)
- #define glBindBuffer		MANGLE(BindBuffer)
-+#define glBindBufferOffsetNV		MANGLE(BindBufferOffsetNV)
-+#define glBindBufferRangeNV		MANGLE(BindBufferRangeNV)
-+#define glBindFragDataLocationEXT		MANGLE(BindFragDataLocationEXT)
- #define glBindFragmentShaderATI		MANGLE(BindFragmentShaderATI)
- #define glBindFramebufferEXT		MANGLE(BindFramebufferEXT)
- #define glBindLightParameterEXT		MANGLE(BindLightParameterEXT)
-@@ -97,6 +103,7 @@
- #define glBlitFramebufferEXT		MANGLE(BlitFramebufferEXT)
- #define glBufferDataARB		MANGLE(BufferDataARB)
- #define glBufferData		MANGLE(BufferData)
-+#define glBufferParameteriAPPLE		MANGLE(BufferParameteriAPPLE)
- #define glBufferSubDataARB		MANGLE(BufferSubDataARB)
- #define glBufferSubData		MANGLE(BufferSubData)
- #define glCallList		MANGLE(CallList)
-@@ -104,8 +111,11 @@
- #define glCheckFramebufferStatusEXT		MANGLE(CheckFramebufferStatusEXT)
- #define glClampColorARB		MANGLE(ClampColorARB)
- #define glClearAccum		MANGLE(ClearAccum)
-+#define glClearColorIiEXT		MANGLE(ClearColorIiEXT)
-+#define glClearColorIuiEXT		MANGLE(ClearColorIuiEXT)
- #define glClearColor		MANGLE(ClearColor)
- #define glClearDebugLogMESA		MANGLE(ClearDebugLogMESA)
-+#define glClearDepthdNV		MANGLE(ClearDepthdNV)
- #define glClearDepth		MANGLE(ClearDepth)
- #define glClearIndex		MANGLE(ClearIndex)
- #define glClear		MANGLE(Clear)
-@@ -161,6 +171,7 @@
- #define glColorFragmentOp1ATI		MANGLE(ColorFragmentOp1ATI)
- #define glColorFragmentOp2ATI		MANGLE(ColorFragmentOp2ATI)
- #define glColorFragmentOp3ATI		MANGLE(ColorFragmentOp3ATI)
-+#define glColorMaskIndexedEXT		MANGLE(ColorMaskIndexedEXT)
- #define glColorMask		MANGLE(ColorMask)
- #define glColorMaterial		MANGLE(ColorMaterial)
- #define glColorPointerEXT		MANGLE(ColorPointerEXT)
-@@ -261,19 +272,23 @@
- #define glDeleteTextures		MANGLE(DeleteTextures)
- #define glDeleteVertexArraysAPPLE		MANGLE(DeleteVertexArraysAPPLE)
- #define glDeleteVertexShaderEXT		MANGLE(DeleteVertexShaderEXT)
-+#define glDepthBoundsdNV		MANGLE(DepthBoundsdNV)
- #define glDepthBoundsEXT		MANGLE(DepthBoundsEXT)
- #define glDepthFunc		MANGLE(DepthFunc)
- #define glDepthMask		MANGLE(DepthMask)
-+#define glDepthRangedNV		MANGLE(DepthRangedNV)
- #define glDepthRange		MANGLE(DepthRange)
- #define glDetachObjectARB		MANGLE(DetachObjectARB)
- #define glDetachShader		MANGLE(DetachShader)
- #define glDetailTexFuncSGIS		MANGLE(DetailTexFuncSGIS)
- #define glDisableClientState		MANGLE(DisableClientState)
-+#define glDisableIndexedEXT		MANGLE(DisableIndexedEXT)
- #define glDisable		MANGLE(Disable)
- #define glDisableVariantClientStateEXT		MANGLE(DisableVariantClientStateEXT)
- #define glDisableVertexAttribArrayARB		MANGLE(DisableVertexAttribArrayARB)
- #define glDisableVertexAttribArray		MANGLE(DisableVertexAttribArray)
- #define glDrawArraysEXT		MANGLE(DrawArraysEXT)
-+#define glDrawArraysInstancedEXT		MANGLE(DrawArraysInstancedEXT)
- #define glDrawArrays		MANGLE(DrawArrays)
- #define glDrawBuffer		MANGLE(DrawBuffer)
- #define glDrawBuffersARB		MANGLE(DrawBuffersARB)
-@@ -281,6 +296,7 @@
- #define glDrawBuffers		MANGLE(DrawBuffers)
- #define glDrawElementArrayAPPLE		MANGLE(DrawElementArrayAPPLE)
- #define glDrawElementArrayATI		MANGLE(DrawElementArrayATI)
-+#define glDrawElementsInstancedEXT		MANGLE(DrawElementsInstancedEXT)
- #define glDrawElements		MANGLE(DrawElements)
- #define glDrawMeshArraysSUN		MANGLE(DrawMeshArraysSUN)
- #define glDrawPixels		MANGLE(DrawPixels)
-@@ -296,6 +312,7 @@
- #define glElementPointerAPPLE		MANGLE(ElementPointerAPPLE)
- #define glElementPointerATI		MANGLE(ElementPointerATI)
- #define glEnableClientState		MANGLE(EnableClientState)
-+#define glEnableIndexedEXT		MANGLE(EnableIndexedEXT)
- #define glEnable		MANGLE(Enable)
- #define glEnableVariantClientStateEXT		MANGLE(EnableVariantClientStateEXT)
- #define glEnableVertexAttribArrayARB		MANGLE(EnableVertexAttribArrayARB)
-@@ -306,6 +323,7 @@
- #define glEndOcclusionQueryNV		MANGLE(EndOcclusionQueryNV)
- #define glEndQueryARB		MANGLE(EndQueryARB)
- #define glEndQuery		MANGLE(EndQuery)
-+#define glEndTransformFeedbackNV		MANGLE(EndTransformFeedbackNV)
- #define glEndVertexShaderEXT		MANGLE(EndVertexShaderEXT)
- #define glEvalCoord1d		MANGLE(EvalCoord1d)
- #define glEvalCoord1dv		MANGLE(EvalCoord1dv)
-@@ -331,6 +349,7 @@
- #define glFinishObjectAPPLE		MANGLE(FinishObjectAPPLE)
- #define glFinishTextureSUNX		MANGLE(FinishTextureSUNX)
- #define glFlush		MANGLE(Flush)
-+#define glFlushMappedBufferRangeAPPLE		MANGLE(FlushMappedBufferRangeAPPLE)
- #define glFlushPixelDataRangeNV		MANGLE(FlushPixelDataRangeNV)
- #define glFlushRasterSGIX		MANGLE(FlushRasterSGIX)
- #define glFlushVertexArrayRangeAPPLE		MANGLE(FlushVertexArrayRangeAPPLE)
-@@ -370,6 +389,9 @@
- #define glFramebufferTexture1DEXT		MANGLE(FramebufferTexture1DEXT)
- #define glFramebufferTexture2DEXT		MANGLE(FramebufferTexture2DEXT)
- #define glFramebufferTexture3DEXT		MANGLE(FramebufferTexture3DEXT)
-+#define glFramebufferTextureEXT		MANGLE(FramebufferTextureEXT)
-+#define glFramebufferTextureFaceEXT		MANGLE(FramebufferTextureFaceEXT)
-+#define glFramebufferTextureLayerEXT		MANGLE(FramebufferTextureLayerEXT)
- #define glFrameZoomSGIX		MANGLE(FrameZoomSGIX)
- #define glFreeObjectBufferATI		MANGLE(FreeObjectBufferATI)
- #define glFrontFace		MANGLE(FrontFace)
-@@ -398,12 +420,14 @@
- #define glGetActiveAttrib		MANGLE(GetActiveAttrib)
- #define glGetActiveUniformARB		MANGLE(GetActiveUniformARB)
- #define glGetActiveUniform		MANGLE(GetActiveUniform)
-+#define glGetActiveVaryingNV		MANGLE(GetActiveVaryingNV)
- #define glGetArrayObjectfvATI		MANGLE(GetArrayObjectfvATI)
- #define glGetArrayObjectivATI		MANGLE(GetArrayObjectivATI)
- #define glGetAttachedObjectsARB		MANGLE(GetAttachedObjectsARB)
- #define glGetAttachedShaders		MANGLE(GetAttachedShaders)
- #define glGetAttribLocationARB		MANGLE(GetAttribLocationARB)
- #define glGetAttribLocation		MANGLE(GetAttribLocation)
-+#define glGetBooleanIndexedvEXT		MANGLE(GetBooleanIndexedvEXT)
- #define glGetBooleanv		MANGLE(GetBooleanv)
- #define glGetBufferParameterivARB		MANGLE(GetBufferParameterivARB)
- #define glGetBufferParameteriv		MANGLE(GetBufferParameteriv)
-@@ -444,6 +468,7 @@
- #define glGetFinalCombinerInputParameterivNV		MANGLE(GetFinalCombinerInputParameterivNV)
- #define glGetFloatv		MANGLE(GetFloatv)
- #define glGetFogFuncSGIS		MANGLE(GetFogFuncSGIS)
-+#define glGetFragDataLocationEXT		MANGLE(GetFragDataLocationEXT)
- #define glGetFragmentLightfvSGIX		MANGLE(GetFragmentLightfvSGIX)
- #define glGetFragmentLightivSGIX		MANGLE(GetFragmentLightivSGIX)
- #define glGetFragmentMaterialfvSGIX		MANGLE(GetFragmentMaterialfvSGIX)
-@@ -460,6 +485,7 @@
- #define glGetImageTransformParameterivHP		MANGLE(GetImageTransformParameterivHP)
- #define glGetInfoLogARB		MANGLE(GetInfoLogARB)
- #define glGetInstrumentsSGIX		MANGLE(GetInstrumentsSGIX)
-+#define glGetIntegerIndexedvEXT		MANGLE(GetIntegerIndexedvEXT)
- #define glGetIntegerv		MANGLE(GetIntegerv)
- #define glGetInvariantBooleanvEXT		MANGLE(GetInvariantBooleanvEXT)
- #define glGetInvariantFloatvEXT		MANGLE(GetInvariantFloatvEXT)
-@@ -503,12 +529,16 @@
- #define glGetPolygonStipple		MANGLE(GetPolygonStipple)
- #define glGetProgramEnvParameterdvARB		MANGLE(GetProgramEnvParameterdvARB)
- #define glGetProgramEnvParameterfvARB		MANGLE(GetProgramEnvParameterfvARB)
-+#define glGetProgramEnvParameterIivNV		MANGLE(GetProgramEnvParameterIivNV)
-+#define glGetProgramEnvParameterIuivNV		MANGLE(GetProgramEnvParameterIuivNV)
- #define glGetProgramInfoLog		MANGLE(GetProgramInfoLog)
- #define glGetProgramivARB		MANGLE(GetProgramivARB)
- #define glGetProgramiv		MANGLE(GetProgramiv)
- #define glGetProgramivNV		MANGLE(GetProgramivNV)
- #define glGetProgramLocalParameterdvARB		MANGLE(GetProgramLocalParameterdvARB)
- #define glGetProgramLocalParameterfvARB		MANGLE(GetProgramLocalParameterfvARB)
-+#define glGetProgramLocalParameterIivNV		MANGLE(GetProgramLocalParameterIivNV)
-+#define glGetProgramLocalParameterIuivNV		MANGLE(GetProgramLocalParameterIuivNV)
- #define glGetProgramNamedParameterdvNV		MANGLE(GetProgramNamedParameterdvNV)
- #define glGetProgramNamedParameterfvNV		MANGLE(GetProgramNamedParameterfvNV)
- #define glGetProgramParameterdvNV		MANGLE(GetProgramParameterdvNV)
-@@ -545,20 +575,27 @@
- #define glGetTexLevelParameterfv		MANGLE(GetTexLevelParameterfv)
- #define glGetTexLevelParameteriv		MANGLE(GetTexLevelParameteriv)
- #define glGetTexParameterfv		MANGLE(GetTexParameterfv)
-+#define glGetTexParameterIivEXT		MANGLE(GetTexParameterIivEXT)
-+#define glGetTexParameterIuivEXT		MANGLE(GetTexParameterIuivEXT)
- #define glGetTexParameteriv		MANGLE(GetTexParameteriv)
- #define glGetTrackMatrixivNV		MANGLE(GetTrackMatrixivNV)
-+#define glGetTransformFeedbackVaryingNV		MANGLE(GetTransformFeedbackVaryingNV)
-+#define glGetUniformBufferSizeEXT		MANGLE(GetUniformBufferSizeEXT)
- #define glGetUniformfvARB		MANGLE(GetUniformfvARB)
- #define glGetUniformfv		MANGLE(GetUniformfv)
- #define glGetUniformivARB		MANGLE(GetUniformivARB)
- #define glGetUniformiv		MANGLE(GetUniformiv)
- #define glGetUniformLocationARB		MANGLE(GetUniformLocationARB)
- #define glGetUniformLocation		MANGLE(GetUniformLocation)
-+#define glGetUniformOffsetEXT		MANGLE(GetUniformOffsetEXT)
-+#define glGetUniformuivEXT		MANGLE(GetUniformuivEXT)
- #define glGetVariantArrayObjectfvATI		MANGLE(GetVariantArrayObjectfvATI)
- #define glGetVariantArrayObjectivATI		MANGLE(GetVariantArrayObjectivATI)
- #define glGetVariantBooleanvEXT		MANGLE(GetVariantBooleanvEXT)
- #define glGetVariantFloatvEXT		MANGLE(GetVariantFloatvEXT)
- #define glGetVariantIntegervEXT		MANGLE(GetVariantIntegervEXT)
- #define glGetVariantPointervEXT		MANGLE(GetVariantPointervEXT)
-+#define glGetVaryingLocationNV		MANGLE(GetVaryingLocationNV)
- #define glGetVertexAttribArrayObjectfvATI		MANGLE(GetVertexAttribArrayObjectfvATI)
- #define glGetVertexAttribArrayObjectivATI		MANGLE(GetVertexAttribArrayObjectivATI)
- #define glGetVertexAttribdvARB		MANGLE(GetVertexAttribdvARB)
-@@ -567,6 +604,8 @@
- #define glGetVertexAttribfvARB		MANGLE(GetVertexAttribfvARB)
- #define glGetVertexAttribfv		MANGLE(GetVertexAttribfv)
- #define glGetVertexAttribfvNV		MANGLE(GetVertexAttribfvNV)
-+#define glGetVertexAttribIivEXT		MANGLE(GetVertexAttribIivEXT)
-+#define glGetVertexAttribIuivEXT		MANGLE(GetVertexAttribIuivEXT)
- #define glGetVertexAttribivARB		MANGLE(GetVertexAttribivARB)
- #define glGetVertexAttribiv		MANGLE(GetVertexAttribiv)
- #define glGetVertexAttribivNV		MANGLE(GetVertexAttribivNV)
-@@ -613,6 +652,7 @@
- #define glIsAsyncMarkerSGIX		MANGLE(IsAsyncMarkerSGIX)
- #define glIsBufferARB		MANGLE(IsBufferARB)
- #define glIsBuffer		MANGLE(IsBuffer)
-+#define glIsEnabledIndexedEXT		MANGLE(IsEnabledIndexedEXT)
- #define glIsEnabled		MANGLE(IsEnabled)
- #define glIsFenceAPPLE		MANGLE(IsFenceAPPLE)
- #define glIsFenceNV		MANGLE(IsFenceNV)
-@@ -852,17 +892,32 @@
- #define glPrimitiveRestartNV		MANGLE(PrimitiveRestartNV)
- #define glPrioritizeTexturesEXT		MANGLE(PrioritizeTexturesEXT)
- #define glPrioritizeTextures		MANGLE(PrioritizeTextures)
-+#define glProgramBufferParametersfvNV		MANGLE(ProgramBufferParametersfvNV)
-+#define glProgramBufferParametersIivNV		MANGLE(ProgramBufferParametersIivNV)
-+#define glProgramBufferParametersIuivNV		MANGLE(ProgramBufferParametersIuivNV)
- #define glProgramCallbackMESA		MANGLE(ProgramCallbackMESA)
- #define glProgramEnvParameter4dARB		MANGLE(ProgramEnvParameter4dARB)
- #define glProgramEnvParameter4dvARB		MANGLE(ProgramEnvParameter4dvARB)
- #define glProgramEnvParameter4fARB		MANGLE(ProgramEnvParameter4fARB)
- #define glProgramEnvParameter4fvARB		MANGLE(ProgramEnvParameter4fvARB)
-+#define glProgramEnvParameterI4iNV		MANGLE(ProgramEnvParameterI4iNV)
-+#define glProgramEnvParameterI4ivNV		MANGLE(ProgramEnvParameterI4ivNV)
-+#define glProgramEnvParameterI4uiNV		MANGLE(ProgramEnvParameterI4uiNV)
-+#define glProgramEnvParameterI4uivNV		MANGLE(ProgramEnvParameterI4uivNV)
- #define glProgramEnvParameters4fvEXT		MANGLE(ProgramEnvParameters4fvEXT)
-+#define glProgramEnvParametersI4ivNV		MANGLE(ProgramEnvParametersI4ivNV)
-+#define glProgramEnvParametersI4uivNV		MANGLE(ProgramEnvParametersI4uivNV)
- #define glProgramLocalParameter4dARB		MANGLE(ProgramLocalParameter4dARB)
- #define glProgramLocalParameter4dvARB		MANGLE(ProgramLocalParameter4dvARB)
- #define glProgramLocalParameter4fARB		MANGLE(ProgramLocalParameter4fARB)
- #define glProgramLocalParameter4fvARB		MANGLE(ProgramLocalParameter4fvARB)
-+#define glProgramLocalParameterI4iNV		MANGLE(ProgramLocalParameterI4iNV)
-+#define glProgramLocalParameterI4ivNV		MANGLE(ProgramLocalParameterI4ivNV)
-+#define glProgramLocalParameterI4uiNV		MANGLE(ProgramLocalParameterI4uiNV)
-+#define glProgramLocalParameterI4uivNV		MANGLE(ProgramLocalParameterI4uivNV)
- #define glProgramLocalParameters4fvEXT		MANGLE(ProgramLocalParameters4fvEXT)
-+#define glProgramLocalParametersI4ivNV		MANGLE(ProgramLocalParametersI4ivNV)
-+#define glProgramLocalParametersI4uivNV		MANGLE(ProgramLocalParametersI4uivNV)
- #define glProgramNamedParameter4dNV		MANGLE(ProgramNamedParameter4dNV)
- #define glProgramNamedParameter4dvNV		MANGLE(ProgramNamedParameter4dvNV)
- #define glProgramNamedParameter4fNV		MANGLE(ProgramNamedParameter4fNV)
-@@ -871,9 +926,11 @@
- #define glProgramParameter4dvNV		MANGLE(ProgramParameter4dvNV)
- #define glProgramParameter4fNV		MANGLE(ProgramParameter4fNV)
- #define glProgramParameter4fvNV		MANGLE(ProgramParameter4fvNV)
-+#define glProgramParameteriEXT		MANGLE(ProgramParameteriEXT)
- #define glProgramParameters4dvNV		MANGLE(ProgramParameters4dvNV)
- #define glProgramParameters4fvNV		MANGLE(ProgramParameters4fvNV)
- #define glProgramStringARB		MANGLE(ProgramStringARB)
-+#define glProgramVertexLimitNV		MANGLE(ProgramVertexLimitNV)
- #define glPushAttrib		MANGLE(PushAttrib)
- #define glPushClientAttrib		MANGLE(PushClientAttrib)
- #define glPushMatrix		MANGLE(PushMatrix)
-@@ -915,6 +972,7 @@
- #define glRectsv		MANGLE(Rectsv)
- #define glReferencePlaneSGIX		MANGLE(ReferencePlaneSGIX)
- #define glRenderbufferStorageEXT		MANGLE(RenderbufferStorageEXT)
-+#define glRenderbufferStorageMultisampleCoverageNV		MANGLE(RenderbufferStorageMultisampleCoverageNV)
- #define glRenderbufferStorageMultisampleEXT		MANGLE(RenderbufferStorageMultisampleEXT)
- #define glRenderMode		MANGLE(RenderMode)
- #define glReplacementCodePointerSUN		MANGLE(ReplacementCodePointerSUN)
-@@ -1043,6 +1101,7 @@
- #define glTestFenceAPPLE		MANGLE(TestFenceAPPLE)
- #define glTestFenceNV		MANGLE(TestFenceNV)
- #define glTestObjectAPPLE		MANGLE(TestObjectAPPLE)
-+#define glTexBufferEXT		MANGLE(TexBufferEXT)
- #define glTexBumpParameterfvATI		MANGLE(TexBumpParameterfvATI)
- #define glTexBumpParameterivATI		MANGLE(TexBumpParameterivATI)
- #define glTexCoord1d		MANGLE(TexCoord1d)
-@@ -1121,7 +1180,9 @@
- #define glTexImage4DSGIS		MANGLE(TexImage4DSGIS)
- #define glTexParameterf		MANGLE(TexParameterf)
- #define glTexParameterfv		MANGLE(TexParameterfv)
-+#define glTexParameterIivEXT		MANGLE(TexParameterIivEXT)
- #define glTexParameteri		MANGLE(TexParameteri)
-+#define glTexParameterIuivEXT		MANGLE(TexParameterIuivEXT)
- #define glTexParameteriv		MANGLE(TexParameteriv)
- #define glTexSubImage1DEXT		MANGLE(TexSubImage1DEXT)
- #define glTexSubImage1D		MANGLE(TexSubImage1D)
-@@ -1135,6 +1196,8 @@
- #define glTextureMaterialEXT		MANGLE(TextureMaterialEXT)
- #define glTextureNormalEXT		MANGLE(TextureNormalEXT)
- #define glTrackMatrixNV		MANGLE(TrackMatrixNV)
-+#define glTransformFeedbackAttribsNV		MANGLE(TransformFeedbackAttribsNV)
-+#define glTransformFeedbackVaryingsNV		MANGLE(TransformFeedbackVaryingsNV)
- #define glTranslated		MANGLE(Translated)
- #define glTranslatef		MANGLE(Translatef)
- #define glUniform1fARB		MANGLE(Uniform1fARB)
-@@ -1145,6 +1208,8 @@
- #define glUniform1i		MANGLE(Uniform1i)
- #define glUniform1ivARB		MANGLE(Uniform1ivARB)
- #define glUniform1iv		MANGLE(Uniform1iv)
-+#define glUniform1uiEXT		MANGLE(Uniform1uiEXT)
-+#define glUniform1uivEXT		MANGLE(Uniform1uivEXT)
- #define glUniform2fARB		MANGLE(Uniform2fARB)
- #define glUniform2f		MANGLE(Uniform2f)
- #define glUniform2fvARB		MANGLE(Uniform2fvARB)
-@@ -1153,6 +1218,8 @@
- #define glUniform2i		MANGLE(Uniform2i)
- #define glUniform2ivARB		MANGLE(Uniform2ivARB)
- #define glUniform2iv		MANGLE(Uniform2iv)
-+#define glUniform2uiEXT		MANGLE(Uniform2uiEXT)
-+#define glUniform2uivEXT		MANGLE(Uniform2uivEXT)
- #define glUniform3fARB		MANGLE(Uniform3fARB)
- #define glUniform3f		MANGLE(Uniform3f)
- #define glUniform3fvARB		MANGLE(Uniform3fvARB)
-@@ -1161,6 +1228,8 @@
- #define glUniform3i		MANGLE(Uniform3i)
- #define glUniform3ivARB		MANGLE(Uniform3ivARB)
- #define glUniform3iv		MANGLE(Uniform3iv)
-+#define glUniform3uiEXT		MANGLE(Uniform3uiEXT)
-+#define glUniform3uivEXT		MANGLE(Uniform3uivEXT)
- #define glUniform4fARB		MANGLE(Uniform4fARB)
- #define glUniform4f		MANGLE(Uniform4f)
- #define glUniform4fvARB		MANGLE(Uniform4fvARB)
-@@ -1169,6 +1238,9 @@
- #define glUniform4i		MANGLE(Uniform4i)
- #define glUniform4ivARB		MANGLE(Uniform4ivARB)
- #define glUniform4iv		MANGLE(Uniform4iv)
-+#define glUniform4uiEXT		MANGLE(Uniform4uiEXT)
-+#define glUniform4uivEXT		MANGLE(Uniform4uivEXT)
-+#define glUniformBufferEXT		MANGLE(UniformBufferEXT)
- #define glUniformMatrix2fvARB		MANGLE(UniformMatrix2fvARB)
- #define glUniformMatrix2fv		MANGLE(UniformMatrix2fv)
- #define glUniformMatrix2x3fv		MANGLE(UniformMatrix2x3fv)
-@@ -1340,6 +1412,27 @@
- #define glVertexAttrib4usvARB		MANGLE(VertexAttrib4usvARB)
- #define glVertexAttrib4usv		MANGLE(VertexAttrib4usv)
- #define glVertexAttribArrayObjectATI		MANGLE(VertexAttribArrayObjectATI)
-+#define glVertexAttribI1iEXT		MANGLE(VertexAttribI1iEXT)
-+#define glVertexAttribI1ivEXT		MANGLE(VertexAttribI1ivEXT)
-+#define glVertexAttribI1uiEXT		MANGLE(VertexAttribI1uiEXT)
-+#define glVertexAttribI1uivEXT		MANGLE(VertexAttribI1uivEXT)
-+#define glVertexAttribI2iEXT		MANGLE(VertexAttribI2iEXT)
-+#define glVertexAttribI2ivEXT		MANGLE(VertexAttribI2ivEXT)
-+#define glVertexAttribI2uiEXT		MANGLE(VertexAttribI2uiEXT)
-+#define glVertexAttribI2uivEXT		MANGLE(VertexAttribI2uivEXT)
-+#define glVertexAttribI3iEXT		MANGLE(VertexAttribI3iEXT)
-+#define glVertexAttribI3ivEXT		MANGLE(VertexAttribI3ivEXT)
-+#define glVertexAttribI3uiEXT		MANGLE(VertexAttribI3uiEXT)
-+#define glVertexAttribI3uivEXT		MANGLE(VertexAttribI3uivEXT)
-+#define glVertexAttribI4bvEXT		MANGLE(VertexAttribI4bvEXT)
-+#define glVertexAttribI4iEXT		MANGLE(VertexAttribI4iEXT)
-+#define glVertexAttribI4ivEXT		MANGLE(VertexAttribI4ivEXT)
-+#define glVertexAttribI4svEXT		MANGLE(VertexAttribI4svEXT)
-+#define glVertexAttribI4ubvEXT		MANGLE(VertexAttribI4ubvEXT)
-+#define glVertexAttribI4uiEXT		MANGLE(VertexAttribI4uiEXT)
-+#define glVertexAttribI4uivEXT		MANGLE(VertexAttribI4uivEXT)
-+#define glVertexAttribI4usvEXT		MANGLE(VertexAttribI4usvEXT)
-+#define glVertexAttribIPointerEXT		MANGLE(VertexAttribIPointerEXT)
- #define glVertexAttribPointerARB		MANGLE(VertexAttribPointerARB)
- #define glVertexAttribPointer		MANGLE(VertexAttribPointer)
- #define glVertexAttribPointerNV		MANGLE(VertexAttribPointerNV)