Add two new gl_function methods. dispatch_name returns the name of

the true static dispatch name (either the glFooBar name or the
gl_dispatch_stub_XXX name).  static_name returns the name of the
static function for a specific alias of a GL function.

Adding (and using) these two functions corrects some problems in the
generated code related to functions with multiple aliases where some
of the aliases have true static dispatch functions and some don't.  I
have verified that everything under progs, except xdemos/xdemo,
correctly link.  I did this by doing 'make linux-dri-x86-64
PROGRAM_DIRS="demos redbook samples xdemos tests"'.

6 files changed, 208 insertions, 220 deletions

diff --git a/src/mesa/glapi/gl_XML.py b/src/mesa/glapi/gl_XML.py
index 868a7cd..cde9cf7 100644
--- a/src/mesa/glapi/gl_XML.py
+++ b/src/mesa/glapi/gl_XML.py
@@ -737,6 +737,18 @@ class gl_function( gl_item ):
 	def is_static_entry_point(self, name):
 		return name in self.static_entry_points
 
+	def dispatch_name(self):
+		if self.name in self.static_entry_points:
+			return self.name
+		else:
+			return "_dispatch_stub_%u" % (self.offset)
+
+	def static_name(self, name):
+		if name in self.static_entry_points:
+			return name
+		else:
+			return "_dispatch_stub_%u" % (self.offset)
+
 
 class gl_item_factory:
 	"""Factory to create objects derived from gl_item."""
diff --git a/src/mesa/glapi/gl_apitemp.py b/src/mesa/glapi/gl_apitemp.py
index 04a3ff3..cb87dbd 100644
--- a/src/mesa/glapi/gl_apitemp.py
+++ b/src/mesa/glapi/gl_apitemp.py
@@ -56,12 +56,12 @@ class PrintGlOffsets(gl_XML.gl_print_base):
 		comma = ""
 
 		if f.is_static_entry_point(name):
-			n = name
 			keyword = "KEYWORD1"
 		else:
-			n = "_dispatch_stub_%u" % (f.offset)
 			keyword = "KEYWORD1_ALT"
 
+		n = f.static_name(name)
+
 		for p in f.parameterIterator():
 			if p.is_pointer():
 				cast = "(const void *) "
