alias ARB/NV program functions where possible

12 files changed, 891 insertions, 934 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*/
 
diff --git a/src/mesa/main/arbprogram.c b/src/mesa/main/arbprogram.c
index fd5abf0a93d..99118cf60d5 100644
--- a/src/mesa/main/arbprogram.c
+++ b/src/mesa/main/arbprogram.c
@@ -506,27 +506,6 @@ _mesa_BindProgramARB(GLenum target, GLuint program)
 
 
 void
-_mesa_DeleteProgramsARB(GLsizei n, const GLuint *programs)
-{
-   _mesa_DeleteProgramsNV(n, programs);
-}
-
-
-void
-_mesa_GenProgramsARB(GLsizei n, GLuint *programs)
-{
-   _mesa_GenProgramsNV(n, programs);
-}
-
-
-GLboolean
-_mesa_IsProgramARB(GLuint program)
-{
-   return _mesa_IsProgramNV(program);
-}
-
-
-void
 _mesa_ProgramEnvParameter4dARB(GLenum target, GLuint index,
                                GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
diff --git a/src/mesa/main/arbprogram.h b/src/mesa/main/arbprogram.h
index 095a2106e6a..5a4436a9487 100644
--- a/src/mesa/main/arbprogram.h
+++ b/src/mesa/main/arbprogram.h
@@ -175,14 +175,6 @@ _mesa_BindProgramARB(GLenum target, GLuint program);
 
 
 extern void
-_mesa_DeleteProgramsARB(GLsizei n, const GLuint *programs);
-
-
-extern void
-_mesa_GenProgramsARB(GLsizei n, GLuint *programs);
-
-
-extern void
 _mesa_ProgramEnvParameter4dARB(GLenum target, GLuint index,
                                GLdouble x, GLdouble y, GLdouble z, GLdouble w);
 
@@ -251,8 +243,5 @@ extern void
 _mesa_GetProgramStringARB(GLenum target, GLenum pname, GLvoid *string);
 
 
-extern GLboolean
-_mesa_IsProgramARB(GLuint program);
-
 #endif
 
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index c8d21e471bc..c5fb8148b9e 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1081,6 +1081,9 @@ init_attrib_groups( GLcontext *ctx )
    ctx->Depth.Func = GL_LESS;
    ctx->Depth.Mask = GL_TRUE;
    ctx->Depth.OcclusionTest = GL_FALSE;
+   ctx->Depth.BoundsTest = GL_FALSE;
+   ctx->Depth.BoundsMin = 0.0F;
+   ctx->Depth.BoundsMax = 1.0F;
 
    /* Evaluators group */
    ctx->Eval.Map1Color4 = GL_FALSE;
diff --git a/src/mesa/main/glprocs.h b/src/mesa/main/glprocs.h
index fcce96c4ecf..ea18fdfc69f 100644
--- a/src/mesa/main/glprocs.h
+++ b/src/mesa/main/glprocs.h
@@ -675,13 +675,6 @@ static struct name_address_offset static_functions[] = {
    { "glTbufferMask3DFX", (GLvoid *) glTbufferMask3DFX, _gloffset_TbufferMask3DFX },
    { "glSampleMaskEXT", (GLvoid *) glSampleMaskEXT, _gloffset_SampleMaskSGIS },
    { "glSamplePatternEXT", (GLvoid *) glSamplePatternEXT, _gloffset_SamplePatternSGIS },
-   { "glDeleteFencesNV", (GLvoid *) glDeleteFencesNV, _gloffset_DeleteFencesNV },
-   { "glGenFencesNV", (GLvoid *) glGenFencesNV, _gloffset_GenFencesNV },
-   { "glIsFenceNV", (GLvoid *) glIsFenceNV, _gloffset_IsFenceNV },
-   { "glTestFenceNV", (GLvoid *) glTestFenceNV, _gloffset_TestFenceNV },
-   { "glGetFenceivNV", (GLvoid *) glGetFenceivNV, _gloffset_GetFenceivNV },
-   { "glFinishFenceNV", (GLvoid *) glFinishFenceNV, _gloffset_FinishFenceNV },
-   { "glSetFenceNV", (GLvoid *) glSetFenceNV, _gloffset_SetFenceNV },
    { "glWindowPos2dARB", (GLvoid *) glWindowPos2dARB, _gloffset_WindowPos2dMESA },
    { "glWindowPos2fARB", (GLvoid *) glWindowPos2fARB, _gloffset_WindowPos2fMESA },
    { "glWindowPos2iARB", (GLvoid *) glWindowPos2iARB, _gloffset_WindowPos2iMESA },
@@ -810,49 +803,57 @@ static struct name_address_offset static_functions[] = {
    { "glWindowPos3s", (GLvoid *) glWindowPos3s, _gloffset_WindowPos3sMESA },
    { "glWindowPos3sv", (GLvoid *) glWindowPos3sv, _gloffset_WindowPos3svMESA },
    { "glActiveStencilFaceEXT", (GLvoid *) glActiveStencilFaceEXT, _gloffset_ActiveStencilFaceEXT },
-   { "glVertexAttrib1sARB", (GLvoid *) glVertexAttrib1sARB, _gloffset_VertexAttrib1sARB },
-   { "glVertexAttrib1fARB", (GLvoid *) glVertexAttrib1fARB, _gloffset_VertexAttrib1fARB },
-   { "glVertexAttrib1dARB", (GLvoid *) glVertexAttrib1dARB, _gloffset_VertexAttrib1dARB },
-   { "glVertexAttrib2sARB", (GLvoid *) glVertexAttrib2sARB, _gloffset_VertexAttrib2sARB },
-   { "glVertexAttrib2fARB", (GLvoid *) glVertexAttrib2fARB, _gloffset_VertexAttrib2fARB },
-   { "glVertexAttrib2dARB", (GLvoid *) glVertexAttrib2dARB, _gloffset_VertexAttrib2dARB },
-   { "glVertexAttrib3sARB", (GLvoid *) glVertexAttrib3sARB, _gloffset_VertexAttrib3sARB },
-   { "glVertexAttrib3fARB", (GLvoid *) glVertexAttrib3fARB, _gloffset_VertexAttrib3fARB },
-   { "glVertexAttrib3dARB", (GLvoid *) glVertexAttrib3dARB, _gloffset_VertexAttrib3dARB },
-   { "glVertexAttrib4sARB", (GLvoid *) glVertexAttrib4sARB, _gloffset_VertexAttrib4sARB },
-   { "glVertexAttrib4fARB", (GLvoid *) glVertexAttrib4fARB, _gloffset_VertexAttrib4fARB },
-   { "glVertexAttrib4dARB", (GLvoid *) glVertexAttrib4dARB, _gloffset_VertexAttrib4dARB },
-   { "glVertexAttrib4NubARB", (GLvoid *) glVertexAttrib4NubARB, _gloffset_VertexAttrib4NubARB },
-   { "glVertexAttrib1svARB", (GLvoid *) glVertexAttrib1svARB, _gloffset_VertexAttrib1svARB },
-   { "glVertexAttrib1fvARB", (GLvoid *) glVertexAttrib1fvARB, _gloffset_VertexAttrib1fvARB },
-   { "glVertexAttrib1dvARB", (GLvoid *) glVertexAttrib1dvARB, _gloffset_VertexAttrib1dvARB },
-   { "glVertexAttrib2svARB", (GLvoid *) glVertexAttrib2svARB, _gloffset_VertexAttrib2svARB },
-   { "glVertexAttrib2fvARB", (GLvoid *) glVertexAttrib2fvARB, _gloffset_VertexAttrib2fvARB },
-   { "glVertexAttrib2dvARB", (GLvoid *) glVertexAttrib2dvARB, _gloffset_VertexAttrib2dvARB },
-   { "glVertexAttrib3svARB", (GLvoid *) glVertexAttrib3svARB, _gloffset_VertexAttrib3svARB },
-   { "glVertexAttrib3fvARB", (GLvoid *) glVertexAttrib3fvARB, _gloffset_VertexAttrib3fvARB },
-   { "glVertexAttrib3dvARB", (GLvoid *) glVertexAttrib3dvARB, _gloffset_VertexAttrib3dvARB },
+   { "glDeleteFencesNV", (GLvoid *) glDeleteFencesNV, _gloffset_DeleteFencesNV },
+   { "glGenFencesNV", (GLvoid *) glGenFencesNV, _gloffset_GenFencesNV },
+   { "glIsFenceNV", (GLvoid *) glIsFenceNV, _gloffset_IsFenceNV },
+   { "glTestFenceNV", (GLvoid *) glTestFenceNV, _gloffset_TestFenceNV },
+   { "glGetFenceivNV", (GLvoid *) glGetFenceivNV, _gloffset_GetFenceivNV },
+   { "glFinishFenceNV", (GLvoid *) glFinishFenceNV, _gloffset_FinishFenceNV },
+   { "glSetFenceNV", (GLvoid *) glSetFenceNV, _gloffset_SetFenceNV },
+   { "glVertexAttrib1sARB", (GLvoid *) glVertexAttrib1sARB, _gloffset_VertexAttrib1sNV },
+   { "glVertexAttrib1fARB", (GLvoid *) glVertexAttrib1fARB, _gloffset_VertexAttrib1fNV },
+   { "glVertexAttrib1dARB", (GLvoid *) glVertexAttrib1dARB, _gloffset_VertexAttrib1dNV },
+   { "glVertexAttrib2sARB", (GLvoid *) glVertexAttrib2sARB, _gloffset_VertexAttrib2sNV },
+   { "glVertexAttrib2fARB", (GLvoid *) glVertexAttrib2fARB, _gloffset_VertexAttrib2fNV },
+   { "glVertexAttrib2dARB", (GLvoid *) glVertexAttrib2dARB, _gloffset_VertexAttrib2dNV },
+   { "glVertexAttrib3sARB", (GLvoid *) glVertexAttrib3sARB, _gloffset_VertexAttrib3sNV },
+   { "glVertexAttrib3fARB", (GLvoid *) glVertexAttrib3fARB, _gloffset_VertexAttrib3fNV },
+   { "glVertexAttrib3dARB", (GLvoid *) glVertexAttrib3dARB, _gloffset_VertexAttrib3dNV },
+   { "glVertexAttrib4sARB", (GLvoid *) glVertexAttrib4sARB, _gloffset_VertexAttrib4sNV },
+   { "glVertexAttrib4fARB", (GLvoid *) glVertexAttrib4fARB, _gloffset_VertexAttrib4fNV },
+   { "glVertexAttrib4dARB", (GLvoid *) glVertexAttrib4dARB, _gloffset_VertexAttrib4dNV },
+   { "glVertexAttrib4NubARB", (GLvoid *) glVertexAttrib4NubARB, _gloffset_VertexAttrib4ubNV },
+   { "glVertexAttrib1svARB", (GLvoid *) glVertexAttrib1svARB, _gloffset_VertexAttrib1svNV },
+   { "glVertexAttrib1fvARB", (GLvoid *) glVertexAttrib1fvARB, _gloffset_VertexAttrib1fvNV },
+   { "glVertexAttrib1dvARB", (GLvoid *) glVertexAttrib1dvARB, _gloffset_VertexAttrib1dvNV },
+   { "glVertexAttrib2svARB", (GLvoid *) glVertexAttrib2svARB, _gloffset_VertexAttrib2svNV },
+   { "glVertexAttrib2fvARB", (GLvoid *) glVertexAttrib2fvARB, _gloffset_VertexAttrib2fvNV },
+   { "glVertexAttrib2dvARB", (GLvoid *) glVertexAttrib2dvARB, _gloffset_VertexAttrib2dvNV },
+   { "glVertexAttrib3svARB", (GLvoid *) glVertexAttrib3svARB, _gloffset_VertexAttrib3svNV },
+   { "glVertexAttrib3fvARB", (GLvoid *) glVertexAttrib3fvARB, _gloffset_VertexAttrib3fvNV },
+   { "glVertexAttrib3dvARB", (GLvoid *) glVertexAttrib3dvARB, _gloffset_VertexAttrib3dvNV },
    { "glVertexAttrib4bvARB", (GLvoid *) glVertexAttrib4bvARB, _gloffset_VertexAttrib4bvARB },
-   { "glVertexAttrib4svARB", (GLvoid *) glVertexAttrib4svARB, _gloffset_VertexAttrib4svARB },
+   { "glVertexAttrib4svARB", (GLvoid *) glVertexAttrib4svARB, _gloffset_VertexAttrib4svNV },
    { "glVertexAttrib4ivARB", (GLvoid *) glVertexAttrib4ivARB, _gloffset_VertexAttrib4ivARB },
    { "glVertexAttrib4ubvARB", (GLvoid *) glVertexAttrib4ubvARB, _gloffset_VertexAttrib4ubvARB },
    { "glVertexAttrib4usvARB", (GLvoid *) glVertexAttrib4usvARB, _gloffset_VertexAttrib4usvARB },
    { "glVertexAttrib4uivARB", (GLvoid *) glVertexAttrib4uivARB, _gloffset_VertexAttrib4uivARB },
-   { "glVertexAttrib4fvARB", (GLvoid *) glVertexAttrib4fvARB, _gloffset_VertexAttrib4fvARB },
-   { "glVertexAttrib4dvARB", (GLvoid *) glVertexAttrib4dvARB, _gloffset_VertexAttrib4dvARB },
+   { "glVertexAttrib4fvARB", (GLvoid *) glVertexAttrib4fvARB, _gloffset_VertexAttrib4fvNV },
+   { "glVertexAttrib4dvARB", (GLvoid *) glVertexAttrib4dvARB, _gloffset_VertexAttrib4dvNV },
    { "glVertexAttrib4NbvARB", (GLvoid *) glVertexAttrib4NbvARB, _gloffset_VertexAttrib4NbvARB },
    { "glVertexAttrib4NsvARB", (GLvoid *) glVertexAttrib4NsvARB, _gloffset_VertexAttrib4NsvARB },
    { "glVertexAttrib4NivARB", (GLvoid *) glVertexAttrib4NivARB, _gloffset_VertexAttrib4NivARB },
-   { "glVertexAttrib4NubvARB", (GLvoid *) glVertexAttrib4NubvARB, _gloffset_VertexAttrib4NubvARB },
+   { "glVertexAttrib4NubvARB", (GLvoid *) glVertexAttrib4NubvARB, _gloffset_VertexAttrib4ubvNV },
    { "glVertexAttrib4NusvARB", (GLvoid *) glVertexAttrib4NusvARB, _gloffset_VertexAttrib4NusvARB },
    { "glVertexAttrib4NuivARB", (GLvoid *) glVertexAttrib4NuivARB, _gloffset_VertexAttrib4NuivARB },
    { "glVertexAttribPointerARB", (GLvoid *) glVertexAttribPointerARB, _gloffset_VertexAttribPointerARB },
    { "glEnableVertexAttribArrayARB", (GLvoid *) glEnableVertexAttribArrayARB, _gloffset_EnableVertexAttribArrayARB },
    { "glDisableVertexAttribArrayARB", (GLvoid *) glDisableVertexAttribArrayARB, _gloffset_DisableVertexAttribArrayARB },
    { "glProgramStringARB", (GLvoid *) glProgramStringARB, _gloffset_ProgramStringARB },
-   { "glBindProgramARB", (GLvoid *) glBindProgramARB, _gloffset_BindProgramARB },
-   { "glDeleteProgramsARB", (GLvoid *) glDeleteProgramsARB, _gloffset_DeleteProgramsARB },
-   { "glGenProgramsARB", (GLvoid *) glGenProgramsARB, _gloffset_GenProgramsARB },
+   { "glBindProgramARB", (GLvoid *) glBindProgramARB, _gloffset_BindProgramNV },
+   { "glDeleteProgramsARB", (GLvoid *) glDeleteProgramsARB, _gloffset_DeleteProgramsNV },
+   { "glGenProgramsARB", (GLvoid *) glGenProgramsARB, _gloffset_GenProgramsNV },
+   { "glIsProgramARB", (GLvoid *) glIsProgramARB, _gloffset_IsProgramNV },
    { "glProgramEnvParameter4dARB", (GLvoid *) glProgramEnvParameter4dARB, _gloffset_ProgramEnvParameter4dARB },
    { "glProgramEnvParameter4dvARB", (GLvoid *) glProgramEnvParameter4dvARB, _gloffset_ProgramEnvParameter4dvARB },
    { "glProgramEnvParameter4fARB", (GLvoid *) glProgramEnvParameter4fARB, _gloffset_ProgramEnvParameter4fARB },
@@ -867,11 +868,10 @@ static struct name_address_offset static_functions[] = {
    { "glGetProgramLocalParameterfvARB", (GLvoid *) glGetProgramLocalParameterfvARB, _gloffset_GetProgramLocalParameterfvARB },
    { "glGetProgramivARB", (GLvoid *) glGetProgramivARB, _gloffset_GetProgramivARB },
    { "glGetProgramStringARB", (GLvoid *) glGetProgramStringARB, _gloffset_GetProgramStringARB },
-   { "glGetVertexAttribdvARB", (GLvoid *) glGetVertexAttribdvARB, _gloffset_GetVertexAttribdvARB },
-   { "glGetVertexAttribfvARB", (GLvoid *) glGetVertexAttribfvARB, _gloffset_GetVertexAttribfvARB },
-   { "glGetVertexAttribivARB", (GLvoid *) glGetVertexAttribivARB, _gloffset_GetVertexAttribivARB },
-   { "glGetVertexAttribPointervARB", (GLvoid *) glGetVertexAttribPointervARB, _gloffset_GetVertexAttribPointervARB },
-   { "glIsProgramARB", (GLvoid *) glIsProgramARB, _gloffset_IsProgramARB },
+   { "glGetVertexAttribdvARB", (GLvoid *) glGetVertexAttribdvARB, _gloffset_GetVertexAttribdvNV },
+   { "glGetVertexAttribfvARB", (GLvoid *) glGetVertexAttribfvARB, _gloffset_GetVertexAttribfvNV },
+   { "glGetVertexAttribivARB", (GLvoid *) glGetVertexAttribivARB, _gloffset_GetVertexAttribivNV },
+   { "glGetVertexAttribPointervARB", (GLvoid *) glGetVertexAttribPointervARB, _gloffset_GetVertexAttribPointervNV },
    { "glProgramNamedParameter4fNV", (GLvoid *) glProgramNamedParameter4fNV, _gloffset_ProgramNamedParameter4fNV },
    { "glProgramNamedParameter4dNV", (GLvoid *) glProgramNamedParameter4dNV, _gloffset_ProgramNamedParameter4dNV },
    { "glProgramNamedParameter4fvNV", (GLvoid *) glProgramNamedParameter4fvNV, _gloffset_ProgramNamedParameter4fvNV },
@@ -879,15 +879,16 @@ static struct name_address_offset static_functions[] = {
    { "glGetProgramNamedParameterfvNV", (GLvoid *) glGetProgramNamedParameterfvNV, _gloffset_GetProgramNamedParameterfvNV },
    { "glGetProgramNamedParameterdvNV", (GLvoid *) glGetProgramNamedParameterdvNV, _gloffset_GetProgramNamedParameterdvNV },
    { "glBindBufferARB", (GLvoid *) glBindBufferARB, _gloffset_BindBufferARB },
-   { "glDeleteBuffersARB", (GLvoid *) glDeleteBuffersARB, _gloffset_DeleteBuffersARB },
-   { "glGenBuffersARB", (GLvoid *) glGenBuffersARB, _gloffset_GenBuffersARB },
-   { "glIsBufferARB", (GLvoid *) glIsBufferARB, _gloffset_IsBufferARB },
    { "glBufferDataARB", (GLvoid *) glBufferDataARB, _gloffset_BufferDataARB },
    { "glBufferSubDataARB", (GLvoid *) glBufferSubDataARB, _gloffset_BufferSubDataARB },
+   { "glDeleteBuffersARB", (GLvoid *) glDeleteBuffersARB, _gloffset_DeleteBuffersARB },
+   { "glGenBuffersARB", (GLvoid *) glGenBuffersARB, _gloffset_GenBuffersARB },
+   { "glGetBufferParameterivARB", (GLvoid *) glGetBufferParameterivARB, _gloffset_GetBufferParameterivARB },
+   { "glGetBufferPointervARB", (GLvoid *) glGetBufferPointervARB, _gloffset_GetBufferPointervARB },
    { "glGetBufferSubDataARB", (GLvoid *) glGetBufferSubDataARB, _gloffset_GetBufferSubDataARB },
+   { "glIsBufferARB", (GLvoid *) glIsBufferARB, _gloffset_IsBufferARB },
    { "glMapBufferARB", (GLvoid *) glMapBufferARB, _gloffset_MapBufferARB },
    { "glUnmapBufferARB", (GLvoid *) glUnmapBufferARB, _gloffset_UnmapBufferARB },
-   { "glGetBufferParameterivARB", (GLvoid *) glGetBufferParameterivARB, _gloffset_GetBufferParameterivARB },
-   { "glGetBufferPointervARB", (GLvoid *) glGetBufferPointervARB, _gloffset_GetBufferPointervARB },
+   { "glDepthBoundsEXT", (GLvoid *) glDepthBoundsEXT, _gloffset_DepthBoundsEXT },
    { NULL, NULL }  /* end of list marker */
 };
diff --git a/src/mesa/main/nvprogram.c b/src/mesa/main/nvprogram.c
index 00ea579b2e8..511bf2e006e 100644
--- a/src/mesa/main/nvprogram.c
+++ b/src/mesa/main/nvprogram.c
@@ -274,7 +274,7 @@ _mesa_BindProgramNV(GLenum target, GLuint id)
 /**
  * Delete a list of programs.
  * \note Not compiled into display lists.
- * \note Called from the GL API dispatcher.
+ * \note Called by both glDeleteProgramsNV and glDeleteProgramsARB.
  */
 void
 _mesa_DeleteProgramsNV(GLsizei n, const GLuint *ids)
@@ -356,7 +356,7 @@ _mesa_ExecuteProgramNV(GLenum target, GLuint id, const GLfloat *params)
 /**
  * Generate a list of new program identifiers.
  * \note Not compiled into display lists.
- * \note Called from the GL API dispatcher.
+ * \note Called by both glGenProgramsNV and glGenProgramsARB.
  */
 void
 _mesa_GenProgramsNV(GLsizei n, GLuint *ids)
@@ -803,7 +803,7 @@ _mesa_GetVertexAttribPointervNV(GLuint index, GLenum pname, GLvoid **pointer)
 /**
  * Determine if id names a program.
  * \note Not compiled into display lists.
- * \note Called from the GL API dispatcher.
+ * \note Called from both glIsProgramNV and glIsProgramARB.
  * \param id is the program identifier
  * \return GL_TRUE if id is a program, else GL_FALSE.
  */
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 15b19d7a7bf..96086624c9e 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -1,4 +1,4 @@
-/* $Id: state.c,v 1.104 2003/04/17 02:33:09 brianp Exp $ */
+/* $Id: state.c,v 1.105 2003/04/21 14:55:17 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -536,6 +536,11 @@ _mesa_init_exec_table(struct _glapi_table *exec, GLuint tableSize)
    /* 268. GL_EXT_stencil_two_side */
    exec->ActiveStencilFaceEXT = _mesa_ActiveStencilFaceEXT;
 
+#if 0
+   /* ???. GL_EXT_depth_bounds_test */
+   exec->DepthBoundsEXT = _mesa_DepthBoundsEXT;
+#endif
+
    /* ARB 1. GL_ARB_multitexture */
    exec->ActiveTextureARB = _mesa_ActiveTextureARB;
    exec->ClientActiveTextureARB = _mesa_ClientActiveTextureARB;
@@ -564,49 +569,54 @@ _mesa_init_exec_table(struct _glapi_table *exec, GLuint tableSize)
    /* ARB 26. GL_ARB_vertex_program */
    /* ARB 27. GL_ARB_fragment_program */
 #if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
-   exec->VertexAttrib1sARB = _mesa_VertexAttrib1sARB;
-   exec->VertexAttrib1fARB = _mesa_VertexAttrib1fARB;
-   exec->VertexAttrib1dARB = _mesa_VertexAttrib1dARB;
-   exec->VertexAttrib2sARB = _mesa_VertexAttrib2sARB;
-   exec->VertexAttrib2fARB = _mesa_VertexAttrib2fARB;
-   exec->VertexAttrib2dARB = _mesa_VertexAttrib2dARB;
-   exec->VertexAttrib3sARB = _mesa_VertexAttrib3sARB;
-   exec->VertexAttrib3fARB = _mesa_VertexAttrib3fARB;
-   exec->VertexAttrib3dARB = _mesa_VertexAttrib3dARB;
-   exec->VertexAttrib4sARB = _mesa_VertexAttrib4sARB;
-   exec->VertexAttrib4fARB = _mesa_VertexAttrib4fARB;
-   exec->VertexAttrib4dARB = _mesa_VertexAttrib4dARB;
-   exec->VertexAttrib4NubARB = _mesa_VertexAttrib4NubARB;
-   exec->VertexAttrib1svARB = _mesa_VertexAttrib1svARB;
-   exec->VertexAttrib1fvARB = _mesa_VertexAttrib1fvARB;
-   exec->VertexAttrib1dvARB = _mesa_VertexAttrib1dvARB;
-   exec->VertexAttrib2svARB = _mesa_VertexAttrib2svARB;
-   exec->VertexAttrib2fvARB = _mesa_VertexAttrib2fvARB;
-   exec->VertexAttrib2dvARB = _mesa_VertexAttrib2dvARB;
-   exec->VertexAttrib3svARB = _mesa_VertexAttrib3svARB;
-   exec->VertexAttrib3fvARB = _mesa_VertexAttrib3fvARB;
-   exec->VertexAttrib3dvARB = _mesa_VertexAttrib3dvARB;
+   /* glVertexAttrib1sARB aliases glVertexAttrib1sNV */
+   /* glVertexAttrib1fARB aliases glVertexAttrib1fNV */
+   /* glVertexAttrib1dARB aliases glVertexAttrib1dNV */
+   /* glVertexAttrib2sARB aliases glVertexAttrib2sNV */
+   /* glVertexAttrib2fARB aliases glVertexAttrib2fNV */
+   /* glVertexAttrib2dARB aliases glVertexAttrib2dNV */
+   /* glVertexAttrib3sARB aliases glVertexAttrib3sNV */
+   /* glVertexAttrib3fARB aliases glVertexAttrib3fNV */
+   /* glVertexAttrib3dARB aliases glVertexAttrib3dNV */
+   /* glVertexAttrib4sARB aliases glVertexAttrib4sNV */
+   /* glVertexAttrib4fARB aliases glVertexAttrib4fNV */
+   /* glVertexAttrib4dARB aliases glVertexAttrib4dNV */
+   /* glVertexAttrib4NubARB aliases glVertexAttrib4NubNV */
+   /* glVertexAttrib1svARB aliases glVertexAttrib1svNV */
+   /* glVertexAttrib1fvARB aliases glVertexAttrib1fvNV */
+   /* glVertexAttrib1dvARB aliases glVertexAttrib1dvNV */
+   /* glVertexAttrib2svARB aliases glVertexAttrib2svNV */
+   /* glVertexAttrib2fvARB aliases glVertexAttrib2fvNV */
+   /* glVertexAttrib2dvARB aliases glVertexAttrib2dvNV */
+   /* glVertexAttrib3svARB aliases glVertexAttrib3svNV */
+   /* glVertexAttrib3fvARB aliases glVertexAttrib3fvNV */
+   /* glVertexAttrib3dvARB aliases glVertexAttrib3dvNV */
+   /* glVertexAttrib4svARB aliases glVertexAttrib4svNV */
+   /* glVertexAttrib4fvARB aliases glVertexAttrib4fvNV */
+   /* glVertexAttrib4dvARB aliases glVertexAttrib4dvNV */
+   /* glVertexAttrib4NubvARB aliases glVertexAttrib4NubvNV */
    exec->VertexAttrib4bvARB = _mesa_VertexAttrib4bvARB;
-   exec->VertexAttrib4svARB = _mesa_VertexAttrib4svARB;
    exec->VertexAttrib4ivARB = _mesa_VertexAttrib4ivARB;
    exec->VertexAttrib4ubvARB = _mesa_VertexAttrib4ubvARB;
    exec->VertexAttrib4usvARB = _mesa_VertexAttrib4usvARB;
    exec->VertexAttrib4uivARB = _mesa_VertexAttrib4uivARB;
-   exec->VertexAttrib4fvARB = _mesa_VertexAttrib4fvARB;
-   exec->VertexAttrib4dvARB = _mesa_VertexAttrib4dvARB;
    exec->VertexAttrib4NbvARB = _mesa_VertexAttrib4NbvARB;
    exec->VertexAttrib4NsvARB = _mesa_VertexAttrib4NsvARB;
    exec->VertexAttrib4NivARB = _mesa_VertexAttrib4NivARB;
-   exec->VertexAttrib4NubvARB = _mesa_VertexAttrib4NubvARB;
    exec->VertexAttrib4NusvARB = _mesa_VertexAttrib4NusvARB;
    exec->VertexAttrib4NuivARB = _mesa_VertexAttrib4NuivARB;
    exec->VertexAttribPointerARB = _mesa_VertexAttribPointerARB;
    exec->EnableVertexAttribArrayARB = _mesa_EnableVertexAttribArrayARB;
    exec->DisableVertexAttribArrayARB = _mesa_DisableVertexAttribArrayARB;
    exec->ProgramStringARB = _mesa_ProgramStringARB;
-   exec->BindProgramARB = _mesa_BindProgramARB;
-   exec->DeleteProgramsARB = _mesa_DeleteProgramsARB;
-   exec->GenProgramsARB = _mesa_GenProgramsARB;
+   /* glBindProgramARB aliases glBindProgramNV */
+   /* glDeleteProgramsARB aliases glDeleteProgramsNV */
+   /* glGenProgramsARB aliases glGenProgramsNV */
+   /* glIsProgramARB aliases glIsProgramNV */
+   /* glGetVertexAttribdvARB aliases glGetVertexAttribdvNV */
+   /* glGetVertexAttribfvARB aliases glGetVertexAttribfvNV */
+   /* glGetVertexAttribivARB aliases glGetVertexAttribivNV */
+   /* glGetVertexAttribPointervARB aliases glGetVertexAttribPointervNV */
    exec->ProgramEnvParameter4dARB = _mesa_ProgramEnvParameter4dARB;
    exec->ProgramEnvParameter4dvARB = _mesa_ProgramEnvParameter4dvARB;
    exec->ProgramEnvParameter4fARB = _mesa_ProgramEnvParameter4fARB;
@@ -621,26 +631,21 @@ _mesa_init_exec_table(struct _glapi_table *exec, GLuint tableSize)
    exec->GetProgramLocalParameterfvARB = _mesa_GetProgramLocalParameterfvARB;
    exec->GetProgramivARB = _mesa_GetProgramivARB;
    exec->GetProgramStringARB = _mesa_GetProgramStringARB;
-   exec->GetVertexAttribdvARB = _mesa_GetVertexAttribdvARB;
-   exec->GetVertexAttribfvARB = _mesa_GetVertexAttribfvARB;
-   exec->GetVertexAttribivARB = _mesa_GetVertexAttribivARB;
-   exec->GetVertexAttribPointervARB = _mesa_GetVertexAttribPointervARB;
-   exec->IsProgramARB = _mesa_IsProgramARB;
 #endif
 
    /* ARB 28. GL_ARB_vertex_buffer_object */
 #if FEATURE_ARB_vertex_buffer_object
    exec->BindBufferARB = _mesa_BindBufferARB;
-   exec->DeleteBuffersARB = _mesa_DeleteBuffersARB;
-   exec->GenBuffersARB = _mesa_GenBuffersARB;
-   exec->IsBufferARB = _mesa_IsBufferARB;
    exec->BufferDataARB = _mesa_BufferDataARB;
    exec->BufferSubDataARB = _mesa_BufferSubDataARB;
+   exec->DeleteBuffersARB = _mesa_DeleteBuffersARB;
+   exec->GenBuffersARB = _mesa_GenBuffersARB;
+   exec->GetBufferParameterivARB = _mesa_GetBufferParameterivARB;
+   exec->GetBufferPointervARB = _mesa_GetBufferPointervARB;
    exec->GetBufferSubDataARB = _mesa_GetBufferSubDataARB;
+   exec->IsBufferARB = _mesa_IsBufferARB;
    exec->MapBufferARB = _mesa_MapBufferARB;
    exec->UnmapBufferARB = _mesa_UnmapBufferARB;
-   exec->GetBufferParameterivARB = _mesa_GetBufferParameterivARB;
-   exec->GetBufferPointervARB = _mesa_GetBufferPointervARB;
 #endif
 }
 
diff --git a/src/mesa/sparc/glapi_sparc.S b/src/mesa/sparc/glapi_sparc.S
index c1e53ab5894..6c12304077c 100644
--- a/src/mesa/sparc/glapi_sparc.S
+++ b/src/mesa/sparc/glapi_sparc.S
@@ -14112,153 +14112,6 @@ glSamplePatternEXT:
 	jmpl	%g3, %g0
 	nop
 
-.globl glDeleteFencesNV
-.type glDeleteFencesNV,#function
-glDeleteFencesNV:
-#ifdef __sparc_v9__
-	sethi	%hi(0x00000000), %g2
-	sethi	%hi(0x00000000), %g1
-	or	%g2, %lo(0x00000000), %g2
-	or	%g1, %lo(0x00000000), %g1
-	sllx	%g2, 32, %g2
-	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_DeleteFencesNV), %g2
-	or	%g2, %lo(8 * _gloffset_DeleteFencesNV), %g2
-	ldx	[%g1 + %g2], %g3
-#else
-	sethi	%hi(0x00000000), %g1
-	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_DeleteFencesNV)], %g3
-#endif
-	jmpl	%g3, %g0
-	nop
-
-.globl glGenFencesNV
-.type glGenFencesNV,#function
-glGenFencesNV:
-#ifdef __sparc_v9__
-	sethi	%hi(0x00000000), %g2
-	sethi	%hi(0x00000000), %g1
-	or	%g2, %lo(0x00000000), %g2
-	or	%g1, %lo(0x00000000), %g1
-	sllx	%g2, 32, %g2
-	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_GenFencesNV), %g2
-	or	%g2, %lo(8 * _gloffset_GenFencesNV), %g2
-	ldx	[%g1 + %g2], %g3
-#else
-	sethi	%hi(0x00000000), %g1
-	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_GenFencesNV)], %g3
-#endif
-	jmpl	%g3, %g0
-	nop
-
-.globl glIsFenceNV
-.type glIsFenceNV,#function
-glIsFenceNV:
-#ifdef __sparc_v9__
-	sethi	%hi(0x00000000), %g2
-	sethi	%hi(0x00000000), %g1
-	or	%g2, %lo(0x00000000), %g2
-	or	%g1, %lo(0x00000000), %g1
-	sllx	%g2, 32, %g2
-	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_IsFenceNV), %g2
-	or	%g2, %lo(8 * _gloffset_IsFenceNV), %g2
-	ldx	[%g1 + %g2], %g3
-#else
-	sethi	%hi(0x00000000), %g1
-	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_IsFenceNV)], %g3
-#endif
-	jmpl	%g3, %g0
-	nop
-
-.globl glTestFenceNV
-.type glTestFenceNV,#function
-glTestFenceNV:
-#ifdef __sparc_v9__
-	sethi	%hi(0x00000000), %g2
-	sethi	%hi(0x00000000), %g1
-	or	%g2, %lo(0x00000000), %g2
-	or	%g1, %lo(0x00000000), %g1
-	sllx	%g2, 32, %g2
-	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_TestFenceNV), %g2
-	or	%g2, %lo(8 * _gloffset_TestFenceNV), %g2
-	ldx	[%g1 + %g2], %g3
-#else
-	sethi	%hi(0x00000000), %g1
-	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_TestFenceNV)], %g3
-#endif
-	jmpl	%g3, %g0
-	nop
-
-.globl glGetFenceivNV
-.type glGetFenceivNV,#function
-glGetFenceivNV:
-#ifdef __sparc_v9__
-	sethi	%hi(0x00000000), %g2
-	sethi	%hi(0x00000000), %g1
-	or	%g2, %lo(0x00000000), %g2
-	or	%g1, %lo(0x00000000), %g1
-	sllx	%g2, 32, %g2
-	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_GetFenceivNV), %g2
-	or	%g2, %lo(8 * _gloffset_GetFenceivNV), %g2
-	ldx	[%g1 + %g2], %g3
-#else
-	sethi	%hi(0x00000000), %g1
-	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_GetFenceivNV)], %g3
-#endif
-	jmpl	%g3, %g0
-	nop
-
-.globl glFinishFenceNV
-.type glFinishFenceNV,#function
-glFinishFenceNV:
-#ifdef __sparc_v9__
-	sethi	%hi(0x00000000), %g2
-	sethi	%hi(0x00000000), %g1
-	or	%g2, %lo(0x00000000), %g2
-	or	%g1, %lo(0x00000000), %g1
-	sllx	%g2, 32, %g2
-	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_FinishFenceNV), %g2
-	or	%g2, %lo(8 * _gloffset_FinishFenceNV), %g2
-	ldx	[%g1 + %g2], %g3
-#else
-	sethi	%hi(0x00000000), %g1
-	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_FinishFenceNV)], %g3
-#endif
-	jmpl	%g3, %g0
-	nop
-
-.globl glSetFenceNV
-.type glSetFenceNV,#function
-glSetFenceNV:
-#ifdef __sparc_v9__
-	sethi	%hi(0x00000000), %g2
-	sethi	%hi(0x00000000), %g1
-	or	%g2, %lo(0x00000000), %g2
-	or	%g1, %lo(0x00000000), %g1
-	sllx	%g2, 32, %g2
-	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_SetFenceNV), %g2
-	or	%g2, %lo(8 * _gloffset_SetFenceNV), %g2
-	ldx	[%g1 + %g2], %g3
-#else
-	sethi	%hi(0x00000000), %g1
-	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_SetFenceNV)], %g3
-#endif
-	jmpl	%g3, %g0
-	nop
-
 .globl glWindowPos2dARB
 .type glWindowPos2dARB,#function
 glWindowPos2dARB:
