alias ARB/NV program functions where possible

4 files changed, 346 insertions, 393 deletions

diff --git a/src/mesa/glapi/APIspec b/src/mesa/glapi/APIspec
index bff2ab286ff..0d4a29e3e28 100644
--- a/src/mesa/glapi/APIspec
+++ b/src/mesa/glapi/APIspec
@@ -1,4 +1,4 @@
-# $Id: APIspec,v 1.15 2003/03/29 16:35:09 brianp Exp $
+# $Id: APIspec,v 1.16 2003/04/21 14:53:40 brianp Exp $
 
 # This file describes all the OpenGL functions.
 # We use a number of Python scripts to parse this file and
@@ -7700,21 +7700,21 @@ return		void
 param		index		GLuint
 param		x		GLshort
 category	GL_ARB_vertex_program
-offset		654
+alias		VertexAttrib1sNV
 
 name		VertexAttrib1fARB
 return		void
 param		index		GLuint
 param		x		GLfloat
 category	GL_ARB_vertex_program
-offset		655
+alias		VertexAttrib1fNV
 
 name		VertexAttrib1dARB
 return		void
 param		index		GLuint
 param		x		GLdouble
 category	GL_ARB_vertex_program
-offset		656
+alias		VertexAttrib1dNV
 
 name		VertexAttrib2sARB
 return		void
@@ -7722,7 +7722,7 @@ param		index		GLuint
 param		x		GLshort
 param		y		GLshort
 category	GL_ARB_vertex_program
-offset		657
+alias		VertexAttrib2sNV
 
 name		VertexAttrib2fARB
 return		void
@@ -7730,7 +7730,7 @@ param		index		GLuint
 param		x		GLfloat
 param		y		GLfloat
 category	GL_ARB_vertex_program
-offset		658
+alias		VertexAttrib2fNV
 
 name		VertexAttrib2dARB
 return		void
@@ -7738,7 +7738,7 @@ param		index		GLuint
 param		x		GLdouble
 param		y		GLdouble
 category	GL_ARB_vertex_program
-offset		659
+alias		VertexAttrib2dNV
 
 name		VertexAttrib3sARB
 return		void
@@ -7747,7 +7747,7 @@ param		x		GLshort
 param		y		GLshort
 param		z		GLshort
 category	GL_ARB_vertex_program
-offset		660
+alias		VertexAttrib3sNV
 
 name		VertexAttrib3fARB
 return		void
@@ -7756,7 +7756,7 @@ param		x		GLfloat
 param		y		GLfloat
 param		z		GLfloat
 category	GL_ARB_vertex_program
-offset		661
+alias		VertexAttrib3fNV
 
 name		VertexAttrib3dARB
 return		void
@@ -7765,7 +7765,7 @@ param		x		GLdouble
 param		y		GLdouble
 param		z		GLdouble
 category	GL_ARB_vertex_program
-offset		662
+alias		VertexAttrib3dNV
 
 name		VertexAttrib4sARB
 return		void
@@ -7775,7 +7775,7 @@ param		y		GLshort
 param		z		GLshort
 param		w		GLshort
 category	GL_ARB_vertex_program
-offset		663
+alias		VertexAttrib4sNV
 
 name		VertexAttrib4fARB
 return		void
@@ -7785,7 +7785,7 @@ param		y		GLfloat
 param		z		GLfloat
 param		w		GLfloat
 category	GL_ARB_vertex_program
-offset		664
+alias		VertexAttrib4fNV
 
 name		VertexAttrib4dARB
 return		void
@@ -7795,7 +7795,7 @@ param		y		GLdouble
 param		z		GLdouble
 param		w		GLdouble
 category	GL_ARB_vertex_program
-offset		665
+alias		VertexAttrib4dNV
 
 name		VertexAttrib4NubARB
 return		void
@@ -7805,168 +7805,168 @@ param		y		GLubyte
 param		z		GLubyte
 param		w		GLubyte
 category	GL_ARB_vertex_program
-offset		666
+alias		VertexAttrib4ubNV
 
 name		VertexAttrib1svARB
 return		void
 param		index		GLuint
 param		v		const GLshort *
 category	GL_ARB_vertex_program
-offset		667
+alias		VertexAttrib1svNV
 
 name		VertexAttrib1fvARB
 return		void
 param		index		GLuint
 param		v		const GLfloat *
 category	GL_ARB_vertex_program
-offset		668
+alias		VertexAttrib1fvNV
 
 name		VertexAttrib1dvARB
 return		void
 param		index		GLuint
 param		v		const GLdouble *
 category	GL_ARB_vertex_program
-offset		669
+alias		VertexAttrib1dvNV
 
 name		VertexAttrib2svARB
 return		void
 param		index		GLuint
 param		v		const GLshort *
 category	GL_ARB_vertex_program
-offset		670
+alias		VertexAttrib2svNV
 
 name		VertexAttrib2fvARB
 return		void
 param		index		GLuint
 param		v		const GLfloat *
 category	GL_ARB_vertex_program
-offset		671
+alias		VertexAttrib2fvNV
 
 name		VertexAttrib2dvARB
 return		void
 param		index		GLuint
 param		v		const GLdouble *
 category	GL_ARB_vertex_program
-offset		672
+alias		VertexAttrib2dvNV
 
 name		VertexAttrib3svARB
 return		void
 param		index		GLuint
 param		v		const GLshort *
 category	GL_ARB_vertex_program
-offset		673
+alias		VertexAttrib3svNV
 
 name		VertexAttrib3fvARB
 return		void
 param		index		GLuint
 param		v		const GLfloat *
 category	GL_ARB_vertex_program
-offset		674
+alias		VertexAttrib3fvNV
 
 name		VertexAttrib3dvARB
 return		void
 param		index		GLuint
 param		v		const GLdouble *
 category	GL_ARB_vertex_program
-offset		675
+alias		VertexAttrib3dvNV
 
 name		VertexAttrib4bvARB
 return		void
 param		index		GLuint
 param		v		const GLbyte *
 category	GL_ARB_vertex_program
-offset		676
+offset		654
 
 name		VertexAttrib4svARB
 return		void
 param		index		GLuint
 param		v		const GLshort *
 category	GL_ARB_vertex_program
-offset		677
+alias		VertexAttrib4svNV
 
 name		VertexAttrib4ivARB
 return		void
 param		index		GLuint
 param		v		const GLint *
 category	GL_ARB_vertex_program
-offset		678
+offset		655
 
 name		VertexAttrib4ubvARB
 return		void
 param		index		GLuint
 param		v		const GLubyte *
 category	GL_ARB_vertex_program
-offset		679
+offset		656
 
 name		VertexAttrib4usvARB
 return		void
 param		index		GLuint
 param		v		const GLushort *
 category	GL_ARB_vertex_program
-offset		680
+offset		657
 
 name		VertexAttrib4uivARB
 return		void
 param		index		GLuint
 param		v		const GLuint *
 category	GL_ARB_vertex_program
-offset		681
+offset		658
 
 name		VertexAttrib4fvARB
 return		void
 param		index		GLuint
 param		v		const GLfloat *
 category	GL_ARB_vertex_program
-offset		682
+alias		VertexAttrib4fvNV
 
 name		VertexAttrib4dvARB
 return		void
 param		index		GLuint
 param		v		const GLdouble *
 category	GL_ARB_vertex_program
-offset		683
+alias		VertexAttrib4dvNV
 
 name		VertexAttrib4NbvARB
 return		void
 param		index		GLuint
 param		v		const GLbyte *
 category	GL_ARB_vertex_program
-offset		684
+offset		659
 
 name		VertexAttrib4NsvARB
 return		void
 param		index		GLuint
 param		v		const GLshort *
 category	GL_ARB_vertex_program
-offset		685
+offset		660
 
 name		VertexAttrib4NivARB
 return		void
 param		index		GLuint
 param		v		const GLint *
 category	GL_ARB_vertex_program
-offset		686
+offset		661
 
 name		VertexAttrib4NubvARB
 return		void
 param		index		GLuint
 param		v		const GLubyte *
 category	GL_ARB_vertex_program
-offset		687
+alias		VertexAttrib4ubvNV
 
 name		VertexAttrib4NusvARB
 return		void
 param		index		GLuint
 param		v		const GLushort *
 category	GL_ARB_vertex_program
-offset		688
+offset		662
 
 name		VertexAttrib4NuivARB
 return		void
 param		index		GLuint
 param		v		const GLuint *
 category	GL_ARB_vertex_program
-offset		689
+offset		663
 
 name		VertexAttribPointerARB
 return		void
@@ -7977,19 +7977,19 @@ param		normalized	GLboolean
 param		stride		GLsizei
 param		pointer		const GLvoid *
 category	GL_ARB_vertex_program
-offset		690
+offset		664
 
 name		EnableVertexAttribArrayARB
 return		void
 param		index		GLuint
 category	GL_ARB_vertex_program
-offset		691
+offset		665
 
 name		DisableVertexAttribArrayARB
 return		void
 param		index		GLuint
 category	GL_ARB_vertex_program
-offset		692
+offset		666
 
 name		ProgramStringARB
 return		void
