alias ARB/NV program functions where possible

6 files changed, 98 insertions, 121 deletions

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
 }