@@ -16947,6 +16800,153 @@ glActiveStencilFaceEXT:
 	jmpl	%g3, %g0
 	nop
 
+.globl glDeleteFencesNV
+.type glDeleteFencesNV,#function
+glDeleteFencesNV:
+#ifdef __sparc_v9__
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_DeleteFencesNV), %g2
+	or	%g2, %lo(8 * _gloffset_DeleteFencesNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_DeleteFencesNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGenFencesNV
+.type glGenFencesNV,#function
+glGenFencesNV:
+#ifdef __sparc_v9__
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GenFencesNV), %g2
+	or	%g2, %lo(8 * _gloffset_GenFencesNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GenFencesNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glIsFenceNV
+.type glIsFenceNV,#function
+glIsFenceNV:
+#ifdef __sparc_v9__
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_IsFenceNV), %g2
+	or	%g2, %lo(8 * _gloffset_IsFenceNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_IsFenceNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glTestFenceNV
+.type glTestFenceNV,#function
+glTestFenceNV:
+#ifdef __sparc_v9__
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_TestFenceNV), %g2
+	or	%g2, %lo(8 * _gloffset_TestFenceNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_TestFenceNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glGetFenceivNV
+.type glGetFenceivNV,#function
+glGetFenceivNV:
+#ifdef __sparc_v9__
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_GetFenceivNV), %g2
+	or	%g2, %lo(8 * _gloffset_GetFenceivNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GetFenceivNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glFinishFenceNV
+.type glFinishFenceNV,#function
+glFinishFenceNV:
+#ifdef __sparc_v9__
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_FinishFenceNV), %g2
+	or	%g2, %lo(8 * _gloffset_FinishFenceNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_FinishFenceNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glSetFenceNV
+.type glSetFenceNV,#function
+glSetFenceNV:
+#ifdef __sparc_v9__
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_SetFenceNV), %g2
+	or	%g2, %lo(8 * _gloffset_SetFenceNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_SetFenceNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
 .globl glVertexAttrib1sARB
 .type glVertexAttrib1sARB,#function
 glVertexAttrib1sARB:
@@ -16957,13 +16957,13 @@ glVertexAttrib1sARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib1sARB), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib1sARB), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib1sNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib1sNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib1sARB)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib1sNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -16978,13 +16978,13 @@ glVertexAttrib1fARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib1fARB), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib1fARB), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib1fNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib1fNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib1fARB)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib1fNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -16999,13 +16999,13 @@ glVertexAttrib1dARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib1dARB), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib1dARB), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib1dNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib1dNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib1dARB)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib1dNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -17020,13 +17020,13 @@ glVertexAttrib2sARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib2sARB), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib2sARB), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib2sNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib2sNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib2sARB)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib2sNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -17041,13 +17041,13 @@ glVertexAttrib2fARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib2fARB), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib2fARB), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib2fNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib2fNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib2fARB)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib2fNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -17062,13 +17062,13 @@ glVertexAttrib2dARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib2dARB), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib2dARB), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib2dNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib2dNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib2dARB)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib2dNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -17083,13 +17083,13 @@ glVertexAttrib3sARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib3sARB), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib3sARB), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib3sNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib3sNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib3sARB)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib3sNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -17104,13 +17104,13 @@ glVertexAttrib3fARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib3fARB), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib3fARB), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib3fNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib3fNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib3fARB)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib3fNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -17125,13 +17125,13 @@ glVertexAttrib3dARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib3dARB), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib3dARB), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib3dNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib3dNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib3dARB)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib3dNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -17146,13 +17146,13 @@ glVertexAttrib4sARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib4sARB), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib4sARB), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib4sNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4sNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib4sARB)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4sNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -17167,13 +17167,13 @@ glVertexAttrib4fARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib4fARB), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib4fARB), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib4fNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4fNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib4fARB)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4fNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -17188,13 +17188,13 @@ glVertexAttrib4dARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib4dARB), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib4dARB), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib4dNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4dNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib4dARB)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4dNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -17209,13 +17209,13 @@ glVertexAttrib4NubARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib4NubARB), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib4NubARB), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib4ubNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4ubNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib4NubARB)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4ubNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -17230,13 +17230,13 @@ glVertexAttrib1svARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib1svARB), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib1svARB), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib1svNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib1svNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib1svARB)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib1svNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -17251,13 +17251,13 @@ glVertexAttrib1fvARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib1fvARB), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib1fvARB), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib1fvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib1fvNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib1fvARB)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib1fvNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -17272,13 +17272,13 @@ glVertexAttrib1dvARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib1dvARB), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib1dvARB), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib1dvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib1dvNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib1dvARB)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib1dvNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -17293,13 +17293,13 @@ glVertexAttrib2svARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib2svARB), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib2svARB), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib2svNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib2svNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib2svARB)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib2svNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -17314,13 +17314,13 @@ glVertexAttrib2fvARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib2fvARB), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib2fvARB), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib2fvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib2fvNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib2fvARB)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib2fvNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -17335,13 +17335,13 @@ glVertexAttrib2dvARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib2dvARB), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib2dvARB), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib2dvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib2dvNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib2dvARB)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib2dvNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -17356,13 +17356,13 @@ glVertexAttrib3svARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib3svARB), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib3svARB), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib3svNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib3svNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib3svARB)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib3svNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -17377,13 +17377,13 @@ glVertexAttrib3fvARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib3fvARB), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib3fvARB), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib3fvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib3fvNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib3fvARB)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib3fvNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -17398,13 +17398,13 @@ glVertexAttrib3dvARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib3dvARB), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib3dvARB), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib3dvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib3dvNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib3dvARB)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib3dvNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -17440,13 +17440,13 @@ glVertexAttrib4svARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib4svARB), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib4svARB), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib4svNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4svNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib4svARB)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4svNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -17545,13 +17545,13 @@ glVertexAttrib4fvARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib4fvARB), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib4fvARB), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib4fvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4fvNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib4fvARB)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4fvNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -17566,13 +17566,13 @@ glVertexAttrib4dvARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib4dvARB), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib4dvARB), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib4dvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4dvNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib4dvARB)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4dvNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -17650,13 +17650,13 @@ glVertexAttrib4NubvARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_VertexAttrib4NubvARB), %g2
-	or	%g2, %lo(8 * _gloffset_VertexAttrib4NubvARB), %g2
+	sethi	%hi(8 * _gloffset_VertexAttrib4ubvNV), %g2
+	or	%g2, %lo(8 * _gloffset_VertexAttrib4ubvNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_VertexAttrib4NubvARB)], %g3
+	ld	[%g1 + (4 * _gloffset_VertexAttrib4ubvNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -17797,13 +17797,13 @@ glBindProgramARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_BindProgramARB), %g2
-	or	%g2, %lo(8 * _gloffset_BindProgramARB), %g2
+	sethi	%hi(8 * _gloffset_BindProgramNV), %g2
+	or	%g2, %lo(8 * _gloffset_BindProgramNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_BindProgramARB)], %g3
+	ld	[%g1 + (4 * _gloffset_BindProgramNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -17818,13 +17818,13 @@ glDeleteProgramsARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_DeleteProgramsARB), %g2
-	or	%g2, %lo(8 * _gloffset_DeleteProgramsARB), %g2
+	sethi	%hi(8 * _gloffset_DeleteProgramsNV), %g2
+	or	%g2, %lo(8 * _gloffset_DeleteProgramsNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_DeleteProgramsARB)], %g3
+	ld	[%g1 + (4 * _gloffset_DeleteProgramsNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -17839,13 +17839,34 @@ glGenProgramsARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_GenProgramsARB), %g2
-	or	%g2, %lo(8 * _gloffset_GenProgramsARB), %g2
+	sethi	%hi(8 * _gloffset_GenProgramsNV), %g2
+	or	%g2, %lo(8 * _gloffset_GenProgramsNV), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_GenProgramsNV)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glIsProgramARB
+.type glIsProgramARB,#function
+glIsProgramARB:
+#ifdef __sparc_v9__
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_IsProgramNV), %g2
+	or	%g2, %lo(8 * _gloffset_IsProgramNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_GenProgramsARB)], %g3
+	ld	[%g1 + (4 * _gloffset_IsProgramNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -18154,13 +18175,13 @@ glGetVertexAttribdvARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_GetVertexAttribdvARB), %g2
-	or	%g2, %lo(8 * _gloffset_GetVertexAttribdvARB), %g2
+	sethi	%hi(8 * _gloffset_GetVertexAttribdvNV), %g2
+	or	%g2, %lo(8 * _gloffset_GetVertexAttribdvNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_GetVertexAttribdvARB)], %g3
+	ld	[%g1 + (4 * _gloffset_GetVertexAttribdvNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -18175,13 +18196,13 @@ glGetVertexAttribfvARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_GetVertexAttribfvARB), %g2
-	or	%g2, %lo(8 * _gloffset_GetVertexAttribfvARB), %g2
+	sethi	%hi(8 * _gloffset_GetVertexAttribfvNV), %g2
+	or	%g2, %lo(8 * _gloffset_GetVertexAttribfvNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_GetVertexAttribfvARB)], %g3
+	ld	[%g1 + (4 * _gloffset_GetVertexAttribfvNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -18196,13 +18217,13 @@ glGetVertexAttribivARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_GetVertexAttribivARB), %g2
-	or	%g2, %lo(8 * _gloffset_GetVertexAttribivARB), %g2
+	sethi	%hi(8 * _gloffset_GetVertexAttribivNV), %g2
+	or	%g2, %lo(8 * _gloffset_GetVertexAttribivNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_GetVertexAttribivARB)], %g3
+	ld	[%g1 + (4 * _gloffset_GetVertexAttribivNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -18217,34 +18238,13 @@ glGetVertexAttribPointervARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_GetVertexAttribPointervARB), %g2
-	or	%g2, %lo(8 * _gloffset_GetVertexAttribPointervARB), %g2
-	ldx	[%g1 + %g2], %g3
-#else
-	sethi	%hi(0x00000000), %g1
-	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_GetVertexAttribPointervARB)], %g3
-#endif
-	jmpl	%g3, %g0
-	nop
-
-.globl glIsProgramARB
-.type glIsProgramARB,#function
-glIsProgramARB:
-#ifdef __sparc_v9__
-	sethi	%hi(0x00000000), %g2
-	sethi	%hi(0x00000000), %g1
-	or	%g2, %lo(0x00000000), %g2
-	or	%g1, %lo(0x00000000), %g1
-	sllx	%g2, 32, %g2
-	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_IsProgramARB), %g2
-	or	%g2, %lo(8 * _gloffset_IsProgramARB), %g2
+	sethi	%hi(8 * _gloffset_GetVertexAttribPointervNV), %g2
+	or	%g2, %lo(8 * _gloffset_GetVertexAttribPointervNV), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_IsProgramARB)], %g3
+	ld	[%g1 + (4 * _gloffset_GetVertexAttribPointervNV)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -18396,6 +18396,48 @@ glBindBufferARB:
 	jmpl	%g3, %g0
 	nop
 
+.globl glBufferDataARB
+.type glBufferDataARB,#function
+glBufferDataARB:
+#ifdef __sparc_v9__
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_BufferDataARB), %g2
+	or	%g2, %lo(8 * _gloffset_BufferDataARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_BufferDataARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
+.globl glBufferSubDataARB
+.type glBufferSubDataARB,#function
+glBufferSubDataARB:
+#ifdef __sparc_v9__
+	sethi	%hi(0x00000000), %g2
+	sethi	%hi(0x00000000), %g1
+	or	%g2, %lo(0x00000000), %g2
+	or	%g1, %lo(0x00000000), %g1
+	sllx	%g2, 32, %g2
+	ldx	[%g1 + %g2], %g1
+	sethi	%hi(8 * _gloffset_BufferSubDataARB), %g2
+	or	%g2, %lo(8 * _gloffset_BufferSubDataARB), %g2
+	ldx	[%g1 + %g2], %g3
+#else
+	sethi	%hi(0x00000000), %g1
+	ld	[%g1 + %lo(0x00000000)], %g1
+	ld	[%g1 + (4 * _gloffset_BufferSubDataARB)], %g3
+#endif
+	jmpl	%g3, %g0
+	nop
+
 .globl glDeleteBuffersARB
 .type glDeleteBuffersARB,#function
 glDeleteBuffersARB:
@@ -18438,9 +18480,9 @@ glGenBuffersARB:
 	jmpl	%g3, %g0
 	nop
 
-.globl glIsBufferARB
-.type glIsBufferARB,#function
-glIsBufferARB:
+.globl glGetBufferParameterivARB
+.type glGetBufferParameterivARB,#function
+glGetBufferParameterivARB:
 #ifdef __sparc_v9__
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
@@ -18448,20 +18490,20 @@ glIsBufferARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_IsBufferARB), %g2
-	or	%g2, %lo(8 * _gloffset_IsBufferARB), %g2
+	sethi	%hi(8 * _gloffset_GetBufferParameterivARB), %g2
+	or	%g2, %lo(8 * _gloffset_GetBufferParameterivARB), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_IsBufferARB)], %g3
+	ld	[%g1 + (4 * _gloffset_GetBufferParameterivARB)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
 
-.globl glBufferDataARB
-.type glBufferDataARB,#function
-glBufferDataARB:
+.globl glGetBufferPointervARB
+.type glGetBufferPointervARB,#function
+glGetBufferPointervARB:
 #ifdef __sparc_v9__
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
@@ -18469,20 +18511,20 @@ glBufferDataARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_BufferDataARB), %g2
-	or	%g2, %lo(8 * _gloffset_BufferDataARB), %g2
+	sethi	%hi(8 * _gloffset_GetBufferPointervARB), %g2
+	or	%g2, %lo(8 * _gloffset_GetBufferPointervARB), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_BufferDataARB)], %g3
+	ld	[%g1 + (4 * _gloffset_GetBufferPointervARB)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
 
-.globl glBufferSubDataARB
-.type glBufferSubDataARB,#function
-glBufferSubDataARB:
+.globl glGetBufferSubDataARB
+.type glGetBufferSubDataARB,#function
+glGetBufferSubDataARB:
 #ifdef __sparc_v9__
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
@@ -18490,20 +18532,20 @@ glBufferSubDataARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_BufferSubDataARB), %g2
-	or	%g2, %lo(8 * _gloffset_BufferSubDataARB), %g2
+	sethi	%hi(8 * _gloffset_GetBufferSubDataARB), %g2
+	or	%g2, %lo(8 * _gloffset_GetBufferSubDataARB), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_BufferSubDataARB)], %g3
+	ld	[%g1 + (4 * _gloffset_GetBufferSubDataARB)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
 
-.globl glGetBufferSubDataARB
-.type glGetBufferSubDataARB,#function
-glGetBufferSubDataARB:
+.globl glIsBufferARB
+.type glIsBufferARB,#function
+glIsBufferARB:
 #ifdef __sparc_v9__
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
@@ -18511,13 +18553,13 @@ glGetBufferSubDataARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_GetBufferSubDataARB), %g2
-	or	%g2, %lo(8 * _gloffset_GetBufferSubDataARB), %g2
+	sethi	%hi(8 * _gloffset_IsBufferARB), %g2
+	or	%g2, %lo(8 * _gloffset_IsBufferARB), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_GetBufferSubDataARB)], %g3
+	ld	[%g1 + (4 * _gloffset_IsBufferARB)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
@@ -18564,30 +18606,9 @@ glUnmapBufferARB:
 	jmpl	%g3, %g0
 	nop
 
-.globl glGetBufferParameterivARB
-.type glGetBufferParameterivARB,#function
-glGetBufferParameterivARB:
-#ifdef __sparc_v9__
-	sethi	%hi(0x00000000), %g2
-	sethi	%hi(0x00000000), %g1
-	or	%g2, %lo(0x00000000), %g2
-	or	%g1, %lo(0x00000000), %g1
-	sllx	%g2, 32, %g2
-	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_GetBufferParameterivARB), %g2
-	or	%g2, %lo(8 * _gloffset_GetBufferParameterivARB), %g2
-	ldx	[%g1 + %g2], %g3
-#else
-	sethi	%hi(0x00000000), %g1
-	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_GetBufferParameterivARB)], %g3
-#endif
-	jmpl	%g3, %g0
-	nop
-
-.globl glGetBufferPointervARB
-.type glGetBufferPointervARB,#function
-glGetBufferPointervARB:
+.globl glDepthBoundsEXT
+.type glDepthBoundsEXT,#function
+glDepthBoundsEXT:
 #ifdef __sparc_v9__
 	sethi	%hi(0x00000000), %g2
 	sethi	%hi(0x00000000), %g1