@@ -7998,28 +7998,34 @@ param		format		GLenum
 param		len		GLsizei
 param		string		const GLvoid *
 category	GL_ARB_vertex_program
-offset		693
+offset		667
 
 name		BindProgramARB
 return		void
 param		target		GLenum
 param		program		GLuint
 category	GL_ARB_vertex_program
-offset		694
+alias		BindProgramNV
 
 name		DeleteProgramsARB
 return		void
 param		n		GLsizei
 param		programs	const GLuint *
 category	GL_ARB_vertex_program
-offset		695
+alias		DeleteProgramsNV
 
 name		GenProgramsARB
 return		void
 param		n		GLsizei
 param		programs	GLuint *
 category	GL_ARB_vertex_program
-offset		696
+alias		GenProgramsNV
+
+name		IsProgramARB
+return		GLboolean
+param		program		GLuint
+category	GL_ARB_vertex_program
+alias		IsProgramNV
 
 name		ProgramEnvParameter4dARB
 return		void
@@ -8030,7 +8036,7 @@ param		y		GLdouble
 param		z		GLdouble
 param		w		GLdouble
 category	GL_ARB_vertex_program
-offset		697
+offset		668
 
 name		ProgramEnvParameter4dvARB
 return		void
@@ -8038,7 +8044,7 @@ param		target		GLenum
 param		index		GLuint
 param		params		const GLdouble *
 category	GL_ARB_vertex_program
-offset		698
+offset		669
 
 name		ProgramEnvParameter4fARB
 return		void
@@ -8049,7 +8055,7 @@ param		y		GLfloat
 param		z		GLfloat
 param		w		GLfloat
 category	GL_ARB_vertex_program
-offset		699
+offset		670
 
 name		ProgramEnvParameter4fvARB
 return		void
@@ -8057,7 +8063,7 @@ param		target		GLenum
 param		index		GLuint
 param		params		const GLfloat *
 category	GL_ARB_vertex_program
-offset		700
+offset		671
 
 name		ProgramLocalParameter4dARB
 return		void
@@ -8068,7 +8074,7 @@ param		y		GLdouble
 param		z		GLdouble
 param		w		GLdouble
 category	GL_ARB_vertex_program
-offset		701
+offset		672
 
 name		ProgramLocalParameter4dvARB
 return		void
@@ -8076,7 +8082,7 @@ param		target		GLenum
 param		index		GLuint
 param		params		const GLdouble *
 category	GL_ARB_vertex_program
-offset		702
+offset		673
 
 name		ProgramLocalParameter4fARB
 return		void
@@ -8087,7 +8093,7 @@ param		y		GLfloat
 param		z		GLfloat
 param		w		GLfloat
 category	GL_ARB_vertex_program
-offset		703
+offset		674
 
 name		ProgramLocalParameter4fvARB
 return		void
@@ -8095,7 +8101,7 @@ param		target		GLenum
 param		index		GLuint
 param		params		const GLfloat *
 category	GL_ARB_vertex_program
-offset		704
+offset		675
 
 name		GetProgramEnvParameterdvARB
 return		void
@@ -8103,7 +8109,7 @@ param		target		GLenum
 param		index		GLuint
 param		params		GLdouble *
 category	GL_ARB_vertex_program
-offset		705
+offset		676
 
 name		GetProgramEnvParameterfvARB
 return		void
@@ -8111,7 +8117,7 @@ param		target		GLenum
 param		index		GLuint
 param		params		GLfloat *
 category	GL_ARB_vertex_program
-offset		706
+offset		677
 
 name		GetProgramLocalParameterdvARB
 return		void
@@ -8119,7 +8125,7 @@ param		target		GLenum
 param		index		GLuint
 param		params		GLdouble *
 category	GL_ARB_vertex_program
-offset		707
+offset		678
 
 name		GetProgramLocalParameterfvARB
 return		void
@@ -8127,7 +8133,7 @@ param		target		GLenum
 param		index		GLuint
 param		params		GLfloat *
 category	GL_ARB_vertex_program
-offset		708
+offset		679
 
 name		GetProgramivARB
 return		void
@@ -8135,7 +8141,7 @@ param		target		GLenum
 param		pname		GLenum
 param		params		GLint *
 category	GL_ARB_vertex_program
-offset		709
+offset		680
 
 name		GetProgramStringARB
 return		void
@@ -8143,7 +8149,7 @@ param		target		GLenum
 param		pname		GLenum
 param		string		GLvoid *
 category	GL_ARB_vertex_program
-offset		710
+offset		681
 
 name		GetVertexAttribdvARB
 return		void
@@ -8151,7 +8157,7 @@ param		index		GLuint
 param		pname		GLenum
 param		params		GLdouble *
 category	GL_ARB_vertex_program
-offset		711
+alias		GetVertexAttribdvNV
 
 name		GetVertexAttribfvARB
 return		void
@@ -8159,7 +8165,7 @@ param		index		GLuint
 param		pname		GLenum
 param		params		GLfloat *
 category	GL_ARB_vertex_program
-offset		712
+alias		GetVertexAttribfvNV
 
 name		GetVertexAttribivARB
 return		void
@@ -8167,7 +8173,7 @@ param		index		GLuint
 param		pname		GLenum
 param		params		GLint *
 category	GL_ARB_vertex_program
-offset		713
+alias		GetVertexAttribivNV
 
 name		GetVertexAttribPointervARB
 return		void
@@ -8175,13 +8181,8 @@ param		index		GLuint
 param		pname		GLenum
 param		params		GLvoid **
 category	GL_ARB_vertex_program
-offset		714
+alias		GetVertexAttribPointervNV
 
-name		IsProgramARB
-return		GLboolean
-param		program		GLuint
-category	GL_ARB_vertex_program
-offset		715
 
 
 # GL_NV_fragment_program
@@ -8196,7 +8197,7 @@ param		y		GLfloat
 param		z		GLfloat
 param		w		GLfloat
 category	GL_NV_fragment_program
-offset		716
+offset		682
 
 name		ProgramNamedParameter4dNV
 return		void
@@ -8208,7 +8209,7 @@ param		y		GLdouble
 param		z		GLdouble
 param		w		GLdouble
 category	GL_NV_fragment_program
-offset		717
+offset		683
 
 name		ProgramNamedParameter4fvNV
 return		void
@@ -8217,7 +8218,7 @@ param		len		GLsizei
 param		name		const GLubyte *
 param		v		const GLfloat *
 category	GL_NV_fragment_program
-offset		718
+offset		684
 
 name		ProgramNamedParameter4dvNV
 return		void
@@ -8226,7 +8227,7 @@ param		len		GLsizei
 param		name		const GLubyte *
 param		v		const GLdouble *
 category	GL_NV_fragment_program
-offset		719
+offset		685
 
 name		GetProgramNamedParameterfvNV
 return		void
@@ -8235,7 +8236,7 @@ param		len		GLsizei
 param		name		const GLubyte *
 param		params		GLfloat *
 category	GL_NV_fragment_program
-offset		720
+offset		686
 
 name		GetProgramNamedParameterdvNV
 return		void
@@ -8244,7 +8245,7 @@ param		len		GLsizei
 param		name		const GLubyte *
 param		params		GLdouble *
 category	GL_NV_fragment_program
-offset		721
+offset		687
 
 
 # GL_ARB_vertex_buffer_object
@@ -8254,45 +8255,55 @@ return		void
 param		target		GLenum
 param		buffer		GLuint
 category	GL_ARB_vertex_buffer_object
-offset		722
+offset		688
+
+name		BufferDataARB
+return		void
+param		target		GLenum
+param		size		GLsizeiptrARB
+param		data		const GLvoid *
+param		usage		GLenum
+category	GL_ARB_vertex_buffer_object
+offset		689
+
+name		BufferSubDataARB
+return		void
+param		target		GLenum
+param		offset		GLintptrARB
+param		size		GLsizeiptrARB
+param		data		const GLvoid *
+category	GL_ARB_vertex_buffer_object
+offset		690
 
 name		DeleteBuffersARB
 return		void
 param		n		GLsizei
 param		buffer		const GLuint *
 category	GL_ARB_vertex_buffer_object
-offset		723
+offset		691
 
 name		GenBuffersARB
 return		void
 param		n		GLsizei
 param		buffer		GLuint *
 category	GL_ARB_vertex_buffer_object
-offset		724
-
-name		IsBufferARB
-return		GLboolean
-param		buffer		GLuint
-category	GL_ARB_vertex_buffer_object
-offset		725
+offset		692
 
-name		BufferDataARB
+name		GetBufferParameterivARB
 return		void
 param		target		GLenum
-param		size		GLsizeiptrARB
-param		data		const GLvoid *
-param		usage		GLenum
+param		pname		GLenum
+param		params		GLint *
 category	GL_ARB_vertex_buffer_object
-offset		726
+offset		693
 
-name		BufferSubDataARB
+name		GetBufferPointervARB
 return		void
 param		target		GLenum
-param		offset		GLintptrARB
-param		size		GLsizeiptrARB
-param		data		const GLvoid *
+param		pname		GLenum
+param		params		GLvoid **
 category	GL_ARB_vertex_buffer_object
