alias ARB/NV program functions where possible

1 files changed, 45 insertions, 40 deletions

diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 15b19d7a7b..96086624c9 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
 }