@@ -18595,13 +18616,13 @@ glGetBufferPointervARB:
 	or	%g1, %lo(0x00000000), %g1
 	sllx	%g2, 32, %g2
 	ldx	[%g1 + %g2], %g1
-	sethi	%hi(8 * _gloffset_GetBufferPointervARB), %g2
-	or	%g2, %lo(8 * _gloffset_GetBufferPointervARB), %g2
+	sethi	%hi(8 * _gloffset_DepthBoundsEXT), %g2
+	or	%g2, %lo(8 * _gloffset_DepthBoundsEXT), %g2
 	ldx	[%g1 + %g2], %g3
 #else
 	sethi	%hi(0x00000000), %g1
 	ld	[%g1 + %lo(0x00000000)], %g1
-	ld	[%g1 + (4 * _gloffset_GetBufferPointervARB)], %g3
+	ld	[%g1 + (4 * _gloffset_DepthBoundsEXT)], %g3
 #endif
 	jmpl	%g3, %g0
 	nop
diff --git a/src/mesa/x86/glapi_x86.S b/src/mesa/x86/glapi_x86.S
index eff25b7bbd8..a515818e4ba 100644
--- a/src/mesa/x86/glapi_x86.S
+++ b/src/mesa/x86/glapi_x86.S
@@ -4048,48 +4048,6 @@ GL_PREFIX(SamplePatternEXT):
 	JMP(GL_OFFSET(_gloffset_SamplePatternSGIS))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(DeleteFencesNV))