-offset		727
+offset		694
 
 name		GetBufferSubDataARB
 return		void
@@ -8301,36 +8312,38 @@ param		offset		GLintptrARB
 param		size		GLsizeiptrARB
 param		data		void *
 category	GL_ARB_vertex_buffer_object
-offset		728
+offset		695
+
+name		IsBufferARB
+return		GLboolean
+param		buffer		GLuint
+category	GL_ARB_vertex_buffer_object
+offset		696
 
 name		MapBufferARB
 return		void
 param		target		GLenum
 param		access		GLenum
 category	GL_ARB_vertex_buffer_object
-offset		729
+offset		697
 
 name		UnmapBufferARB
 return		GLboolean
 param		target		GLenum
 category	GL_ARB_vertex_buffer_object
-offset		730
+offset		698
 
-name		GetBufferParameterivARB
-return		void
-param		target		GLenum
-param		pname		GLenum
-param		params		GLint *
-category	GL_ARB_vertex_buffer_object
-offset		731
 
-name		GetBufferPointervARB
+
+# GL_EXT_depth_bounds_test
+
+name		DepthBoundsEXT
 return		void
-param		target		GLenum
-param		pname		GLenum
-param		params		GLvoid **
-category	GL_ARB_vertex_buffer_object
-offset		732
+param		zmin		GLclampd
+param		zmax		GLclampd
+category	GL_EXT_depth_bounds_test
+offset		699
+
 
 
 # end of file sentinal
diff --git a/src/mesa/glapi/glapioffsets.h b/src/mesa/glapi/glapioffsets.h
index 0974e7b5564..ccc05daee18 100644
--- a/src/mesa/glapi/glapioffsets.h
+++ b/src/mesa/glapi/glapioffsets.h
@@ -656,84 +656,51 @@
 #define _gloffset_GetFenceivNV 651
 #define _gloffset_FinishFenceNV 652
 #define _gloffset_SetFenceNV 653
-#define _gloffset_VertexAttrib1sARB 654
-#define _gloffset_VertexAttrib1fARB 655
-#define _gloffset_VertexAttrib1dARB 656
-#define _gloffset_VertexAttrib2sARB 657
-#define _gloffset_VertexAttrib2fARB 658
-#define _gloffset_VertexAttrib2dARB 659
-#define _gloffset_VertexAttrib3sARB 660
-#define _gloffset_VertexAttrib3fARB 661
-#define _gloffset_VertexAttrib3dARB 662
-#define _gloffset_VertexAttrib4sARB 663
-#define _gloffset_VertexAttrib4fARB 664
-#define _gloffset_VertexAttrib4dARB 665
-#define _gloffset_VertexAttrib4NubARB 666
-#define _gloffset_VertexAttrib1svARB 667
-#define _gloffset_VertexAttrib1fvARB 668
-#define _gloffset_VertexAttrib1dvARB 669
-#define _gloffset_VertexAttrib2svARB 670
-#define _gloffset_VertexAttrib2fvARB 671
-#define _gloffset_VertexAttrib2dvARB 672
-#define _gloffset_VertexAttrib3svARB 673
-#define _gloffset_VertexAttrib3fvARB 674
-#define _gloffset_VertexAttrib3dvARB 675
-#define _gloffset_VertexAttrib4bvARB 676
-#define _gloffset_VertexAttrib4svARB 677
-#define _gloffset_VertexAttrib4ivARB 678
-#define _gloffset_VertexAttrib4ubvARB 679
-#define _gloffset_VertexAttrib4usvARB 680
-#define _gloffset_VertexAttrib4uivARB 681
-#define _gloffset_VertexAttrib4fvARB 682
-#define _gloffset_VertexAttrib4dvARB 683
-#define _gloffset_VertexAttrib4NbvARB 684
-#define _gloffset_VertexAttrib4NsvARB 685
-#define _gloffset_VertexAttrib4NivARB 686
-#define _gloffset_VertexAttrib4NubvARB 687
-#define _gloffset_VertexAttrib4NusvARB 688
-#define _gloffset_VertexAttrib4NuivARB 689
-#define _gloffset_VertexAttribPointerARB 690
-#define _gloffset_EnableVertexAttribArrayARB 691
-#define _gloffset_DisableVertexAttribArrayARB 692
-#define _gloffset_ProgramStringARB 693
-#define _gloffset_BindProgramARB 694
-#define _gloffset_DeleteProgramsARB 695
-#define _gloffset_GenProgramsARB 696
-#define _gloffset_ProgramEnvParameter4dARB 697
-#define _gloffset_ProgramEnvParameter4dvARB 698
-#define _gloffset_ProgramEnvParameter4fARB 699
-#define _gloffset_ProgramEnvParameter4fvARB 700
-#define _gloffset_ProgramLocalParameter4dARB 701
-#define _gloffset_ProgramLocalParameter4dvARB 702
-#define _gloffset_ProgramLocalParameter4fARB 703
-#define _gloffset_ProgramLocalParameter4fvARB 704
-#define _gloffset_GetProgramEnvParameterdvARB 705
-#define _gloffset_GetProgramEnvParameterfvARB 706
-#define _gloffset_GetProgramLocalParameterdvARB 707
-#define _gloffset_GetProgramLocalParameterfvARB 708
-#define _gloffset_GetProgramivARB 709
-#define _gloffset_GetProgramStringARB 710
-#define _gloffset_GetVertexAttribdvARB 711
-#define _gloffset_GetVertexAttribfvARB 712
-#define _gloffset_GetVertexAttribivARB 713
-#define _gloffset_GetVertexAttribPointervARB 714
-#define _gloffset_IsProgramARB 715
-#define _gloffset_ProgramNamedParameter4fNV 716
-#define _gloffset_ProgramNamedParameter4dNV 717
-#define _gloffset_ProgramNamedParameter4fvNV 718
-#define _gloffset_ProgramNamedParameter4dvNV 719
-#define _gloffset_GetProgramNamedParameterfvNV 720
-#define _gloffset_GetProgramNamedParameterdvNV 721
-#define _gloffset_BindBufferARB 722
-#define _gloffset_DeleteBuffersARB 723
-#define _gloffset_GenBuffersARB 724
-#define _gloffset_IsBufferARB 725
-#define _gloffset_BufferDataARB 726
-#define _gloffset_BufferSubDataARB 727
-#define _gloffset_GetBufferSubDataARB 728
-#define _gloffset_MapBufferARB 729
-#define _gloffset_UnmapBufferARB 730
-#define _gloffset_GetBufferParameterivARB 731
-#define _gloffset_GetBufferPointervARB 732
+#define _gloffset_VertexAttrib4bvARB 654
+#define _gloffset_VertexAttrib4ivARB 655
+#define _gloffset_VertexAttrib4ubvARB 656
+#define _gloffset_VertexAttrib4usvARB 657
+#define _gloffset_VertexAttrib4uivARB 658
+#define _gloffset_VertexAttrib4NbvARB 659
+#define _gloffset_VertexAttrib4NsvARB 660
+#define _gloffset_VertexAttrib4NivARB 661
+#define _gloffset_VertexAttrib4NusvARB 662
+#define _gloffset_VertexAttrib4NuivARB 663
+#define _gloffset_VertexAttribPointerARB 664
+#define _gloffset_EnableVertexAttribArrayARB 665
+#define _gloffset_DisableVertexAttribArrayARB 666
+#define _gloffset_ProgramStringARB 667
+#define _gloffset_ProgramEnvParameter4dARB 668
+#define _gloffset_ProgramEnvParameter4dvARB 669
+#define _gloffset_ProgramEnvParameter4fARB 670
+#define _gloffset_ProgramEnvParameter4fvARB 671
+#define _gloffset_ProgramLocalParameter4dARB 672
+#define _gloffset_ProgramLocalParameter4dvARB 673
+#define _gloffset_ProgramLocalParameter4fARB 674
+#define _gloffset_ProgramLocalParameter4fvARB 675
+#define _gloffset_GetProgramEnvParameterdvARB 676
+#define _gloffset_GetProgramEnvParameterfvARB 677
+#define _gloffset_GetProgramLocalParameterdvARB 678
+#define _gloffset_GetProgramLocalParameterfvARB 679
+#define _gloffset_GetProgramivARB 680
+#define _gloffset_GetProgramStringARB 681
+#define _gloffset_ProgramNamedParameter4fNV 682
+#define _gloffset_ProgramNamedParameter4dNV 683
+#define _gloffset_ProgramNamedParameter4fvNV 684
+#define _gloffset_ProgramNamedParameter4dvNV 685
+#define _gloffset_GetProgramNamedParameterfvNV 686
+#define _gloffset_GetProgramNamedParameterdvNV 687
+#define _gloffset_BindBufferARB 688
+#define _gloffset_BufferDataARB 689
+#define _gloffset_BufferSubDataARB 690
+#define _gloffset_DeleteBuffersARB 691
+#define _gloffset_GenBuffersARB 692
+#define _gloffset_GetBufferParameterivARB 693
+#define _gloffset_GetBufferPointervARB 694
+#define _gloffset_GetBufferSubDataARB 695
+#define _gloffset_IsBufferARB 696
+#define _gloffset_MapBufferARB 697
+#define _gloffset_UnmapBufferARB 698
+#define _gloffset_DepthBoundsEXT 699
 
 #endif