@@ -166,12 +166,7 @@ class PrintGlOffsets(gl_XML.gl_print_base):
 
 static _glapi_proc DISPATCH_TABLE_NAME[] = {"""
 		for f in api.functionIterateByOffset():
-			if f.is_static_entry_point(f.name):
-				n = f.name
-			else:
-				n = "_dispatch_stub_%u" % (f.offset)
-
-			print '   TABLE_ENTRY(%s),' % (n)
+			print '   TABLE_ENTRY(%s),' % (f.dispatch_name())
 
 		print '   /* A whole bunch of no-op functions.  These might be called'
 		print '    * when someone tries to call a dynamically-registered'
diff --git a/src/mesa/glapi/gl_procs.py b/src/mesa/glapi/gl_procs.py
index 4a540e2..88d99d2 100644
--- a/src/mesa/glapi/gl_procs.py
+++ b/src/mesa/glapi/gl_procs.py
@@ -87,12 +87,8 @@ class PrintGlProcs(gl_XML.gl_print_base):
 		base_offset = 0
 		table = []
 		for func in api.functionIterateByOffset():
-			if func.is_static_entry_point(func.name):
-				name = func.name
-			else:
-				name = "_dispatch_stub_%u" % (func.offset)
-
-			self.printFunctionString( func.name )
+			name = func.dispatch_name()
+			self.printFunctionString(func.name)
 			table.append((base_offset, name, func.name))
 
 			# The length of the function's name, plus 2 for "gl",
@@ -104,11 +100,7 @@ class PrintGlProcs(gl_XML.gl_print_base):
 		for func in api.functionIterateByOffset():
 			for n in func.entry_points:
 				if n != func.name:
-					if func.is_static_entry_point(n):
-						name = n
-					else:
-						name = "_dispatch_stub_%u" % (func.offset)
-
+					name = func.dispatch_name()
 					self.printFunctionString( n )
 					table.append((base_offset, name, func.name))
 					base_offset += len(n) + 3
@@ -124,7 +116,7 @@ class PrintGlProcs(gl_XML.gl_print_base):
 		print '#ifdef NEED_FUNCTION_POINTER'
 		for func in api.functionIterateByOffset():
 			for n in func.entry_points:
-				if not func.is_static_entry_point(n):
+				if not func.is_static_entry_point(func.name):
 					print 'extern void gl_dispatch_stub_%u(void);' % (func.offset)
 					break
 
diff --git a/src/mesa/glapi/gl_x86-64_asm.py b/src/mesa/glapi/gl_x86-64_asm.py
index 33943bc..d06e533 100644
--- a/src/mesa/glapi/gl_x86-64_asm.py
+++ b/src/mesa/glapi/gl_x86-64_asm.py
@@ -236,10 +236,7 @@ class PrintGenericStubs(gl_XML.gl_print_base):
 			registers.append( ["%rbp", 0] )
 
 
-		if f.is_static_entry_point(f.name):
-			name = f.name
-		else:
-			name = "_dispatch_stub_%u" % (f.offset)
+		name = f.dispatch_name()
 
 		print '\t.p2align\t4,,15'
 		print '\t.globl\tGL_PREFIX(%s)' % (name)
@@ -291,10 +288,11 @@ class PrintGenericStubs(gl_XML.gl_print_base):
 
 
 		for f in api.functionIterateByOffset():
+			dispatch = f.dispatch_name()
 			for n in f.entry_points:
 				if n != f.name:
 					if f.is_static_entry_point(n):
-						print '\t.globl GL_PREFIX(%s) ; .set GL_PREFIX(%s), GL_PREFIX(%s)' % (n, n, f.name)
+						print '\t.globl GL_PREFIX(%s) ; .set GL_PREFIX(%s), GL_PREFIX(%s)' % (n, n, dispatch)
 
 		return
 
diff --git a/src/mesa/glapi/gl_x86_asm.py b/src/mesa/glapi/gl_x86_asm.py
index 2ebe4e8..5825960 100644
--- a/src/mesa/glapi/gl_x86_asm.py
+++ b/src/mesa/glapi/gl_x86_asm.py
@@ -197,14 +197,10 @@ class PrintGenericStubs(gl_XML.gl_print_base):
 
 	def printBody(self, api):
 		for f in api.functionIterateByOffset():
-			if f.is_static_entry_point(f.name):
-				name = f.name
-			else:
-				name = "_dispatch_stub_%u" % (f.offset)
-
+			name = f.dispatch_name()
 			stack = self.get_stack_size(f)
-
 			alt = "%s@%u" % (name, stack)
+
 			print '\tGL_STUB(%s, _gloffset_%s, %s)' % (name, f.name, alt)
 
 			if not f.is_static_entry_point(f.name):
@@ -212,13 +208,8 @@ class PrintGenericStubs(gl_XML.gl_print_base):
 
 
 		for f in api.functionIterateByOffset():
-			if f.is_static_entry_point(f.name):
-				name = f.name
-			else:
-				name = "_dispatch_stub_%u" % (f.offset)
-
+			name = f.dispatch_name()
 			stack = self.get_stack_size(f)
-
 			alt = "%s@%u" % (name, stack)
 
 			if f.is_static_entry_point(f.name):
diff --git a/src/mesa/glapi/glprocs.h b/src/mesa/glapi/glprocs.h
index 46f4063..e551cdd 100644
--- a/src/mesa/glapi/glprocs.h
+++ b/src/mesa/glapi/glprocs.h
@@ -1786,189 +1786,189 @@ static const glprocs_table_t static_functions[] = {
     NAME_FUNC_OFFSET( 13623, glBlitFramebufferEXT, _gloffset_BlitFramebufferEXT ),
     NAME_FUNC_OFFSET( 13644, gl_dispatch_stub_770, _gloffset_ProgramEnvParameters4fvEXT ),
     NAME_FUNC_OFFSET( 13673, gl_dispatch_stub_771, _gloffset_ProgramLocalParameters4fvEXT ),
-    NAME_FUNC_OFFSET( 13704, glArrayElementEXT, _gloffset_ArrayElement ),
-    NAME_FUNC_OFFSET( 13722, glBindTextureEXT, _gloffset_BindTexture ),
-    NAME_FUNC_OFFSET( 13739, glDrawArraysEXT, _gloffset_DrawArrays ),
-    NAME_FUNC_OFFSET( 13755, glCopyTexImage1DEXT, _gloffset_CopyTexImage1D ),
-    NAME_FUNC_OFFSET( 13775, glCopyTexImage2DEXT, _gloffset_CopyTexImage2D ),
-    NAME_FUNC_OFFSET( 13795, glCopyTexSubImage1DEXT, _gloffset_CopyTexSubImage1D ),
-    NAME_FUNC_OFFSET( 13818, glCopyTexSubImage2DEXT, _gloffset_CopyTexSubImage2D ),
-    NAME_FUNC_OFFSET( 13841, glDeleteTexturesEXT, _gloffset_DeleteTextures ),
-    NAME_FUNC_OFFSET( 13861, glGetPointervEXT, _gloffset_GetPointerv ),
-    NAME_FUNC_OFFSET( 13878, glPrioritizeTexturesEXT, _gloffset_PrioritizeTextures ),
-    NAME_FUNC_OFFSET( 13902, glTexSubImage1DEXT, _gloffset_TexSubImage1D ),
-    NAME_FUNC_OFFSET( 13921, glTexSubImage2DEXT, _gloffset_TexSubImage2D ),
-    NAME_FUNC_OFFSET( 13940, glBlendColorEXT, _gloffset_BlendColor ),
-    NAME_FUNC_OFFSET( 13956, glBlendEquationEXT, _gloffset_BlendEquation ),
-    NAME_FUNC_OFFSET( 13975, glDrawRangeElementsEXT, _gloffset_DrawRangeElements ),
-    NAME_FUNC_OFFSET( 13998, glColorTableSGI, _gloffset_ColorTable ),
-    NAME_FUNC_OFFSET( 14014, glColorTableEXT, _gloffset_ColorTable ),
-    NAME_FUNC_OFFSET( 14030, glColorTableParameterfvSGI, _gloffset_ColorTableParameterfv ),
-    NAME_FUNC_OFFSET( 14057, glColorTableParameterivSGI, _gloffset_ColorTableParameteriv ),
-    NAME_FUNC_OFFSET( 14084, glCopyColorTableSGI, _gloffset_CopyColorTable ),
-    NAME_FUNC_OFFSET( 14104, glColorSubTableEXT, _gloffset_ColorSubTable ),
-    NAME_FUNC_OFFSET( 14123, glCopyColorSubTableEXT, _gloffset_CopyColorSubTable ),
-    NAME_FUNC_OFFSET( 14146, glConvolutionFilter1DEXT, _gloffset_ConvolutionFilter1D ),
-    NAME_FUNC_OFFSET( 14171, glConvolutionFilter2DEXT, _gloffset_ConvolutionFilter2D ),
-    NAME_FUNC_OFFSET( 14196, glConvolutionParameterfEXT, _gloffset_ConvolutionParameterf ),
-    NAME_FUNC_OFFSET( 14223, glConvolutionParameterfvEXT, _gloffset_ConvolutionParameterfv ),
-    NAME_FUNC_OFFSET( 14251, glConvolutionParameteriEXT, _gloffset_ConvolutionParameteri ),
-    NAME_FUNC_OFFSET( 14278, glConvolutionParameterivEXT, _gloffset_ConvolutionParameteriv ),
-    NAME_FUNC_OFFSET( 14306, glCopyConvolutionFilter1DEXT, _gloffset_CopyConvolutionFilter1D ),
-    NAME_FUNC_OFFSET( 14335, glCopyConvolutionFilter2DEXT, _gloffset_CopyConvolutionFilter2D ),
-    NAME_FUNC_OFFSET( 14364, glSeparableFilter2DEXT, _gloffset_SeparableFilter2D ),
-    NAME_FUNC_OFFSET( 14387, glHistogramEXT, _gloffset_Histogram ),
-    NAME_FUNC_OFFSET( 14402, glMinmaxEXT, _gloffset_Minmax ),
-    NAME_FUNC_OFFSET( 14414, glResetHistogramEXT, _gloffset_ResetHistogram ),
-    NAME_FUNC_OFFSET( 14434, glResetMinmaxEXT, _gloffset_ResetMinmax ),
-    NAME_FUNC_OFFSET( 14451, glTexImage3DEXT, _gloffset_TexImage3D ),
-    NAME_FUNC_OFFSET( 14467, glTexSubImage3DEXT, _gloffset_TexSubImage3D ),
-    NAME_FUNC_OFFSET( 14486, glCopyTexSubImage3DEXT, _gloffset_CopyTexSubImage3D ),
-    NAME_FUNC_OFFSET( 14509, glActiveTexture, _gloffset_ActiveTextureARB ),
-    NAME_FUNC_OFFSET( 14525, glClientActiveTexture, _gloffset_ClientActiveTextureARB ),
-    NAME_FUNC_OFFSET( 14547, glMultiTexCoord1d, _gloffset_MultiTexCoord1dARB ),
-    NAME_FUNC_OFFSET( 14565, glMultiTexCoord1dv, _gloffset_MultiTexCoord1dvARB ),
-    NAME_FUNC_OFFSET( 14584, glMultiTexCoord1f, _gloffset_MultiTexCoord1fARB ),
-    NAME_FUNC_OFFSET( 14602, glMultiTexCoord1fv, _gloffset_MultiTexCoord1fvARB ),
-    NAME_FUNC_OFFSET( 14621, glMultiTexCoord1i, _gloffset_MultiTexCoord1iARB ),
-    NAME_FUNC_OFFSET( 14639, glMultiTexCoord1iv, _gloffset_MultiTexCoord1ivARB ),
-    NAME_FUNC_OFFSET( 14658, glMultiTexCoord1s, _gloffset_MultiTexCoord1sARB ),
-    NAME_FUNC_OFFSET( 14676, glMultiTexCoord1sv, _gloffset_MultiTexCoord1svARB ),
-    NAME_FUNC_OFFSET( 14695, glMultiTexCoord2d, _gloffset_MultiTexCoord2dARB ),
-    NAME_FUNC_OFFSET( 14713, glMultiTexCoord2dv, _gloffset_MultiTexCoord2dvARB ),
-    NAME_FUNC_OFFSET( 14732, glMultiTexCoord2f, _gloffset_MultiTexCoord2fARB ),
-    NAME_FUNC_OFFSET( 14750, glMultiTexCoord2fv, _gloffset_MultiTexCoord2fvARB ),
-    NAME_FUNC_OFFSET( 14769, glMultiTexCoord2i, _gloffset_MultiTexCoord2iARB ),
-    NAME_FUNC_OFFSET( 14787, glMultiTexCoord2iv, _gloffset_MultiTexCoord2ivARB ),
-    NAME_FUNC_OFFSET( 14806, glMultiTexCoord2s, _gloffset_MultiTexCoord2sARB ),
-    NAME_FUNC_OFFSET( 14824, glMultiTexCoord2sv, _gloffset_MultiTexCoord2svARB ),
-    NAME_FUNC_OFFSET( 14843, glMultiTexCoord3d, _gloffset_MultiTexCoord3dARB ),
-    NAME_FUNC_OFFSET( 14861, glMultiTexCoord3dv, _gloffset_MultiTexCoord3dvARB ),
-    NAME_FUNC_OFFSET( 14880, glMultiTexCoord3f, _gloffset_MultiTexCoord3fARB ),
-    NAME_FUNC_OFFSET( 14898, glMultiTexCoord3fv, _gloffset_MultiTexCoord3fvARB ),
-    NAME_FUNC_OFFSET( 14917, glMultiTexCoord3i, _gloffset_MultiTexCoord3iARB ),
-    NAME_FUNC_OFFSET( 14935, glMultiTexCoord3iv, _gloffset_MultiTexCoord3ivARB ),
-    NAME_FUNC_OFFSET( 14954, glMultiTexCoord3s, _gloffset_MultiTexCoord3sARB ),
-    NAME_FUNC_OFFSET( 14972, glMultiTexCoord3sv, _gloffset_MultiTexCoord3svARB ),
-    NAME_FUNC_OFFSET( 14991, glMultiTexCoord4d, _gloffset_MultiTexCoord4dARB ),
-    NAME_FUNC_OFFSET( 15009, glMultiTexCoord4dv, _gloffset_MultiTexCoord4dvARB ),
-    NAME_FUNC_OFFSET( 15028, glMultiTexCoord4f, _gloffset_MultiTexCoord4fARB ),
-    NAME_FUNC_OFFSET( 15046, glMultiTexCoord4fv, _gloffset_MultiTexCoord4fvARB ),
-    NAME_FUNC_OFFSET( 15065, glMultiTexCoord4i, _gloffset_MultiTexCoord4iARB ),
-    NAME_FUNC_OFFSET( 15083, glMultiTexCoord4iv, _gloffset_MultiTexCoord4ivARB ),
-    NAME_FUNC_OFFSET( 15102, glMultiTexCoord4s, _gloffset_MultiTexCoord4sARB ),
-    NAME_FUNC_OFFSET( 15120, glMultiTexCoord4sv, _gloffset_MultiTexCoord4svARB ),
-    NAME_FUNC_OFFSET( 15139, glLoadTransposeMatrixd, _gloffset_LoadTransposeMatrixdARB ),
-    NAME_FUNC_OFFSET( 15162, glLoadTransposeMatrixf, _gloffset_LoadTransposeMatrixfARB ),
-    NAME_FUNC_OFFSET( 15185, glMultTransposeMatrixd, _gloffset_MultTransposeMatrixdARB ),
-    NAME_FUNC_OFFSET( 15208, glMultTransposeMatrixf, _gloffset_MultTransposeMatrixfARB ),
-    NAME_FUNC_OFFSET( 15231, glSampleCoverage, _gloffset_SampleCoverageARB ),
-    NAME_FUNC_OFFSET( 15248, glCompressedTexImage1D, _gloffset_CompressedTexImage1DARB ),
-    NAME_FUNC_OFFSET( 15271, glCompressedTexImage2D, _gloffset_CompressedTexImage2DARB ),
-    NAME_FUNC_OFFSET( 15294, glCompressedTexImage3D, _gloffset_CompressedTexImage3DARB ),
-    NAME_FUNC_OFFSET( 15317, glCompressedTexSubImage1D, _gloffset_CompressedTexSubImage1DARB ),
-    NAME_FUNC_OFFSET( 15343, glCompressedTexSubImage2D, _gloffset_CompressedTexSubImage2DARB ),
-    NAME_FUNC_OFFSET( 15369, glCompressedTexSubImage3D, _gloffset_CompressedTexSubImage3DARB ),
-    NAME_FUNC_OFFSET( 15395, glGetCompressedTexImage, _gloffset_GetCompressedTexImageARB ),
-    NAME_FUNC_OFFSET( 15419, glBindBuffer, _gloffset_BindBufferARB ),
-    NAME_FUNC_OFFSET( 15432, glBufferData, _gloffset_BufferDataARB ),
-    NAME_FUNC_OFFSET( 15445, glBufferSubData, _gloffset_BufferSubDataARB ),
-    NAME_FUNC_OFFSET( 15461, glDeleteBuffers, _gloffset_DeleteBuffersARB ),
-    NAME_FUNC_OFFSET( 15477, glGenBuffers, _gloffset_GenBuffersARB ),
-    NAME_FUNC_OFFSET( 15490, glGetBufferParameteriv, _gloffset_GetBufferParameterivARB ),
-    NAME_FUNC_OFFSET( 15513, glGetBufferPointerv, _gloffset_GetBufferPointervARB ),
-    NAME_FUNC_OFFSET( 15533, glGetBufferSubData, _gloffset_GetBufferSubDataARB ),
-    NAME_FUNC_OFFSET( 15552, glIsBuffer, _gloffset_IsBufferARB ),
-    NAME_FUNC_OFFSET( 15563, glMapBuffer, _gloffset_MapBufferARB ),
-    NAME_FUNC_OFFSET( 15575, glUnmapBuffer, _gloffset_UnmapBufferARB ),
-    NAME_FUNC_OFFSET( 15589, glBeginQuery, _gloffset_BeginQueryARB ),
-    NAME_FUNC_OFFSET( 15602, glDeleteQueries, _gloffset_DeleteQueriesARB ),
-    NAME_FUNC_OFFSET( 15618, glEndQuery, _gloffset_EndQueryARB ),
-    NAME_FUNC_OFFSET( 15629, glGenQueries, _gloffset_GenQueriesARB ),
-    NAME_FUNC_OFFSET( 15642, glGetQueryObjectiv, _gloffset_GetQueryObjectivARB ),
-    NAME_FUNC_OFFSET( 15661, glGetQueryObjectuiv, _gloffset_GetQueryObjectuivARB ),
-    NAME_FUNC_OFFSET( 15681, glGetQueryiv, _gloffset_GetQueryivARB ),
-    NAME_FUNC_OFFSET( 15694, glIsQuery, _gloffset_IsQueryARB ),
-    NAME_FUNC_OFFSET( 15704, glDrawBuffers, _gloffset_DrawBuffersARB ),
-    NAME_FUNC_OFFSET( 15718, glDrawBuffersATI, _gloffset_DrawBuffersARB ),
-    NAME_FUNC_OFFSET( 15735, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfvSGI ),
-    NAME_FUNC_OFFSET( 15765, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameterivSGI ),
-    NAME_FUNC_OFFSET( 15795, glGetColorTableEXT, _gloffset_GetColorTableSGI ),
-    NAME_FUNC_OFFSET( 15814, glSampleMaskEXT, _gloffset_SampleMaskSGIS ),
-    NAME_FUNC_OFFSET( 15830, glSamplePatternEXT, _gloffset_SamplePatternSGIS ),
-    NAME_FUNC_OFFSET( 15849, glPointParameterf, _gloffset_PointParameterfEXT ),
-    NAME_FUNC_OFFSET( 15867, glPointParameterfARB, _gloffset_PointParameterfEXT ),
-    NAME_FUNC_OFFSET( 15888, glPointParameterfSGIS, _gloffset_PointParameterfEXT ),
-    NAME_FUNC_OFFSET( 15910, glPointParameterfv, _gloffset_PointParameterfvEXT ),
-    NAME_FUNC_OFFSET( 15929, glPointParameterfvARB, _gloffset_PointParameterfvEXT ),
-    NAME_FUNC_OFFSET( 15951, glPointParameterfvSGIS, _gloffset_PointParameterfvEXT ),
-    NAME_FUNC_OFFSET( 15974, glSecondaryColor3b, _gloffset_SecondaryColor3bEXT ),
-    NAME_FUNC_OFFSET( 15993, glSecondaryColor3bv, _gloffset_SecondaryColor3bvEXT ),
-    NAME_FUNC_OFFSET( 16013, glSecondaryColor3d, _gloffset_SecondaryColor3dEXT ),
-    NAME_FUNC_OFFSET( 16032, glSecondaryColor3dv, _gloffset_SecondaryColor3dvEXT ),
-    NAME_FUNC_OFFSET( 16052, glSecondaryColor3f, _gloffset_SecondaryColor3fEXT ),
-    NAME_FUNC_OFFSET( 16071, glSecondaryColor3fv, _gloffset_SecondaryColor3fvEXT ),
-    NAME_FUNC_OFFSET( 16091, glSecondaryColor3i, _gloffset_SecondaryColor3iEXT ),
-    NAME_FUNC_OFFSET( 16110, glSecondaryColor3iv, _gloffset_SecondaryColor3ivEXT ),
-    NAME_FUNC_OFFSET( 16130, glSecondaryColor3s, _gloffset_SecondaryColor3sEXT ),
-    NAME_FUNC_OFFSET( 16149, glSecondaryColor3sv, _gloffset_SecondaryColor3svEXT ),
-    NAME_FUNC_OFFSET( 16169, glSecondaryColor3ub, _gloffset_SecondaryColor3ubEXT ),
-    NAME_FUNC_OFFSET( 16189, glSecondaryColor3ubv, _gloffset_SecondaryColor3ubvEXT ),
-    NAME_FUNC_OFFSET( 16210, glSecondaryColor3ui, _gloffset_SecondaryColor3uiEXT ),
-    NAME_FUNC_OFFSET( 16230, glSecondaryColor3uiv, _gloffset_SecondaryColor3uivEXT ),
-    NAME_FUNC_OFFSET( 16251, glSecondaryColor3us, _gloffset_SecondaryColor3usEXT ),
-    NAME_FUNC_OFFSET( 16271, glSecondaryColor3usv, _gloffset_SecondaryColor3usvEXT ),
-    NAME_FUNC_OFFSET( 16292, glSecondaryColorPointer, _gloffset_SecondaryColorPointerEXT ),
-    NAME_FUNC_OFFSET( 16316, glMultiDrawArrays, _gloffset_MultiDrawArraysEXT ),
-    NAME_FUNC_OFFSET( 16334, glMultiDrawElements, _gloffset_MultiDrawElementsEXT ),
-    NAME_FUNC_OFFSET( 16354, glFogCoordPointer, _gloffset_FogCoordPointerEXT ),
-    NAME_FUNC_OFFSET( 16372, glFogCoordd, _gloffset_FogCoorddEXT ),
-    NAME_FUNC_OFFSET( 16384, glFogCoorddv, _gloffset_FogCoorddvEXT ),
-    NAME_FUNC_OFFSET( 16397, glFogCoordf, _gloffset_FogCoordfEXT ),
-    NAME_FUNC_OFFSET( 16409, glFogCoordfv, _gloffset_FogCoordfvEXT ),
-    NAME_FUNC_OFFSET( 16422, glBlendFuncSeparate, _gloffset_BlendFuncSeparateEXT ),
-    NAME_FUNC_OFFSET( 16442, glBlendFuncSeparateINGR, _gloffset_BlendFuncSeparateEXT ),
-    NAME_FUNC_OFFSET( 16466, glWindowPos2d, _gloffset_WindowPos2dMESA ),
-    NAME_FUNC_OFFSET( 16480, glWindowPos2dARB, _gloffset_WindowPos2dMESA ),
-    NAME_FUNC_OFFSET( 16497, glWindowPos2dv, _gloffset_WindowPos2dvMESA ),
-    NAME_FUNC_OFFSET( 16512, glWindowPos2dvARB, _gloffset_WindowPos2dvMESA ),
-    NAME_FUNC_OFFSET( 16530, glWindowPos2f, _gloffset_WindowPos2fMESA ),
-    NAME_FUNC_OFFSET( 16544, glWindowPos2fARB, _gloffset_WindowPos2fMESA ),
-    NAME_FUNC_OFFSET( 16561, glWindowPos2fv, _gloffset_WindowPos2fvMESA ),
-    NAME_FUNC_OFFSET( 16576, glWindowPos2fvARB, _gloffset_WindowPos2fvMESA ),
-    NAME_FUNC_OFFSET( 16594, glWindowPos2i, _gloffset_WindowPos2iMESA ),
-    NAME_FUNC_OFFSET( 16608, glWindowPos2iARB, _gloffset_WindowPos2iMESA ),
-    NAME_FUNC_OFFSET( 16625, glWindowPos2iv, _gloffset_WindowPos2ivMESA ),
-    NAME_FUNC_OFFSET( 16640, glWindowPos2ivARB, _gloffset_WindowPos2ivMESA ),
-    NAME_FUNC_OFFSET( 16658, glWindowPos2s, _gloffset_WindowPos2sMESA ),
-    NAME_FUNC_OFFSET( 16672, glWindowPos2sARB, _gloffset_WindowPos2sMESA ),
-    NAME_FUNC_OFFSET( 16689, glWindowPos2sv, _gloffset_WindowPos2svMESA ),
-    NAME_FUNC_OFFSET( 16704, glWindowPos2svARB, _gloffset_WindowPos2svMESA ),
-    NAME_FUNC_OFFSET( 16722, glWindowPos3d, _gloffset_WindowPos3dMESA ),
-    NAME_FUNC_OFFSET( 16736, glWindowPos3dARB, _gloffset_WindowPos3dMESA ),
-    NAME_FUNC_OFFSET( 16753, glWindowPos3dv, _gloffset_WindowPos3dvMESA ),
-    NAME_FUNC_OFFSET( 16768, glWindowPos3dvARB, _gloffset_WindowPos3dvMESA ),
-    NAME_FUNC_OFFSET( 16786, glWindowPos3f, _gloffset_WindowPos3fMESA ),
-    NAME_FUNC_OFFSET( 16800, glWindowPos3fARB, _gloffset_WindowPos3fMESA ),
-    NAME_FUNC_OFFSET( 16817, glWindowPos3fv, _gloffset_WindowPos3fvMESA ),
-    NAME_FUNC_OFFSET( 16832, glWindowPos3fvARB, _gloffset_WindowPos3fvMESA ),
-    NAME_FUNC_OFFSET( 16850, glWindowPos3i, _gloffset_WindowPos3iMESA ),
-    NAME_FUNC_OFFSET( 16864, glWindowPos3iARB, _gloffset_WindowPos3iMESA ),
-    NAME_FUNC_OFFSET( 16881, glWindowPos3iv, _gloffset_WindowPos3ivMESA ),
-    NAME_FUNC_OFFSET( 16896, glWindowPos3ivARB, _gloffset_WindowPos3ivMESA ),
-    NAME_FUNC_OFFSET( 16914, glWindowPos3s, _gloffset_WindowPos3sMESA ),
-    NAME_FUNC_OFFSET( 16928, glWindowPos3sARB, _gloffset_WindowPos3sMESA ),
-    NAME_FUNC_OFFSET( 16945, glWindowPos3sv, _gloffset_WindowPos3svMESA ),
-    NAME_FUNC_OFFSET( 16960, glWindowPos3svARB, _gloffset_WindowPos3svMESA ),
-    NAME_FUNC_OFFSET( 16978, glBindProgramARB, _gloffset_BindProgramNV ),
-    NAME_FUNC_OFFSET( 16995, glDeleteProgramsARB, _gloffset_DeleteProgramsNV ),
-    NAME_FUNC_OFFSET( 17015, glGenProgramsARB, _gloffset_GenProgramsNV ),
-    NAME_FUNC_OFFSET( 17032, glGetVertexAttribPointervARB, _gloffset_GetVertexAttribPointervNV ),
-    NAME_FUNC_OFFSET( 17061, glIsProgramARB, _gloffset_IsProgramNV ),
-    NAME_FUNC_OFFSET( 17076, glPointParameteri, _gloffset_PointParameteriNV ),
-    NAME_FUNC_OFFSET( 17094, glPointParameteriv, _gloffset_PointParameterivNV ),
-    NAME_FUNC_OFFSET( 17113, glBlendEquationSeparate, _gloffset_BlendEquationSeparateEXT ),
-    NAME_FUNC_OFFSET( 17137, glBlendEquationSeparateATI, _gloffset_BlendEquationSeparateEXT ),
+    NAME_FUNC_OFFSET( 13704, glArrayElement, _gloffset_ArrayElement ),
+    NAME_FUNC_OFFSET( 13722, glBindTexture, _gloffset_BindTexture ),
+    NAME_FUNC_OFFSET( 13739, glDrawArrays, _gloffset_DrawArrays ),
+    NAME_FUNC_OFFSET( 13755, glCopyTexImage1D, _gloffset_CopyTexImage1D ),
+    NAME_FUNC_OFFSET( 13775, glCopyTexImage2D, _gloffset_CopyTexImage2D ),
+    NAME_FUNC_OFFSET( 13795, glCopyTexSubImage1D, _gloffset_CopyTexSubImage1D ),
+    NAME_FUNC_OFFSET( 13818, glCopyTexSubImage2D, _gloffset_CopyTexSubImage2D ),
+    NAME_FUNC_OFFSET( 13841, glDeleteTextures, _gloffset_DeleteTextures ),
+    NAME_FUNC_OFFSET( 13861, glGetPointerv, _gloffset_GetPointerv ),
+    NAME_FUNC_OFFSET( 13878, glPrioritizeTextures, _gloffset_PrioritizeTextures ),
+    NAME_FUNC_OFFSET( 13902, glTexSubImage1D, _gloffset_TexSubImage1D ),
+    NAME_FUNC_OFFSET( 13921, glTexSubImage2D, _gloffset_TexSubImage2D ),
+    NAME_FUNC_OFFSET( 13940, glBlendColor, _gloffset_BlendColor ),
+    NAME_FUNC_OFFSET( 13956, glBlendEquation, _gloffset_BlendEquation ),
+    NAME_FUNC_OFFSET( 13975, glDrawRangeElements, _gloffset_DrawRangeElements ),
+    NAME_FUNC_OFFSET( 13998, glColorTable, _gloffset_ColorTable ),
+    NAME_FUNC_OFFSET( 14014, glColorTable, _gloffset_ColorTable ),
+    NAME_FUNC_OFFSET( 14030, glColorTableParameterfv, _gloffset_ColorTableParameterfv ),
+    NAME_FUNC_OFFSET( 14057, glColorTableParameteriv, _gloffset_ColorTableParameteriv ),
+    NAME_FUNC_OFFSET( 14084, glCopyColorTable, _gloffset_CopyColorTable ),
+    NAME_FUNC_OFFSET( 14104, glColorSubTable, _gloffset_ColorSubTable ),
+    NAME_FUNC_OFFSET( 14123, glCopyColorSubTable, _gloffset_CopyColorSubTable ),
+    NAME_FUNC_OFFSET( 14146, glConvolutionFilter1D, _gloffset_ConvolutionFilter1D ),
+    NAME_FUNC_OFFSET( 14171, glConvolutionFilter2D, _gloffset_ConvolutionFilter2D ),
+    NAME_FUNC_OFFSET( 14196, glConvolutionParameterf, _gloffset_ConvolutionParameterf ),
+    NAME_FUNC_OFFSET( 14223, glConvolutionParameterfv, _gloffset_ConvolutionParameterfv ),
+    NAME_FUNC_OFFSET( 14251, glConvolutionParameteri, _gloffset_ConvolutionParameteri ),
+    NAME_FUNC_OFFSET( 14278, glConvolutionParameteriv, _gloffset_ConvolutionParameteriv ),
+    NAME_FUNC_OFFSET( 14306, glCopyConvolutionFilter1D, _gloffset_CopyConvolutionFilter1D ),
+    NAME_FUNC_OFFSET( 14335, glCopyConvolutionFilter2D, _gloffset_CopyConvolutionFilter2D ),
+    NAME_FUNC_OFFSET( 14364, glSeparableFilter2D, _gloffset_SeparableFilter2D ),
+    NAME_FUNC_OFFSET( 14387, glHistogram, _gloffset_Histogram ),
+    NAME_FUNC_OFFSET( 14402, glMinmax, _gloffset_Minmax ),
+    NAME_FUNC_OFFSET( 14414, glResetHistogram, _gloffset_ResetHistogram ),
+    NAME_FUNC_OFFSET( 14434, glResetMinmax, _gloffset_ResetMinmax ),
+    NAME_FUNC_OFFSET( 14451, glTexImage3D, _gloffset_TexImage3D ),
+    NAME_FUNC_OFFSET( 14467, glTexSubImage3D, _gloffset_TexSubImage3D ),
+    NAME_FUNC_OFFSET( 14486, glCopyTexSubImage3D, _gloffset_CopyTexSubImage3D ),
+    NAME_FUNC_OFFSET( 14509, glActiveTextureARB, _gloffset_ActiveTextureARB ),
+    NAME_FUNC_OFFSET( 14525, glClientActiveTextureARB, _gloffset_ClientActiveTextureARB ),
+    NAME_FUNC_OFFSET( 14547, glMultiTexCoord1dARB, _gloffset_MultiTexCoord1dARB ),
+    NAME_FUNC_OFFSET( 14565, glMultiTexCoord1dvARB, _gloffset_MultiTexCoord1dvARB ),
+    NAME_FUNC_OFFSET( 14584, glMultiTexCoord1fARB, _gloffset_MultiTexCoord1fARB ),
+    NAME_FUNC_OFFSET( 14602, glMultiTexCoord1fvARB, _gloffset_MultiTexCoord1fvARB ),
+    NAME_FUNC_OFFSET( 14621, glMultiTexCoord1iARB, _gloffset_MultiTexCoord1iARB ),
+    NAME_FUNC_OFFSET( 14639, glMultiTexCoord1ivARB, _gloffset_MultiTexCoord1ivARB ),
+    NAME_FUNC_OFFSET( 14658, glMultiTexCoord1sARB, _gloffset_MultiTexCoord1sARB ),
+    NAME_FUNC_OFFSET( 14676, glMultiTexCoord1svARB, _gloffset_MultiTexCoord1svARB ),
+    NAME_FUNC_OFFSET( 14695, glMultiTexCoord2dARB, _gloffset_MultiTexCoord2dARB ),
+    NAME_FUNC_OFFSET( 14713, glMultiTexCoord2dvARB, _gloffset_MultiTexCoord2dvARB ),
+    NAME_FUNC_OFFSET( 14732, glMultiTexCoord2fARB, _gloffset_MultiTexCoord2fARB ),
+    NAME_FUNC_OFFSET( 14750, glMultiTexCoord2fvARB, _gloffset_MultiTexCoord2fvARB ),
+    NAME_FUNC_OFFSET( 14769, glMultiTexCoord2iARB, _gloffset_MultiTexCoord2iARB ),
+    NAME_FUNC_OFFSET( 14787, glMultiTexCoord2ivARB, _gloffset_MultiTexCoord2ivARB ),
+    NAME_FUNC_OFFSET( 14806, glMultiTexCoord2sARB, _gloffset_MultiTexCoord2sARB ),
+    NAME_FUNC_OFFSET( 14824, glMultiTexCoord2svARB, _gloffset_MultiTexCoord2svARB ),
+    NAME_FUNC_OFFSET( 14843, glMultiTexCoord3dARB, _gloffset_MultiTexCoord3dARB ),
+    NAME_FUNC_OFFSET( 14861, glMultiTexCoord3dvARB, _gloffset_MultiTexCoord3dvARB ),
+    NAME_FUNC_OFFSET( 14880, glMultiTexCoord3fARB, _gloffset_MultiTexCoord3fARB ),
+    NAME_FUNC_OFFSET( 14898, glMultiTexCoord3fvARB, _gloffset_MultiTexCoord3fvARB ),
+    NAME_FUNC_OFFSET( 14917, glMultiTexCoord3iARB, _gloffset_MultiTexCoord3iARB ),
+    NAME_FUNC_OFFSET( 14935, glMultiTexCoord3ivARB, _gloffset_MultiTexCoord3ivARB ),
+    NAME_FUNC_OFFSET( 14954, glMultiTexCoord3sARB, _gloffset_MultiTexCoord3sARB ),
+    NAME_FUNC_OFFSET( 14972, glMultiTexCoord3svARB, _gloffset_MultiTexCoord3svARB ),
+    NAME_FUNC_OFFSET( 14991, glMultiTexCoord4dARB, _gloffset_MultiTexCoord4dARB ),
+    NAME_FUNC_OFFSET( 15009, glMultiTexCoord4dvARB, _gloffset_MultiTexCoord4dvARB ),
+    NAME_FUNC_OFFSET( 15028, glMultiTexCoord4fARB, _gloffset_MultiTexCoord4fARB ),
+    NAME_FUNC_OFFSET( 15046, glMultiTexCoord4fvARB, _gloffset_MultiTexCoord4fvARB ),
+    NAME_FUNC_OFFSET( 15065, glMultiTexCoord4iARB, _gloffset_MultiTexCoord4iARB ),
+    NAME_FUNC_OFFSET( 15083, glMultiTexCoord4ivARB, _gloffset_MultiTexCoord4ivARB ),
+    NAME_FUNC_OFFSET( 15102, glMultiTexCoord4sARB, _gloffset_MultiTexCoord4sARB ),
+    NAME_FUNC_OFFSET( 15120, glMultiTexCoord4svARB, _gloffset_MultiTexCoord4svARB ),
+    NAME_FUNC_OFFSET( 15139, glLoadTransposeMatrixdARB, _gloffset_LoadTransposeMatrixdARB ),
+    NAME_FUNC_OFFSET( 15162, glLoadTransposeMatrixfARB, _gloffset_LoadTransposeMatrixfARB ),
+    NAME_FUNC_OFFSET( 15185, glMultTransposeMatrixdARB, _gloffset_MultTransposeMatrixdARB ),
+    NAME_FUNC_OFFSET( 15208, glMultTransposeMatrixfARB, _gloffset_MultTransposeMatrixfARB ),
+    NAME_FUNC_OFFSET( 15231, glSampleCoverageARB, _gloffset_SampleCoverageARB ),
+    NAME_FUNC_OFFSET( 15248, glCompressedTexImage1DARB, _gloffset_CompressedTexImage1DARB ),
+    NAME_FUNC_OFFSET( 15271, glCompressedTexImage2DARB, _gloffset_CompressedTexImage2DARB ),
+    NAME_FUNC_OFFSET( 15294, glCompressedTexImage3DARB, _gloffset_CompressedTexImage3DARB ),
+    NAME_FUNC_OFFSET( 15317, glCompressedTexSubImage1DARB, _gloffset_CompressedTexSubImage1DARB ),
+    NAME_FUNC_OFFSET( 15343, glCompressedTexSubImage2DARB, _gloffset_CompressedTexSubImage2DARB ),
+    NAME_FUNC_OFFSET( 15369, glCompressedTexSubImage3DARB, _gloffset_CompressedTexSubImage3DARB ),
+    NAME_FUNC_OFFSET( 15395, glGetCompressedTexImageARB, _gloffset_GetCompressedTexImageARB ),
+    NAME_FUNC_OFFSET( 15419, glBindBufferARB, _gloffset_BindBufferARB ),
+    NAME_FUNC_OFFSET( 15432, glBufferDataARB, _gloffset_BufferDataARB ),
+    NAME_FUNC_OFFSET( 15445, glBufferSubDataARB, _gloffset_BufferSubDataARB ),
+    NAME_FUNC_OFFSET( 15461, glDeleteBuffersARB, _gloffset_DeleteBuffersARB ),
+    NAME_FUNC_OFFSET( 15477, glGenBuffersARB, _gloffset_GenBuffersARB ),
+    NAME_FUNC_OFFSET( 15490, glGetBufferParameterivARB, _gloffset_GetBufferParameterivARB ),
+    NAME_FUNC_OFFSET( 15513, glGetBufferPointervARB, _gloffset_GetBufferPointervARB ),
+    NAME_FUNC_OFFSET( 15533, glGetBufferSubDataARB, _gloffset_GetBufferSubDataARB ),
+    NAME_FUNC_OFFSET( 15552, glIsBufferARB, _gloffset_IsBufferARB ),
+    NAME_FUNC_OFFSET( 15563, glMapBufferARB, _gloffset_MapBufferARB ),
+    NAME_FUNC_OFFSET( 15575, glUnmapBufferARB, _gloffset_UnmapBufferARB ),
+    NAME_FUNC_OFFSET( 15589, glBeginQueryARB, _gloffset_BeginQueryARB ),
+    NAME_FUNC_OFFSET( 15602, glDeleteQueriesARB, _gloffset_DeleteQueriesARB ),
+    NAME_FUNC_OFFSET( 15618, glEndQueryARB, _gloffset_EndQueryARB ),
+    NAME_FUNC_OFFSET( 15629, glGenQueriesARB, _gloffset_GenQueriesARB ),
+    NAME_FUNC_OFFSET( 15642, glGetQueryObjectivARB, _gloffset_GetQueryObjectivARB ),
+    NAME_FUNC_OFFSET( 15661, glGetQueryObjectuivARB, _gloffset_GetQueryObjectuivARB ),
+    NAME_FUNC_OFFSET( 15681, glGetQueryivARB, _gloffset_GetQueryivARB ),
+    NAME_FUNC_OFFSET( 15694, glIsQueryARB, _gloffset_IsQueryARB ),
+    NAME_FUNC_OFFSET( 15704, glDrawBuffersARB, _gloffset_DrawBuffersARB ),
+    NAME_FUNC_OFFSET( 15718, glDrawBuffersARB, _gloffset_DrawBuffersARB ),
+    NAME_FUNC_OFFSET( 15735, glGetColorTableParameterfvSGI, _gloffset_GetColorTableParameterfvSGI ),
+    NAME_FUNC_OFFSET( 15765, glGetColorTableParameterivSGI, _gloffset_GetColorTableParameterivSGI ),
+    NAME_FUNC_OFFSET( 15795, glGetColorTableSGI, _gloffset_GetColorTableSGI ),
+    NAME_FUNC_OFFSET( 15814, glSampleMaskSGIS, _gloffset_SampleMaskSGIS ),
+    NAME_FUNC_OFFSET( 15830, glSamplePatternSGIS, _gloffset_SamplePatternSGIS ),
+    NAME_FUNC_OFFSET( 15849, glPointParameterfEXT, _gloffset_PointParameterfEXT ),
+    NAME_FUNC_OFFSET( 15867, glPointParameterfEXT, _gloffset_PointParameterfEXT ),
+    NAME_FUNC_OFFSET( 15888, glPointParameterfEXT, _gloffset_PointParameterfEXT ),
+    NAME_FUNC_OFFSET( 15910, glPointParameterfvEXT, _gloffset_PointParameterfvEXT ),
+    NAME_FUNC_OFFSET( 15929, glPointParameterfvEXT, _gloffset_PointParameterfvEXT ),
+    NAME_FUNC_OFFSET( 15951, glPointParameterfvEXT, _gloffset_PointParameterfvEXT ),
+    NAME_FUNC_OFFSET( 15974, glSecondaryColor3bEXT, _gloffset_SecondaryColor3bEXT ),
+    NAME_FUNC_OFFSET( 15993, glSecondaryColor3bvEXT, _gloffset_SecondaryColor3bvEXT ),
+    NAME_FUNC_OFFSET( 16013, glSecondaryColor3dEXT, _gloffset_SecondaryColor3dEXT ),
+    NAME_FUNC_OFFSET( 16032, glSecondaryColor3dvEXT, _gloffset_SecondaryColor3dvEXT ),
+    NAME_FUNC_OFFSET( 16052, glSecondaryColor3fEXT, _gloffset_SecondaryColor3fEXT ),
+    NAME_FUNC_OFFSET( 16071, glSecondaryColor3fvEXT, _gloffset_SecondaryColor3fvEXT ),
+    NAME_FUNC_OFFSET( 16091, glSecondaryColor3iEXT, _gloffset_SecondaryColor3iEXT ),
+    NAME_FUNC_OFFSET( 16110, glSecondaryColor3ivEXT, _gloffset_SecondaryColor3ivEXT ),
+    NAME_FUNC_OFFSET( 16130, glSecondaryColor3sEXT, _gloffset_SecondaryColor3sEXT ),
+    NAME_FUNC_OFFSET( 16149, glSecondaryColor3svEXT, _gloffset_SecondaryColor3svEXT ),
+    NAME_FUNC_OFFSET( 16169, glSecondaryColor3ubEXT, _gloffset_SecondaryColor3ubEXT ),
+    NAME_FUNC_OFFSET( 16189, glSecondaryColor3ubvEXT, _gloffset_SecondaryColor3ubvEXT ),
+    NAME_FUNC_OFFSET( 16210, glSecondaryColor3uiEXT, _gloffset_SecondaryColor3uiEXT ),
+    NAME_FUNC_OFFSET( 16230, glSecondaryColor3uivEXT, _gloffset_SecondaryColor3uivEXT ),
+    NAME_FUNC_OFFSET( 16251, glSecondaryColor3usEXT, _gloffset_SecondaryColor3usEXT ),
+    NAME_FUNC_OFFSET( 16271, glSecondaryColor3usvEXT, _gloffset_SecondaryColor3usvEXT ),
+    NAME_FUNC_OFFSET( 16292, glSecondaryColorPointerEXT, _gloffset_SecondaryColorPointerEXT ),
+    NAME_FUNC_OFFSET( 16316, glMultiDrawArraysEXT, _gloffset_MultiDrawArraysEXT ),
+    NAME_FUNC_OFFSET( 16334, glMultiDrawElementsEXT, _gloffset_MultiDrawElementsEXT ),
+    NAME_FUNC_OFFSET( 16354, glFogCoordPointerEXT, _gloffset_FogCoordPointerEXT ),
+    NAME_FUNC_OFFSET( 16372, glFogCoorddEXT, _gloffset_FogCoorddEXT ),
+    NAME_FUNC_OFFSET( 16384, glFogCoorddvEXT, _gloffset_FogCoorddvEXT ),
+    NAME_FUNC_OFFSET( 16397, glFogCoordfEXT, _gloffset_FogCoordfEXT ),
+    NAME_FUNC_OFFSET( 16409, glFogCoordfvEXT, _gloffset_FogCoordfvEXT ),
+    NAME_FUNC_OFFSET( 16422, glBlendFuncSeparateEXT, _gloffset_BlendFuncSeparateEXT ),
+    NAME_FUNC_OFFSET( 16442, glBlendFuncSeparateEXT, _gloffset_BlendFuncSeparateEXT ),
+    NAME_FUNC_OFFSET( 16466, glWindowPos2dMESA, _gloffset_WindowPos2dMESA ),
+    NAME_FUNC_OFFSET( 16480, glWindowPos2dMESA, _gloffset_WindowPos2dMESA ),
+    NAME_FUNC_OFFSET( 16497, glWindowPos2dvMESA, _gloffset_WindowPos2dvMESA ),
+    NAME_FUNC_OFFSET( 16512, glWindowPos2dvMESA, _gloffset_WindowPos2dvMESA ),
+    NAME_FUNC_OFFSET( 16530, glWindowPos2fMESA, _gloffset_WindowPos2fMESA ),
+    NAME_FUNC_OFFSET( 16544, glWindowPos2fMESA, _gloffset_WindowPos2fMESA ),
+    NAME_FUNC_OFFSET( 16561, glWindowPos2fvMESA, _gloffset_WindowPos2fvMESA ),
+    NAME_FUNC_OFFSET( 16576, glWindowPos2fvMESA, _gloffset_WindowPos2fvMESA ),
+    NAME_FUNC_OFFSET( 16594, glWindowPos2iMESA, _gloffset_WindowPos2iMESA ),
+    NAME_FUNC_OFFSET( 16608, glWindowPos2iMESA, _gloffset_WindowPos2iMESA ),
+    NAME_FUNC_OFFSET( 16625, glWindowPos2ivMESA, _gloffset_WindowPos2ivMESA ),
+    NAME_FUNC_OFFSET( 16640, glWindowPos2ivMESA, _gloffset_WindowPos2ivMESA ),
+    NAME_FUNC_OFFSET( 16658, glWindowPos2sMESA, _gloffset_WindowPos2sMESA ),
+    NAME_FUNC_OFFSET( 16672, glWindowPos2sMESA, _gloffset_WindowPos2sMESA ),
+    NAME_FUNC_OFFSET( 16689, glWindowPos2svMESA, _gloffset_WindowPos2svMESA ),
+    NAME_FUNC_OFFSET( 16704, glWindowPos2svMESA, _gloffset_WindowPos2svMESA ),
+    NAME_FUNC_OFFSET( 16722, glWindowPos3dMESA, _gloffset_WindowPos3dMESA ),
+    NAME_FUNC_OFFSET( 16736, glWindowPos3dMESA, _gloffset_WindowPos3dMESA ),
+    NAME_FUNC_OFFSET( 16753, glWindowPos3dvMESA, _gloffset_WindowPos3dvMESA ),
+    NAME_FUNC_OFFSET( 16768, glWindowPos3dvMESA, _gloffset_WindowPos3dvMESA ),
+    NAME_FUNC_OFFSET( 16786, glWindowPos3fMESA, _gloffset_WindowPos3fMESA ),
+    NAME_FUNC_OFFSET( 16800, glWindowPos3fMESA, _gloffset_WindowPos3fMESA ),
+    NAME_FUNC_OFFSET( 16817, glWindowPos3fvMESA, _gloffset_WindowPos3fvMESA ),
+    NAME_FUNC_OFFSET( 16832, glWindowPos3fvMESA, _gloffset_WindowPos3fvMESA ),
+    NAME_FUNC_OFFSET( 16850, glWindowPos3iMESA, _gloffset_WindowPos3iMESA ),
+    NAME_FUNC_OFFSET( 16864, glWindowPos3iMESA, _gloffset_WindowPos3iMESA ),
+    NAME_FUNC_OFFSET( 16881, glWindowPos3ivMESA, _gloffset_WindowPos3ivMESA ),
+    NAME_FUNC_OFFSET( 16896, glWindowPos3ivMESA, _gloffset_WindowPos3ivMESA ),
+    NAME_FUNC_OFFSET( 16914, glWindowPos3sMESA, _gloffset_WindowPos3sMESA ),
+    NAME_FUNC_OFFSET( 16928, glWindowPos3sMESA, _gloffset_WindowPos3sMESA ),
+    NAME_FUNC_OFFSET( 16945, glWindowPos3svMESA, _gloffset_WindowPos3svMESA ),
+    NAME_FUNC_OFFSET( 16960, glWindowPos3svMESA, _gloffset_WindowPos3svMESA ),
+    NAME_FUNC_OFFSET( 16978, glBindProgramNV, _gloffset_BindProgramNV ),
+    NAME_FUNC_OFFSET( 16995, glDeleteProgramsNV, _gloffset_DeleteProgramsNV ),
+    NAME_FUNC_OFFSET( 17015, glGenProgramsNV, _gloffset_GenProgramsNV ),
+    NAME_FUNC_OFFSET( 17032, glGetVertexAttribPointervNV, _gloffset_GetVertexAttribPointervNV ),
+    NAME_FUNC_OFFSET( 17061, glIsProgramNV, _gloffset_IsProgramNV ),
+    NAME_FUNC_OFFSET( 17076, glPointParameteriNV, _gloffset_PointParameteriNV ),
+    NAME_FUNC_OFFSET( 17094, glPointParameterivNV, _gloffset_PointParameterivNV ),
+    NAME_FUNC_OFFSET( 17113, glBlendEquationSeparateEXT, _gloffset_BlendEquationSeparateEXT ),
+    NAME_FUNC_OFFSET( 17137, glBlendEquationSeparateEXT, _gloffset_BlendEquationSeparateEXT ),
     NAME_FUNC_OFFSET( -1, NULL, 0 )
 };