-GL_PREFIX(DeleteFencesNV):
-	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_DeleteFencesNV))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GenFencesNV))
-GL_PREFIX(GenFencesNV):
-	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_GenFencesNV))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(IsFenceNV))
-GL_PREFIX(IsFenceNV):
-	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_IsFenceNV))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(TestFenceNV))
-GL_PREFIX(TestFenceNV):
-	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_TestFenceNV))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetFenceivNV))
-GL_PREFIX(GetFenceivNV):
-	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_GetFenceivNV))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(FinishFenceNV))
-GL_PREFIX(FinishFenceNV):
-	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_FinishFenceNV))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(SetFenceNV))
-GL_PREFIX(SetFenceNV):
-	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_SetFenceNV))
-
-ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(WindowPos2dARB))
 GL_PREFIX(WindowPos2dARB):
 	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
@@ -4858,136 +4816,178 @@ GL_PREFIX(ActiveStencilFaceEXT):
 	JMP(GL_OFFSET(_gloffset_ActiveStencilFaceEXT))
 
 ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(DeleteFencesNV))
+GL_PREFIX(DeleteFencesNV):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_DeleteFencesNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GenFencesNV))
+GL_PREFIX(GenFencesNV):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GenFencesNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(IsFenceNV))
+GL_PREFIX(IsFenceNV):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_IsFenceNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(TestFenceNV))
+GL_PREFIX(TestFenceNV):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_TestFenceNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(GetFenceivNV))
+GL_PREFIX(GetFenceivNV):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_GetFenceivNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(FinishFenceNV))
+GL_PREFIX(FinishFenceNV):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_FinishFenceNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(SetFenceNV))
+GL_PREFIX(SetFenceNV):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_SetFenceNV))
+
+ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(VertexAttrib1sARB))
 GL_PREFIX(VertexAttrib1sARB):
 	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib1sARB))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib1sNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(VertexAttrib1fARB))
 GL_PREFIX(VertexAttrib1fARB):
 	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib1fARB))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib1fNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(VertexAttrib1dARB))
 GL_PREFIX(VertexAttrib1dARB):
 	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib1dARB))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib1dNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(VertexAttrib2sARB))
 GL_PREFIX(VertexAttrib2sARB):
 	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib2sARB))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib2sNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(VertexAttrib2fARB))
 GL_PREFIX(VertexAttrib2fARB):
 	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib2fARB))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib2fNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(VertexAttrib2dARB))
 GL_PREFIX(VertexAttrib2dARB):
 	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib2dARB))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib2dNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(VertexAttrib3sARB))
 GL_PREFIX(VertexAttrib3sARB):
 	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib3sARB))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib3sNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(VertexAttrib3fARB))
 GL_PREFIX(VertexAttrib3fARB):
 	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib3fARB))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib3fNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(VertexAttrib3dARB))
 GL_PREFIX(VertexAttrib3dARB):
 	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib3dARB))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib3dNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(VertexAttrib4sARB))
 GL_PREFIX(VertexAttrib4sARB):
 	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib4sARB))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4sNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(VertexAttrib4fARB))
 GL_PREFIX(VertexAttrib4fARB):
 	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib4fARB))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4fNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(VertexAttrib4dARB))
 GL_PREFIX(VertexAttrib4dARB):
 	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib4dARB))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4dNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(VertexAttrib4NubARB))
 GL_PREFIX(VertexAttrib4NubARB):
 	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib4NubARB))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4ubNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(VertexAttrib1svARB))
 GL_PREFIX(VertexAttrib1svARB):
 	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib1svARB))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib1svNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(VertexAttrib1fvARB))
 GL_PREFIX(VertexAttrib1fvARB):
 	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib1fvARB))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib1fvNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(VertexAttrib1dvARB))
 GL_PREFIX(VertexAttrib1dvARB):
 	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib1dvARB))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib1dvNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(VertexAttrib2svARB))
 GL_PREFIX(VertexAttrib2svARB):
 	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib2svARB))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib2svNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(VertexAttrib2fvARB))
 GL_PREFIX(VertexAttrib2fvARB):
 	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib2fvARB))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib2fvNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(VertexAttrib2dvARB))
 GL_PREFIX(VertexAttrib2dvARB):
 	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib2dvARB))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib2dvNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(VertexAttrib3svARB))
 GL_PREFIX(VertexAttrib3svARB):
 	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib3svARB))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib3svNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(VertexAttrib3fvARB))
 GL_PREFIX(VertexAttrib3fvARB):
 	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib3fvARB))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib3fvNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(VertexAttrib3dvARB))
 GL_PREFIX(VertexAttrib3dvARB):
 	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib3dvARB))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib3dvNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(VertexAttrib4bvARB))