diff --git a/src/mesa/glapi/glapitable.h b/src/mesa/glapi/glapitable.h
index 53de09685f8..bd51c8aad2b 100644
--- a/src/mesa/glapi/glapitable.h
+++ b/src/mesa/glapi/glapitable.h
@@ -660,85 +660,52 @@ struct _glapi_table
    void (*GetFenceivNV)(GLuint fence, GLenum pname, GLint * params); /* 651 */
    void (*FinishFenceNV)(GLuint fence); /* 652 */
    void (*SetFenceNV)(GLuint fence, GLenum condition); /* 653 */
-   void (*VertexAttrib1sARB)(GLuint index, GLshort x); /* 654 */
-   void (*VertexAttrib1fARB)(GLuint index, GLfloat x); /* 655 */
-   void (*VertexAttrib1dARB)(GLuint index, GLdouble x); /* 656 */
-   void (*VertexAttrib2sARB)(GLuint index, GLshort x, GLshort y); /* 657 */
-   void (*VertexAttrib2fARB)(GLuint index, GLfloat x, GLfloat y); /* 658 */
-   void (*VertexAttrib2dARB)(GLuint index, GLdouble x, GLdouble y); /* 659 */
-   void (*VertexAttrib3sARB)(GLuint index, GLshort x, GLshort y, GLshort z); /* 660 */
-   void (*VertexAttrib3fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 661 */
-   void (*VertexAttrib3dARB)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 662 */
-   void (*VertexAttrib4sARB)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 663 */
-   void (*VertexAttrib4fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 664 */
-   void (*VertexAttrib4dARB)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 665 */
-   void (*VertexAttrib4NubARB)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 666 */
-   void (*VertexAttrib1svARB)(GLuint index, const GLshort * v); /* 667 */
-   void (*VertexAttrib1fvARB)(GLuint index, const GLfloat * v); /* 668 */
-   void (*VertexAttrib1dvARB)(GLuint index, const GLdouble * v); /* 669 */
-   void (*VertexAttrib2svARB)(GLuint index, const GLshort * v); /* 670 */
-   void (*VertexAttrib2fvARB)(GLuint index, const GLfloat * v); /* 671 */
-   void (*VertexAttrib2dvARB)(GLuint index, const GLdouble * v); /* 672 */
-   void (*VertexAttrib3svARB)(GLuint index, const GLshort * v); /* 673 */
-   void (*VertexAttrib3fvARB)(GLuint index, const GLfloat * v); /* 674 */
-   void (*VertexAttrib3dvARB)(GLuint index, const GLdouble * v); /* 675 */
-   void (*VertexAttrib4bvARB)(GLuint index, const GLbyte * v); /* 676 */
-   void (*VertexAttrib4svARB)(GLuint index, const GLshort * v); /* 677 */
-   void (*VertexAttrib4ivARB)(GLuint index, const GLint * v); /* 678 */
-   void (*VertexAttrib4ubvARB)(GLuint index, const GLubyte * v); /* 679 */
-   void (*VertexAttrib4usvARB)(GLuint index, const GLushort * v); /* 680 */
-   void (*VertexAttrib4uivARB)(GLuint index, const GLuint * v); /* 681 */
-   void (*VertexAttrib4fvARB)(GLuint index, const GLfloat * v); /* 682 */
-   void (*VertexAttrib4dvARB)(GLuint index, const GLdouble * v); /* 683 */
-   void (*VertexAttrib4NbvARB)(GLuint index, const GLbyte * v); /* 684 */
-   void (*VertexAttrib4NsvARB)(GLuint index, const GLshort * v); /* 685 */
-   void (*VertexAttrib4NivARB)(GLuint index, const GLint * v); /* 686 */
-   void (*VertexAttrib4NubvARB)(GLuint index, const GLubyte * v); /* 687 */
-   void (*VertexAttrib4NusvARB)(GLuint index, const GLushort * v); /* 688 */
-   void (*VertexAttrib4NuivARB)(GLuint index, const GLuint * v); /* 689 */
-   void (*VertexAttribPointerARB)(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid * pointer); /* 690 */
-   void (*EnableVertexAttribArrayARB)(GLuint index); /* 691 */
-   void (*DisableVertexAttribArrayARB)(GLuint index); /* 692 */
-   void (*ProgramStringARB)(GLenum target, GLenum format, GLsizei len, const GLvoid * string); /* 693 */
-   void (*BindProgramARB)(GLenum target, GLuint program); /* 694 */
-   void (*DeleteProgramsARB)(GLsizei n, const GLuint * programs); /* 695 */
-   void (*GenProgramsARB)(GLsizei n, GLuint * programs); /* 696 */
-   void (*ProgramEnvParameter4dARB)(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 697 */
-   void (*ProgramEnvParameter4dvARB)(GLenum target, GLuint index, const GLdouble * params); /* 698 */
-   void (*ProgramEnvParameter4fARB)(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 699 */
-   void (*ProgramEnvParameter4fvARB)(GLenum target, GLuint index, const GLfloat * params); /* 700 */
-   void (*ProgramLocalParameter4dARB)(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 701 */
-   void (*ProgramLocalParameter4dvARB)(GLenum target, GLuint index, const GLdouble * params); /* 702 */
-   void (*ProgramLocalParameter4fARB)(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 703 */
-   void (*ProgramLocalParameter4fvARB)(GLenum target, GLuint index, const GLfloat * params); /* 704 */
-   void (*GetProgramEnvParameterdvARB)(GLenum target, GLuint index, GLdouble * params); /* 705 */
-   void (*GetProgramEnvParameterfvARB)(GLenum target, GLuint index, GLfloat * params); /* 706 */
-   void (*GetProgramLocalParameterdvARB)(GLenum target, GLuint index, GLdouble * params); /* 707 */
-   void (*GetProgramLocalParameterfvARB)(GLenum target, GLuint index, GLfloat * params); /* 708 */
-   void (*GetProgramivARB)(GLenum target, GLenum pname, GLint * params); /* 709 */
-   void (*GetProgramStringARB)(GLenum target, GLenum pname, GLvoid * string); /* 710 */
-   void (*GetVertexAttribdvARB)(GLuint index, GLenum pname, GLdouble * params); /* 711 */
-   void (*GetVertexAttribfvARB)(GLuint index, GLenum pname, GLfloat * params); /* 712 */
-   void (*GetVertexAttribivARB)(GLuint index, GLenum pname, GLint * params); /* 713 */
-   void (*GetVertexAttribPointervARB)(GLuint index, GLenum pname, GLvoid ** params); /* 714 */
-   GLboolean (*IsProgramARB)(GLuint program); /* 715 */
-   void (*ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 716 */
-   void (*ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 717 */
-   void (*ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 718 */
-   void (*ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 719 */
-   void (*GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 720 */
-   void (*GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 721 */
-   void (*BindBufferARB)(GLenum target, GLuint buffer); /* 722 */
-   void (*DeleteBuffersARB)(GLsizei n, const GLuint * buffer); /* 723 */
-   void (*GenBuffersARB)(GLsizei n, GLuint * buffer); /* 724 */
-   GLboolean (*IsBufferARB)(GLuint buffer); /* 725 */
-   void (*BufferDataARB)(GLenum target, GLsizeiptrARB size, const GLvoid * data, GLenum usage); /* 726 */
-   void (*BufferSubDataARB)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid * data); /* 727 */
-   void (*GetBufferSubDataARB)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, void * data); /* 728 */
-   void (*MapBufferARB)(GLenum target, GLenum access); /* 729 */
-   GLboolean (*UnmapBufferARB)(GLenum target); /* 730 */
-   void (*GetBufferParameterivARB)(GLenum target, GLenum pname, GLint * params); /* 731 */
-   void (*GetBufferPointervARB)(GLenum target, GLenum pname, GLvoid ** params); /* 732 */
+   void (*VertexAttrib4bvARB)(GLuint index, const GLbyte * v); /* 654 */
+   void (*VertexAttrib4ivARB)(GLuint index, const GLint * v); /* 655 */
+   void (*VertexAttrib4ubvARB)(GLuint index, const GLubyte * v); /* 656 */
+   void (*VertexAttrib4usvARB)(GLuint index, const GLushort * v); /* 657 */
+   void (*VertexAttrib4uivARB)(GLuint index, const GLuint * v); /* 658 */
+   void (*VertexAttrib4NbvARB)(GLuint index, const GLbyte * v); /* 659 */
+   void (*VertexAttrib4NsvARB)(GLuint index, const GLshort * v); /* 660 */
+   void (*VertexAttrib4NivARB)(GLuint index, const GLint * v); /* 661 */
+   void (*VertexAttrib4NusvARB)(GLuint index, const GLushort * v); /* 662 */
+   void (*VertexAttrib4NuivARB)(GLuint index, const GLuint * v); /* 663 */
+   void (*VertexAttribPointerARB)(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid * pointer); /* 664 */
+   void (*EnableVertexAttribArrayARB)(GLuint index); /* 665 */
+   void (*DisableVertexAttribArrayARB)(GLuint index); /* 666 */
+   void (*ProgramStringARB)(GLenum target, GLenum format, GLsizei len, const GLvoid * string); /* 667 */
+   void (*ProgramEnvParameter4dARB)(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 668 */
+   void (*ProgramEnvParameter4dvARB)(GLenum target, GLuint index, const GLdouble * params); /* 669 */
+   void (*ProgramEnvParameter4fARB)(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 670 */
+   void (*ProgramEnvParameter4fvARB)(GLenum target, GLuint index, const GLfloat * params); /* 671 */
+   void (*ProgramLocalParameter4dARB)(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 672 */
+   void (*ProgramLocalParameter4dvARB)(GLenum target, GLuint index, const GLdouble * params); /* 673 */
+   void (*ProgramLocalParameter4fARB)(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 674 */
+   void (*ProgramLocalParameter4fvARB)(GLenum target, GLuint index, const GLfloat * params); /* 675 */
+   void (*GetProgramEnvParameterdvARB)(GLenum target, GLuint index, GLdouble * params); /* 676 */
+   void (*GetProgramEnvParameterfvARB)(GLenum target, GLuint index, GLfloat * params); /* 677 */
+   void (*GetProgramLocalParameterdvARB)(GLenum target, GLuint index, GLdouble * params); /* 678 */
+   void (*GetProgramLocalParameterfvARB)(GLenum target, GLuint index, GLfloat * params); /* 679 */
+   void (*GetProgramivARB)(GLenum target, GLenum pname, GLint * params); /* 680 */
+   void (*GetProgramStringARB)(GLenum target, GLenum pname, GLvoid * string); /* 681 */
+   void (*ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 682 */
+   void (*ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 683 */
+   void (*ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 684 */
+   void (*ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 685 */
+   void (*GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 686 */
+   void (*GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 687 */
+   void (*BindBufferARB)(GLenum target, GLuint buffer); /* 688 */
+   void (*BufferDataARB)(GLenum target, GLsizeiptrARB size, const GLvoid * data, GLenum usage); /* 689 */
+   void (*BufferSubDataARB)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid * data); /* 690 */
+   void (*DeleteBuffersARB)(GLsizei n, const GLuint * buffer); /* 691 */
+   void (*GenBuffersARB)(GLsizei n, GLuint * buffer); /* 692 */
+   void (*GetBufferParameterivARB)(GLenum target, GLenum pname, GLint * params); /* 693 */
+   void (*GetBufferPointervARB)(GLenum target, GLenum pname, GLvoid ** params); /* 694 */
+   void (*GetBufferSubDataARB)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, void * data); /* 695 */
+   GLboolean (*IsBufferARB)(GLuint buffer); /* 696 */
+   void (*MapBufferARB)(GLenum target, GLenum access); /* 697 */
+   GLboolean (*UnmapBufferARB)(GLenum target); /* 698 */
+   void (*DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 699 */
 };
 
 #endif
diff --git a/src/mesa/glapi/glapitemp.h b/src/mesa/glapi/glapitemp.h
index 8841eda95bf..3df11a5973d 100644
--- a/src/mesa/glapi/glapitemp.h
+++ b/src/mesa/glapi/glapitemp.h
@@ -3538,41 +3538,6 @@ KEYWORD1 void KEYWORD2 NAME(SamplePatternEXT)(GLenum pattern)
 
 /* No dispatch for TextureColorMaskSGIS() */
 /* No dispatch for IglooInterfaceSGIX() */
-KEYWORD1 void KEYWORD2 NAME(DeleteFencesNV)(GLsizei n, const GLuint * fences)
-{
-   DISPATCH(DeleteFencesNV, (n, fences), (F, "glDeleteFencesNV(%d, %p);\n", n, (const void *) fences));
-}
-
-KEYWORD1 void KEYWORD2 NAME(GenFencesNV)(GLsizei n, GLuint * fences)
-{
-   DISPATCH(GenFencesNV, (n, fences), (F, "glGenFencesNV(%d, %p);\n", n, (const void *) fences));
-}
-
-KEYWORD1 GLboolean KEYWORD2 NAME(IsFenceNV)(GLuint fence)
-{
-   RETURN_DISPATCH(IsFenceNV, (fence), (F, "glIsFenceNV(%d);\n", fence));
-}
-
-KEYWORD1 GLboolean KEYWORD2 NAME(TestFenceNV)(GLuint fence)
-{
-   RETURN_DISPATCH(TestFenceNV, (fence), (F, "glTestFenceNV(%d);\n", fence));
-}
-
-KEYWORD1 void KEYWORD2 NAME(GetFenceivNV)(GLuint fence, GLenum pname, GLint * params)
-{
-   DISPATCH(GetFenceivNV, (fence, pname, params), (F, "glGetFenceivNV(%d, 0x%x, %p);\n", fence, pname, (const void *) params));
-}
-
-KEYWORD1 void KEYWORD2 NAME(FinishFenceNV)(GLuint fence)
-{
-   DISPATCH(FinishFenceNV, (fence), (F, "glFinishFenceNV(%d);\n", fence));
-}
-
-KEYWORD1 void KEYWORD2 NAME(SetFenceNV)(GLuint fence, GLenum condition)
-{
-   DISPATCH(SetFenceNV, (fence, condition), (F, "glSetFenceNV(%d, 0x%x);\n", fence, condition));
-}
-
 /* No dispatch for MapControlPointsNV() */
 /* No dispatch for MapParameterivNV() */
 /* No dispatch for MapParameterfvNV() */
@@ -4224,114 +4189,149 @@ KEYWORD1 void KEYWORD2 NAME(ActiveStencilFaceEXT)(GLenum face)
    DISPATCH(ActiveStencilFaceEXT, (face), (F, "glActiveStencilFaceEXT(0x%x);\n", face));
 }
 
+KEYWORD1 void KEYWORD2 NAME(DeleteFencesNV)(GLsizei n, const GLuint * fences)
+{
+   DISPATCH(DeleteFencesNV, (n, fences), (F, "glDeleteFencesNV(%d, %p);\n", n, (const void *) fences));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GenFencesNV)(GLsizei n, GLuint * fences)
+{
+   DISPATCH(GenFencesNV, (n, fences), (F, "glGenFencesNV(%d, %p);\n", n, (const void *) fences));
+}
+
+KEYWORD1 GLboolean KEYWORD2 NAME(IsFenceNV)(GLuint fence)
+{
+   RETURN_DISPATCH(IsFenceNV, (fence), (F, "glIsFenceNV(%d);\n", fence));
+}
+
+KEYWORD1 GLboolean KEYWORD2 NAME(TestFenceNV)(GLuint fence)
+{
+   RETURN_DISPATCH(TestFenceNV, (fence), (F, "glTestFenceNV(%d);\n", fence));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetFenceivNV)(GLuint fence, GLenum pname, GLint * params)
+{
+   DISPATCH(GetFenceivNV, (fence, pname, params), (F, "glGetFenceivNV(%d, 0x%x, %p);\n", fence, pname, (const void *) params));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FinishFenceNV)(GLuint fence)
+{
+   DISPATCH(FinishFenceNV, (fence), (F, "glFinishFenceNV(%d);\n", fence));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SetFenceNV)(GLuint fence, GLenum condition)
+{
+   DISPATCH(SetFenceNV, (fence, condition), (F, "glSetFenceNV(%d, 0x%x);\n", fence, condition));
+}
+
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib1sARB)(GLuint index, GLshort x)
 {
-   DISPATCH(VertexAttrib1sARB, (index, x), (F, "glVertexAttrib1sARB(%d, %d);\n", index, x));
+   DISPATCH(VertexAttrib1sNV, (index, x), (F, "glVertexAttrib1sARB(%d, %d);\n", index, x));
 }
 
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib1fARB)(GLuint index, GLfloat x)
 {
-   DISPATCH(VertexAttrib1fARB, (index, x), (F, "glVertexAttrib1fARB(%d, %f);\n", index, x));
+   DISPATCH(VertexAttrib1fNV, (index, x), (F, "glVertexAttrib1fARB(%d, %f);\n", index, x));
 }
 
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib1dARB)(GLuint index, GLdouble x)
 {
-   DISPATCH(VertexAttrib1dARB, (index, x), (F, "glVertexAttrib1dARB(%d, %f);\n", index, x));
+   DISPATCH(VertexAttrib1dNV, (index, x), (F, "glVertexAttrib1dARB(%d, %f);\n", index, x));
 }
 
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib2sARB)(GLuint index, GLshort x, GLshort y)
 {
-   DISPATCH(VertexAttrib2sARB, (index, x, y), (F, "glVertexAttrib2sARB(%d, %d, %d);\n", index, x, y));
+   DISPATCH(VertexAttrib2sNV, (index, x, y), (F, "glVertexAttrib2sARB(%d, %d, %d);\n", index, x, y));
 }
 
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib2fARB)(GLuint index, GLfloat x, GLfloat y)
 {
-   DISPATCH(VertexAttrib2fARB, (index, x, y), (F, "glVertexAttrib2fARB(%d, %f, %f);\n", index, x, y));
+   DISPATCH(VertexAttrib2fNV, (index, x, y), (F, "glVertexAttrib2fARB(%d, %f, %f);\n", index, x, y));
 }
 
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib2dARB)(GLuint index, GLdouble x, GLdouble y)
 {
-   DISPATCH(VertexAttrib2dARB, (index, x, y), (F, "glVertexAttrib2dARB(%d, %f, %f);\n", index, x, y));
+   DISPATCH(VertexAttrib2dNV, (index, x, y), (F, "glVertexAttrib2dARB(%d, %f, %f);\n", index, x, y));
 }
 
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib3sARB)(GLuint index, GLshort x, GLshort y, GLshort z)
 {
-   DISPATCH(VertexAttrib3sARB, (index, x, y, z), (F, "glVertexAttrib3sARB(%d, %d, %d, %d);\n", index, x, y, z));
+   DISPATCH(VertexAttrib3sNV, (index, x, y, z), (F, "glVertexAttrib3sARB(%d, %d, %d, %d);\n", index, x, y, z));
 }
 
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib3fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z)
 {
-   DISPATCH(VertexAttrib3fARB, (index, x, y, z), (F, "glVertexAttrib3fARB(%d, %f, %f, %f);\n", index, x, y, z));
+   DISPATCH(VertexAttrib3fNV, (index, x, y, z), (F, "glVertexAttrib3fARB(%d, %f, %f, %f);\n", index, x, y, z));
 }
 
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib3dARB)(GLuint index, GLdouble x, GLdouble y, GLdouble z)
 {
-   DISPATCH(VertexAttrib3dARB, (index, x, y, z), (F, "glVertexAttrib3dARB(%d, %f, %f, %f);\n", index, x, y, z));
+   DISPATCH(VertexAttrib3dNV, (index, x, y, z), (F, "glVertexAttrib3dARB(%d, %f, %f, %f);\n", index, x, y, z));
 }
 
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib4sARB)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)
 {
-   DISPATCH(VertexAttrib4sARB, (index, x, y, z, w), (F, "glVertexAttrib4sARB(%d, %d, %d, %d, %d);\n", index, x, y, z, w));
+   DISPATCH(VertexAttrib4sNV, (index, x, y, z, w), (F, "glVertexAttrib4sARB(%d, %d, %d, %d, %d);\n", index, x, y, z, w));
 }
 
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib4fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-   DISPATCH(VertexAttrib4fARB, (index, x, y, z, w), (F, "glVertexAttrib4fARB(%d, %f, %f, %f, %f);\n", index, x, y, z, w));
+   DISPATCH(VertexAttrib4fNV, (index, x, y, z, w), (F, "glVertexAttrib4fARB(%d, %f, %f, %f, %f);\n", index, x, y, z, w));
 }
 
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib4dARB)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-   DISPATCH(VertexAttrib4dARB, (index, x, y, z, w), (F, "glVertexAttrib4dARB(%d, %f, %f, %f, %f);\n", index, x, y, z, w));
+   DISPATCH(VertexAttrib4dNV, (index, x, y, z, w), (F, "glVertexAttrib4dARB(%d, %f, %f, %f, %f);\n", index, x, y, z, w));
 }
 
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib4NubARB)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)
 {
-   DISPATCH(VertexAttrib4NubARB, (index, x, y, z, w), (F, "glVertexAttrib4NubARB(%d, %d, %d, %d, %d);\n", index, x, y, z, w));
+   DISPATCH(VertexAttrib4ubNV, (index, x, y, z, w), (F, "glVertexAttrib4NubARB(%d, %d, %d, %d, %d);\n", index, x, y, z, w));
 }
 
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib1svARB)(GLuint index, const GLshort * v)
 {
-   DISPATCH(VertexAttrib1svARB, (index, v), (F, "glVertexAttrib1svARB(%d, %p);\n", index, (const void *) v));
+   DISPATCH(VertexAttrib1svNV, (index, v), (F, "glVertexAttrib1svARB(%d, %p);\n", index, (const void *) v));
 }
 
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib1fvARB)(GLuint index, const GLfloat * v)
 {
-   DISPATCH(VertexAttrib1fvARB, (index, v), (F, "glVertexAttrib1fvARB(%d, %p);\n", index, (const void *) v));
+   DISPATCH(VertexAttrib1fvNV, (index, v), (F, "glVertexAttrib1fvARB(%d, %p);\n", index, (const void *) v));
 }
 
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib1dvARB)(GLuint index, const GLdouble * v)
 {
-   DISPATCH(VertexAttrib1dvARB, (index, v), (F, "glVertexAttrib1dvARB(%d, %p);\n", index, (const void *) v));
+   DISPATCH(VertexAttrib1dvNV, (index, v), (F, "glVertexAttrib1dvARB(%d, %p);\n", index, (const void *) v));
 }
 
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib2svARB)(GLuint index, const GLshort * v)
 {
-   DISPATCH(VertexAttrib2svARB, (index, v), (F, "glVertexAttrib2svARB(%d, %p);\n", index, (const void *) v));
+   DISPATCH(VertexAttrib2svNV, (index, v), (F, "glVertexAttrib2svARB(%d, %p);\n", index, (const void *) v));
 }
 
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib2fvARB)(GLuint index, const GLfloat * v)
 {
-   DISPATCH(VertexAttrib2fvARB, (index, v), (F, "glVertexAttrib2fvARB(%d, %p /* %g, %g */);\n", index, (const void *) v, v[0], v[1]));
+   DISPATCH(VertexAttrib2fvNV, (index, v), (F, "glVertexAttrib2fvARB(%d, %p /* %g, %g */);\n", index, (const void *) v, v[0], v[1]));
 }
 
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib2dvARB)(GLuint index, const GLdouble * v)
 {
-   DISPATCH(VertexAttrib2dvARB, (index, v), (F, "glVertexAttrib2dvARB(%d, %p /* %g, %g */);\n", index, (const void *) v, v[0], v[1]));
+   DISPATCH(VertexAttrib2dvNV, (index, v), (F, "glVertexAttrib2dvARB(%d, %p /* %g, %g */);\n", index, (const void *) v, v[0], v[1]));
 }
 
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib3svARB)(GLuint index, const GLshort * v)
 {
-   DISPATCH(VertexAttrib3svARB, (index, v), (F, "glVertexAttrib3svARB(%d, %p);\n", index, (const void *) v));
+   DISPATCH(VertexAttrib3svNV, (index, v), (F, "glVertexAttrib3svARB(%d, %p);\n", index, (const void *) v));
 }
 
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib3fvARB)(GLuint index, const GLfloat * v)
 {
-   DISPATCH(VertexAttrib3fvARB, (index, v), (F, "glVertexAttrib3fvARB(%d, %p /* %g, %g, %g */);\n", index, (const void *) v, v[0], v[1], v[2]));
+   DISPATCH(VertexAttrib3fvNV, (index, v), (F, "glVertexAttrib3fvARB(%d, %p /* %g, %g, %g */);\n", index, (const void *) v, v[0], v[1], v[2]));
 }
 
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib3dvARB)(GLuint index, const GLdouble * v)
 {
-   DISPATCH(VertexAttrib3dvARB, (index, v), (F, "glVertexAttrib3dvARB(%d, %p /* %g, %g, %g */);\n", index, (const void *) v, v[0], v[1], v[2]));
+   DISPATCH(VertexAttrib3dvNV, (index, v), (F, "glVertexAttrib3dvARB(%d, %p /* %g, %g, %g */);\n", index, (const void *) v, v[0], v[1], v[2]));
 }
 
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib4bvARB)(GLuint index, const GLbyte * v)
@@ -4341,7 +4341,7 @@ KEYWORD1 void KEYWORD2 NAME(VertexAttrib4bvARB)(GLuint index, const GLbyte * v)
 
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib4svARB)(GLuint index, const GLshort * v)
 {
-   DISPATCH(VertexAttrib4svARB, (index, v), (F, "glVertexAttrib4svARB(%d, %p);\n", index, (const void *) v));
+   DISPATCH(VertexAttrib4svNV, (index, v), (F, "glVertexAttrib4svARB(%d, %p);\n", index, (const void *) v));
 }
 
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib4ivARB)(GLuint index, const GLint * v)
@@ -4366,12 +4366,12 @@ KEYWORD1 void KEYWORD2 NAME(VertexAttrib4uivARB)(GLuint index, const GLuint * v)
 
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib4fvARB)(GLuint index, const GLfloat * v)
 {
-   DISPATCH(VertexAttrib4fvARB, (index, v), (F, "glVertexAttrib4fvARB(%d, %p /* %g, %g, %g, %g */);\n", index, (const void *) v, v[0], v[1], v[2], v[3]));
+   DISPATCH(VertexAttrib4fvNV, (index, v), (F, "glVertexAttrib4fvARB(%d, %p /* %g, %g, %g, %g */);\n", index, (const void *) v, v[0], v[1], v[2], v[3]));
 }
 
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib4dvARB)(GLuint index, const GLdouble * v)
 {
-   DISPATCH(VertexAttrib4dvARB, (index, v), (F, "glVertexAttrib4dvARB(%d, %p /* %g, %g, %g, %g */);\n", index, (const void *) v, v[0], v[1], v[2], v[3]));
+   DISPATCH(VertexAttrib4dvNV, (index, v), (F, "glVertexAttrib4dvARB(%d, %p /* %g, %g, %g, %g */);\n", index, (const void *) v, v[0], v[1], v[2], v[3]));
 }
 
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib4NbvARB)(GLuint index, const GLbyte * v)
@@ -4391,7 +4391,7 @@ KEYWORD1 void KEYWORD2 NAME(VertexAttrib4NivARB)(GLuint index, const GLint * v)
 
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib4NubvARB)(GLuint index, const GLubyte * v)
 {
-   DISPATCH(VertexAttrib4NubvARB, (index, v), (F, "glVertexAttrib4NubvARB(%d, %p);\n", index, (const void *) v));
+   DISPATCH(VertexAttrib4ubvNV, (index, v), (F, "glVertexAttrib4NubvARB(%d, %p);\n", index, (const void *) v));
 }
 
 KEYWORD1 void KEYWORD2 NAME(VertexAttrib4NusvARB)(GLuint index, const GLushort * v)