@@ -4999,7 +4999,7 @@ ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(VertexAttrib4svARB))
 GL_PREFIX(VertexAttrib4svARB):
 	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib4svARB))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4svNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(VertexAttrib4ivARB))
@@ -5029,13 +5029,13 @@ ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(VertexAttrib4fvARB))
 GL_PREFIX(VertexAttrib4fvARB):
 	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib4fvARB))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4fvNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(VertexAttrib4dvARB))
 GL_PREFIX(VertexAttrib4dvARB):
 	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib4dvARB))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4dvNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(VertexAttrib4NbvARB))
@@ -5059,7 +5059,7 @@ ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(VertexAttrib4NubvARB))
 GL_PREFIX(VertexAttrib4NubvARB):
 	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_VertexAttrib4NubvARB))
+	JMP(GL_OFFSET(_gloffset_VertexAttrib4ubvNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(VertexAttrib4NusvARB))
@@ -5101,19 +5101,25 @@ ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(BindProgramARB))
 GL_PREFIX(BindProgramARB):
 	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_BindProgramARB))
+	JMP(GL_OFFSET(_gloffset_BindProgramNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(DeleteProgramsARB))
 GL_PREFIX(DeleteProgramsARB):
 	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_DeleteProgramsARB))
+	JMP(GL_OFFSET(_gloffset_DeleteProgramsNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(GenProgramsARB))
 GL_PREFIX(GenProgramsARB):
 	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_GenProgramsARB))