@@ -4426,17 +4426,22 @@ KEYWORD1 void KEYWORD2 NAME(ProgramStringARB)(GLenum target, GLenum format, GLsi
 
 KEYWORD1 void KEYWORD2 NAME(BindProgramARB)(GLenum target, GLuint program)
 {
-   DISPATCH(BindProgramARB, (target, program), (F, "glBindProgramARB(0x%x, %d);\n", target, program));
+   DISPATCH(BindProgramNV, (target, program), (F, "glBindProgramARB(0x%x, %d);\n", target, program));
 }
 
 KEYWORD1 void KEYWORD2 NAME(DeleteProgramsARB)(GLsizei n, const GLuint * programs)
 {
-   DISPATCH(DeleteProgramsARB, (n, programs), (F, "glDeleteProgramsARB(%d, %p);\n", n, (const void *) programs));
+   DISPATCH(DeleteProgramsNV, (n, programs), (F, "glDeleteProgramsARB(%d, %p);\n", n, (const void *) programs));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GenProgramsARB)(GLsizei n, GLuint * programs)
 {
-   DISPATCH(GenProgramsARB, (n, programs), (F, "glGenProgramsARB(%d, %p);\n", n, (const void *) programs));
+   DISPATCH(GenProgramsNV, (n, programs), (F, "glGenProgramsARB(%d, %p);\n", n, (const void *) programs));
+}
+
+KEYWORD1 GLboolean KEYWORD2 NAME(IsProgramARB)(GLuint program)
+{
+   RETURN_DISPATCH(IsProgramNV, (program), (F, "glIsProgramARB(%d);\n", program));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ProgramEnvParameter4dARB)(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
@@ -4511,27 +4516,22 @@ KEYWORD1 void KEYWORD2 NAME(GetProgramStringARB)(GLenum target, GLenum pname, GL
 
 KEYWORD1 void KEYWORD2 NAME(GetVertexAttribdvARB)(GLuint index, GLenum pname, GLdouble * params)
 {
-   DISPATCH(GetVertexAttribdvARB, (index, pname, params), (F, "glGetVertexAttribdvARB(%d, 0x%x, %p);\n", index, pname, (const void *) params));
+   DISPATCH(GetVertexAttribdvNV, (index, pname, params), (F, "glGetVertexAttribdvARB(%d, 0x%x, %p);\n", index, pname, (const void *) params));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetVertexAttribfvARB)(GLuint index, GLenum pname, GLfloat * params)
 {
-   DISPATCH(GetVertexAttribfvARB, (index, pname, params), (F, "glGetVertexAttribfvARB(%d, 0x%x, %p);\n", index, pname, (const void *) params));
+   DISPATCH(GetVertexAttribfvNV, (index, pname, params), (F, "glGetVertexAttribfvARB(%d, 0x%x, %p);\n", index, pname, (const void *) params));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetVertexAttribivARB)(GLuint index, GLenum pname, GLint * params)
 {
-   DISPATCH(GetVertexAttribivARB, (index, pname, params), (F, "glGetVertexAttribivARB(%d, 0x%x, %p);\n", index, pname, (const void *) params));
+   DISPATCH(GetVertexAttribivNV, (index, pname, params), (F, "glGetVertexAttribivARB(%d, 0x%x, %p);\n", index, pname, (const void *) params));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetVertexAttribPointervARB)(GLuint index, GLenum pname, GLvoid ** params)
 {
-   DISPATCH(GetVertexAttribPointervARB, (index, pname, params), (F, "glGetVertexAttribPointervARB(%d, 0x%x, %p);\n", index, pname, (const void *) params));
-}
-
-KEYWORD1 GLboolean KEYWORD2 NAME(IsProgramARB)(GLuint program)
-{
-   RETURN_DISPATCH(IsProgramARB, (program), (F, "glIsProgramARB(%d);\n", program));
+   DISPATCH(GetVertexAttribPointervNV, (index, pname, params), (F, "glGetVertexAttribPointervARB(%d, 0x%x, %p);\n", index, pname, (const void *) params));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
@@ -4569,6 +4569,16 @@ KEYWORD1 void KEYWORD2 NAME(BindBufferARB)(GLenum target, GLuint buffer)
    DISPATCH(BindBufferARB, (target, buffer), (F, "glBindBufferARB(0x%x, %d);\n", target, buffer));
 }
 
+KEYWORD1 void KEYWORD2 NAME(BufferDataARB)(GLenum target, GLsizeiptrARB size, const GLvoid * data, GLenum usage)
+{
+   DISPATCH(BufferDataARB, (target, size, data, usage), (F, "glBufferDataARB(0x%x, %p, %p, 0x%x);\n", target, (const void *) size, (const void *) data, usage));
+}
+
+KEYWORD1 void KEYWORD2 NAME(BufferSubDataARB)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid * data)
+{
+   DISPATCH(BufferSubDataARB, (target, offset, size, data), (F, "glBufferSubDataARB(0x%x, %p, %p, %p);\n", target, (const void *) offset, (const void *) size, (const void *) data));
+}
+
 KEYWORD1 void KEYWORD2 NAME(DeleteBuffersARB)(GLsizei n, const GLuint * buffer)
 {
    DISPATCH(DeleteBuffersARB, (n, buffer), (F, "glDeleteBuffersARB(%d, %p);\n", n, (const void *) buffer));
@@ -4579,24 +4589,24 @@ KEYWORD1 void KEYWORD2 NAME(GenBuffersARB)(GLsizei n, GLuint * buffer)
    DISPATCH(GenBuffersARB, (n, buffer), (F, "glGenBuffersARB(%d, %p);\n", n, (const void *) buffer));
 }
 
-KEYWORD1 GLboolean KEYWORD2 NAME(IsBufferARB)(GLuint buffer)
+KEYWORD1 void KEYWORD2 NAME(GetBufferParameterivARB)(GLenum target, GLenum pname, GLint * params)
 {
-   RETURN_DISPATCH(IsBufferARB, (buffer), (F, "glIsBufferARB(%d);\n", buffer));
+   DISPATCH(GetBufferParameterivARB, (target, pname, params), (F, "glGetBufferParameterivARB(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
 }
 
-KEYWORD1 void KEYWORD2 NAME(BufferDataARB)(GLenum target, GLsizeiptrARB size, const GLvoid * data, GLenum usage)
+KEYWORD1 void KEYWORD2 NAME(GetBufferPointervARB)(GLenum target, GLenum pname, GLvoid ** params)
 {
-   DISPATCH(BufferDataARB, (target, size, data, usage), (F, "glBufferDataARB(0x%x, %p, %p, 0x%x);\n", target, (const void *) size, (const void *) data, usage));
+   DISPATCH(GetBufferPointervARB, (target, pname, params), (F, "glGetBufferPointervARB(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
 }
 
-KEYWORD1 void KEYWORD2 NAME(BufferSubDataARB)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid * data)
+KEYWORD1 void KEYWORD2 NAME(GetBufferSubDataARB)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, void * data)
 {
-   DISPATCH(BufferSubDataARB, (target, offset, size, data), (F, "glBufferSubDataARB(0x%x, %p, %p, %p);\n", target, (const void *) offset, (const void *) size, (const void *) data));
+   DISPATCH(GetBufferSubDataARB, (target, offset, size, data), (F, "glGetBufferSubDataARB(0x%x, %p, %p, %p);\n", target, (const void *) offset, (const void *) size, (const void *) data));
 }
 
-KEYWORD1 void KEYWORD2 NAME(GetBufferSubDataARB)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, void * data)
+KEYWORD1 GLboolean KEYWORD2 NAME(IsBufferARB)(GLuint buffer)
 {
-   DISPATCH(GetBufferSubDataARB, (target, offset, size, data), (F, "glGetBufferSubDataARB(0x%x, %p, %p, %p);\n", target, (const void *) offset, (const void *) size, (const void *) data));
+   RETURN_DISPATCH(IsBufferARB, (buffer), (F, "glIsBufferARB(%d);\n", buffer));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MapBufferARB)(GLenum target, GLenum access)
@@ -4609,14 +4619,9 @@ KEYWORD1 GLboolean KEYWORD2 NAME(UnmapBufferARB)(GLenum target)
    RETURN_DISPATCH(UnmapBufferARB, (target), (F, "glUnmapBufferARB(0x%x);\n", target));
 }
 
-KEYWORD1 void KEYWORD2 NAME(GetBufferParameterivARB)(GLenum target, GLenum pname, GLint * params)
-{
-   DISPATCH(GetBufferParameterivARB, (target, pname, params), (F, "glGetBufferParameterivARB(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
-}
-
-KEYWORD1 void KEYWORD2 NAME(GetBufferPointervARB)(GLenum target, GLenum pname, GLvoid ** params)
+KEYWORD1 void KEYWORD2 NAME(DepthBoundsEXT)(GLclampd zmin, GLclampd zmax)
 {
-   DISPATCH(GetBufferPointervARB, (target, pname, params), (F, "glGetBufferPointervARB(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
+   DISPATCH(DepthBoundsEXT, (zmin, zmax), (F, "glDepthBoundsEXT(%f, %f);\n", zmin, zmax));
 }
 
 
@@ -5286,49 +5291,20 @@ void *DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(GetFenceivNV),
    TABLE_ENTRY(FinishFenceNV),
    TABLE_ENTRY(SetFenceNV),
-   TABLE_ENTRY(VertexAttrib1sARB),
-   TABLE_ENTRY(VertexAttrib1fARB),
-   TABLE_ENTRY(VertexAttrib1dARB),
-   TABLE_ENTRY(VertexAttrib2sARB),
-   TABLE_ENTRY(VertexAttrib2fARB),
-   TABLE_ENTRY(VertexAttrib2dARB),
-   TABLE_ENTRY(VertexAttrib3sARB),
-   TABLE_ENTRY(VertexAttrib3fARB),
-   TABLE_ENTRY(VertexAttrib3dARB),
-   TABLE_ENTRY(VertexAttrib4sARB),
-   TABLE_ENTRY(VertexAttrib4fARB),
-   TABLE_ENTRY(VertexAttrib4dARB),
-   TABLE_ENTRY(VertexAttrib4NubARB),
-   TABLE_ENTRY(VertexAttrib1svARB),
-   TABLE_ENTRY(VertexAttrib1fvARB),
-   TABLE_ENTRY(VertexAttrib1dvARB),
-   TABLE_ENTRY(VertexAttrib2svARB),
-   TABLE_ENTRY(VertexAttrib2fvARB),
-   TABLE_ENTRY(VertexAttrib2dvARB),
-   TABLE_ENTRY(VertexAttrib3svARB),
-   TABLE_ENTRY(VertexAttrib3fvARB),
-   TABLE_ENTRY(VertexAttrib3dvARB),
    TABLE_ENTRY(VertexAttrib4bvARB),
-   TABLE_ENTRY(VertexAttrib4svARB),
    TABLE_ENTRY(VertexAttrib4ivARB),
    TABLE_ENTRY(VertexAttrib4ubvARB),
    TABLE_ENTRY(VertexAttrib4usvARB),
    TABLE_ENTRY(VertexAttrib4uivARB),
-   TABLE_ENTRY(VertexAttrib4fvARB),
-   TABLE_ENTRY(VertexAttrib4dvARB),
    TABLE_ENTRY(VertexAttrib4NbvARB),
    TABLE_ENTRY(VertexAttrib4NsvARB),
    TABLE_ENTRY(VertexAttrib4NivARB),
-   TABLE_ENTRY(VertexAttrib4NubvARB),
    TABLE_ENTRY(VertexAttrib4NusvARB),
    TABLE_ENTRY(VertexAttrib4NuivARB),
    TABLE_ENTRY(VertexAttribPointerARB),
    TABLE_ENTRY(EnableVertexAttribArrayARB),
    TABLE_ENTRY(DisableVertexAttribArrayARB),
    TABLE_ENTRY(ProgramStringARB),
-   TABLE_ENTRY(BindProgramARB),
-   TABLE_ENTRY(DeleteProgramsARB),
-   TABLE_ENTRY(GenProgramsARB),
    TABLE_ENTRY(ProgramEnvParameter4dARB),
    TABLE_ENTRY(ProgramEnvParameter4dvARB),
    TABLE_ENTRY(ProgramEnvParameter4fARB),
@@ -5343,11 +5319,6 @@ void *DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(GetProgramLocalParameterfvARB),
    TABLE_ENTRY(GetProgramivARB),
    TABLE_ENTRY(GetProgramStringARB),
-   TABLE_ENTRY(GetVertexAttribdvARB),
-   TABLE_ENTRY(GetVertexAttribfvARB),
-   TABLE_ENTRY(GetVertexAttribivARB),
-   TABLE_ENTRY(GetVertexAttribPointervARB),
-   TABLE_ENTRY(IsProgramARB),
    TABLE_ENTRY(ProgramNamedParameter4fNV),
    TABLE_ENTRY(ProgramNamedParameter4dNV),
    TABLE_ENTRY(ProgramNamedParameter4fvNV),
@@ -5355,16 +5326,17 @@ void *DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(GetProgramNamedParameterfvNV),
    TABLE_ENTRY(GetProgramNamedParameterdvNV),
    TABLE_ENTRY(BindBufferARB),
-   TABLE_ENTRY(DeleteBuffersARB),
-   TABLE_ENTRY(GenBuffersARB),
-   TABLE_ENTRY(IsBufferARB),
    TABLE_ENTRY(BufferDataARB),
    TABLE_ENTRY(BufferSubDataARB),
+   TABLE_ENTRY(DeleteBuffersARB),
+   TABLE_ENTRY(GenBuffersARB),
+   TABLE_ENTRY(GetBufferParameterivARB),
+   TABLE_ENTRY(GetBufferPointervARB),
    TABLE_ENTRY(GetBufferSubDataARB),
+   TABLE_ENTRY(IsBufferARB),
    TABLE_ENTRY(MapBufferARB),
    TABLE_ENTRY(UnmapBufferARB),
-   TABLE_ENTRY(GetBufferParameterivARB),
-   TABLE_ENTRY(GetBufferPointervARB),
+   TABLE_ENTRY(DepthBoundsEXT),
    /* A whole bunch of no-op functions.  These might be called
     * when someone tries to call a dynamically-registered
     * extension function without a current rendering context.
@@ -5630,6 +5602,40 @@ void *UNUSED_TABLE_NAME[] = {
    TABLE_ENTRY(WindowPos3iv),
    TABLE_ENTRY(WindowPos3s),
    TABLE_ENTRY(WindowPos3sv),
+   TABLE_ENTRY(VertexAttrib1sARB),
+   TABLE_ENTRY(VertexAttrib1fARB),
+   TABLE_ENTRY(VertexAttrib1dARB),
+   TABLE_ENTRY(VertexAttrib2sARB),
+   TABLE_ENTRY(VertexAttrib2fARB),
+   TABLE_ENTRY(VertexAttrib2dARB),
+   TABLE_ENTRY(VertexAttrib3sARB),
+   TABLE_ENTRY(VertexAttrib3fARB),
+   TABLE_ENTRY(VertexAttrib3dARB),
+   TABLE_ENTRY(VertexAttrib4sARB),
+   TABLE_ENTRY(VertexAttrib4fARB),
+   TABLE_ENTRY(VertexAttrib4dARB),
+   TABLE_ENTRY(VertexAttrib4NubARB),
+   TABLE_ENTRY(VertexAttrib1svARB),
+   TABLE_ENTRY(VertexAttrib1fvARB),
+   TABLE_ENTRY(VertexAttrib1dvARB),
+   TABLE_ENTRY(VertexAttrib2svARB),
+   TABLE_ENTRY(VertexAttrib2fvARB),
+   TABLE_ENTRY(VertexAttrib2dvARB),
+   TABLE_ENTRY(VertexAttrib3svARB),
+   TABLE_ENTRY(VertexAttrib3fvARB),
+   TABLE_ENTRY(VertexAttrib3dvARB),
+   TABLE_ENTRY(VertexAttrib4svARB),
+   TABLE_ENTRY(VertexAttrib4fvARB),
+   TABLE_ENTRY(VertexAttrib4dvARB),
+   TABLE_ENTRY(VertexAttrib4NubvARB),
+   TABLE_ENTRY(BindProgramARB),
+   TABLE_ENTRY(DeleteProgramsARB),
+   TABLE_ENTRY(GenProgramsARB),
+   TABLE_ENTRY(IsProgramARB),
+   TABLE_ENTRY(GetVertexAttribdvARB),
+   TABLE_ENTRY(GetVertexAttribfvARB),
+   TABLE_ENTRY(GetVertexAttribivARB),
+   TABLE_ENTRY(GetVertexAttribPointervARB),
 };
 #endif /*UNUSED_TABLE_NAME*/