+	JMP(GL_OFFSET(_gloffset_GenProgramsNV))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(IsProgramARB))
+GL_PREFIX(IsProgramARB):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_IsProgramNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(ProgramEnvParameter4dARB))
@@ -5203,31 +5209,25 @@ ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(GetVertexAttribdvARB))
 GL_PREFIX(GetVertexAttribdvARB):
 	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_GetVertexAttribdvARB))
+	JMP(GL_OFFSET(_gloffset_GetVertexAttribdvNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(GetVertexAttribfvARB))
 GL_PREFIX(GetVertexAttribfvARB):
 	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_GetVertexAttribfvARB))
+	JMP(GL_OFFSET(_gloffset_GetVertexAttribfvNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(GetVertexAttribivARB))
 GL_PREFIX(GetVertexAttribivARB):
 	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_GetVertexAttribivARB))
+	JMP(GL_OFFSET(_gloffset_GetVertexAttribivNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(GetVertexAttribPointervARB))
 GL_PREFIX(GetVertexAttribPointervARB):
 	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_GetVertexAttribPointervARB))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(IsProgramARB))
-GL_PREFIX(IsProgramARB):
-	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_IsProgramARB))
+	JMP(GL_OFFSET(_gloffset_GetVertexAttribPointervNV))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(ProgramNamedParameter4fNV))
@@ -5272,6 +5272,18 @@ GL_PREFIX(BindBufferARB):
 	JMP(GL_OFFSET(_gloffset_BindBufferARB))
 
 ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(BufferDataARB))
+GL_PREFIX(BufferDataARB):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_BufferDataARB))
+
+ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(BufferSubDataARB))
+GL_PREFIX(BufferSubDataARB):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_BufferSubDataARB))
+
+ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(DeleteBuffersARB))
 GL_PREFIX(DeleteBuffersARB):
 	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
@@ -5284,22 +5296,16 @@ GL_PREFIX(GenBuffersARB):
 	JMP(GL_OFFSET(_gloffset_GenBuffersARB))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(IsBufferARB))
-GL_PREFIX(IsBufferARB):
-	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_IsBufferARB))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(BufferDataARB))
-GL_PREFIX(BufferDataARB):
+GLOBL_FN(GL_PREFIX(GetBufferParameterivARB))
+GL_PREFIX(GetBufferParameterivARB):
 	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_BufferDataARB))
+	JMP(GL_OFFSET(_gloffset_GetBufferParameterivARB))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(BufferSubDataARB))
-GL_PREFIX(BufferSubDataARB):
+GLOBL_FN(GL_PREFIX(GetBufferPointervARB))
+GL_PREFIX(GetBufferPointervARB):
 	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_BufferSubDataARB))
+	JMP(GL_OFFSET(_gloffset_GetBufferPointervARB))
 
 ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(GetBufferSubDataARB))
@@ -5308,6 +5314,12 @@ GL_PREFIX(GetBufferSubDataARB):
 	JMP(GL_OFFSET(_gloffset_GetBufferSubDataARB))
 
 ALIGNTEXT16
+GLOBL_FN(GL_PREFIX(IsBufferARB))
+GL_PREFIX(IsBufferARB):
+	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
+	JMP(GL_OFFSET(_gloffset_IsBufferARB))
+
+ALIGNTEXT16
 GLOBL_FN(GL_PREFIX(MapBufferARB))
 GL_PREFIX(MapBufferARB):
 	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
@@ -5320,16 +5332,10 @@ GL_PREFIX(UnmapBufferARB):
 	JMP(GL_OFFSET(_gloffset_UnmapBufferARB))
 
 ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetBufferParameterivARB))
-GL_PREFIX(GetBufferParameterivARB):
-	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_GetBufferParameterivARB))
-
-ALIGNTEXT16
-GLOBL_FN(GL_PREFIX(GetBufferPointervARB))
-GL_PREFIX(GetBufferPointervARB):
+GLOBL_FN(GL_PREFIX(DepthBoundsEXT))
+GL_PREFIX(DepthBoundsEXT):
 	MOV_L(CONTENT(GLNAME(_glapi_Dispatch)), EAX)
-	JMP(GL_OFFSET(_gloffset_GetBufferPointervARB))
+	JMP(GL_OFFSET(_gloffset_DepthBoundsEXT))
 
 
 #endif  /* __WIN32__ */