API dispath updates

8 files changed, 141 insertions, 141 deletions

diff --git a/src/mesa/main/api_loopback.c b/src/mesa/main/api_loopback.c
index bea893a208..ca7c9b77ac 100644
--- a/src/mesa/main/api_loopback.c
+++ b/src/mesa/main/api_loopback.c
@@ -1,4 +1,4 @@
-/* $Id: api_loopback.c,v 1.9 2001/09/14 21:37:52 brianp Exp $ */
+/* $Id: api_loopback.c,v 1.10 2001/11/18 22:48:11 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -1522,30 +1522,30 @@ _mesa_loopback_init_api_table( struct _glapi_table *dest,
    dest->Vertex4dv = loopback_Vertex4dv;
    dest->Vertex4iv = loopback_Vertex4iv;
    dest->Vertex4sv = loopback_Vertex4sv;
-   dest->MultiTexCoord1dARB = loopback_MultiTexCoord1dARB;
-   dest->MultiTexCoord1dvARB = loopback_MultiTexCoord1dvARB;
-   dest->MultiTexCoord1iARB = loopback_MultiTexCoord1iARB;
-   dest->MultiTexCoord1ivARB = loopback_MultiTexCoord1ivARB;
-   dest->MultiTexCoord1sARB = loopback_MultiTexCoord1sARB;
-   dest->MultiTexCoord1svARB = loopback_MultiTexCoord1svARB;
-   dest->MultiTexCoord2dARB = loopback_MultiTexCoord2dARB;
-   dest->MultiTexCoord2dvARB = loopback_MultiTexCoord2dvARB;
-   dest->MultiTexCoord2iARB = loopback_MultiTexCoord2iARB;
-   dest->MultiTexCoord2ivARB = loopback_MultiTexCoord2ivARB;
-   dest->MultiTexCoord2sARB = loopback_MultiTexCoord2sARB;
-   dest->MultiTexCoord2svARB = loopback_MultiTexCoord2svARB;
-   dest->MultiTexCoord3dARB = loopback_MultiTexCoord3dARB;
-   dest->MultiTexCoord3dvARB = loopback_MultiTexCoord3dvARB;
-   dest->MultiTexCoord3iARB = loopback_MultiTexCoord3iARB;
-   dest->MultiTexCoord3ivARB = loopback_MultiTexCoord3ivARB;
-   dest->MultiTexCoord3sARB = loopback_MultiTexCoord3sARB;
-   dest->MultiTexCoord3svARB = loopback_MultiTexCoord3svARB;
-   dest->MultiTexCoord4dARB = loopback_MultiTexCoord4dARB;
-   dest->MultiTexCoord4dvARB = loopback_MultiTexCoord4dvARB;
-   dest->MultiTexCoord4iARB = loopback_MultiTexCoord4iARB;
-   dest->MultiTexCoord4ivARB = loopback_MultiTexCoord4ivARB;
-   dest->MultiTexCoord4sARB = loopback_MultiTexCoord4sARB;
-   dest->MultiTexCoord4svARB = loopback_MultiTexCoord4svARB;
+   dest->MultiTexCoord1d = loopback_MultiTexCoord1dARB;
+   dest->MultiTexCoord1dv = loopback_MultiTexCoord1dvARB;
+   dest->MultiTexCoord1i = loopback_MultiTexCoord1iARB;
+   dest->MultiTexCoord1iv = loopback_MultiTexCoord1ivARB;
+   dest->MultiTexCoord1s = loopback_MultiTexCoord1sARB;
+   dest->MultiTexCoord1sv = loopback_MultiTexCoord1svARB;
+   dest->MultiTexCoord2d = loopback_MultiTexCoord2dARB;
+   dest->MultiTexCoord2dv = loopback_MultiTexCoord2dvARB;
+   dest->MultiTexCoord2i = loopback_MultiTexCoord2iARB;
+   dest->MultiTexCoord2iv = loopback_MultiTexCoord2ivARB;
+   dest->MultiTexCoord2s = loopback_MultiTexCoord2sARB;
+   dest->MultiTexCoord2sv = loopback_MultiTexCoord2svARB;
+   dest->MultiTexCoord3d = loopback_MultiTexCoord3dARB;
+   dest->MultiTexCoord3dv = loopback_MultiTexCoord3dvARB;
+   dest->MultiTexCoord3i = loopback_MultiTexCoord3iARB;
+   dest->MultiTexCoord3iv = loopback_MultiTexCoord3ivARB;
+   dest->MultiTexCoord3s = loopback_MultiTexCoord3sARB;
+   dest->MultiTexCoord3sv = loopback_MultiTexCoord3svARB;
+   dest->MultiTexCoord4d = loopback_MultiTexCoord4dARB;
+   dest->MultiTexCoord4dv = loopback_MultiTexCoord4dvARB;
+   dest->MultiTexCoord4i = loopback_MultiTexCoord4iARB;
+   dest->MultiTexCoord4iv = loopback_MultiTexCoord4ivARB;
+   dest->MultiTexCoord4s = loopback_MultiTexCoord4sARB;
+   dest->MultiTexCoord4sv = loopback_MultiTexCoord4svARB;
    dest->EvalCoord2dv = loopback_EvalCoord2dv;
    dest->EvalCoord2fv = loopback_EvalCoord2fv;
    dest->EvalCoord2d = loopback_EvalCoord2d;
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index d88e9d3055..fff457b466 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -1,4 +1,4 @@
-/* $Id: dd.h,v 1.62 2001/06/15 14:18:46 brianp Exp $ */
+/* $Id: dd.h,v 1.63 2001/11/18 22:48:11 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -665,14 +665,14 @@ typedef struct {
    void (*Indexi)( GLint );
    void (*Indexiv)( const GLint * );
    void (*Materialfv)( GLenum face, GLenum pname, const GLfloat * ); /* NOTE */
-   void (*MultiTexCoord1fARB)( GLenum, GLfloat );
-   void (*MultiTexCoord1fvARB)( GLenum, const GLfloat * );
-   void (*MultiTexCoord2fARB)( GLenum, GLfloat, GLfloat );
-   void (*MultiTexCoord2fvARB)( GLenum, const GLfloat * );
-   void (*MultiTexCoord3fARB)( GLenum, GLfloat, GLfloat, GLfloat );
-   void (*MultiTexCoord3fvARB)( GLenum, const GLfloat * );
-   void (*MultiTexCoord4fARB)( GLenum, GLfloat, GLfloat, GLfloat, GLfloat );
-   void (*MultiTexCoord4fvARB)( GLenum, const GLfloat * );
+   void (*MultiTexCoord1f)( GLenum, GLfloat );
+   void (*MultiTexCoord1fv)( GLenum, const GLfloat * );
+   void (*MultiTexCoord2f)( GLenum, GLfloat, GLfloat );
+   void (*MultiTexCoord2fv)( GLenum, const GLfloat * );
+   void (*MultiTexCoord3f)( GLenum, GLfloat, GLfloat, GLfloat );
+   void (*MultiTexCoord3fv)( GLenum, const GLfloat * );
+   void (*MultiTexCoord4f)( GLenum, GLfloat, GLfloat, GLfloat, GLfloat );
+   void (*MultiTexCoord4fv)( GLenum, const GLfloat * );
    void (*Normal3f)( GLfloat, GLfloat, GLfloat );
    void (*Normal3fv)( const GLfloat * );
    void (*SecondaryColor3fEXT)( GLfloat, GLfloat, GLfloat );
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index fe5241587d..0f4d7d875c 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -1,4 +1,4 @@
-/* $Id: dlist.c,v 1.76 2001/09/18 16:16:21 kschultz Exp $ */
+/* $Id: dlist.c,v 1.77 2001/11/18 22:48:11 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -2486,7 +2486,7 @@ save_PointParameterfvEXT( GLenum pname, const GLfloat *params )
       n[4].f = params[2];
    }
    if (ctx->ExecuteFlag) {
-      (*ctx->Exec->PointParameterfvEXT)( pname, params );
+      (*ctx->Exec->PointParameterfvARB)( pname, params );
    }
 }
 
@@ -3228,7 +3228,7 @@ static void save_TexImage2D( GLenum target,
 
 
 static void save_TexImage3D( GLenum target,
-                             GLint level, GLenum internalFormat,
+                             GLint level, GLint internalFormat,
                              GLsizei width, GLsizei height, GLsizei depth,
                              GLint border,
                              GLenum format, GLenum type,
@@ -3557,7 +3557,7 @@ static void save_ActiveTextureARB( GLenum target )
       n[1].e = target;
    }
    if (ctx->ExecuteFlag) {
-      (*ctx->Exec->ActiveTextureARB)( target );
+      (*ctx->Exec->ActiveTexture)( target );
    }
 }
 
@@ -3624,8 +3624,8 @@ save_CompressedTexImage1DARB(GLenum target, GLint level,
    GET_CURRENT_CONTEXT(ctx);
    if (target == GL_PROXY_TEXTURE_1D) {
       /* don't compile, execute immediately */
-      (*ctx->Exec->CompressedTexImage1DARB)(target, level, internalFormat,
-                                            width, border, imageSize, data);
+      (*ctx->Exec->CompressedTexImage1D)(target, level, internalFormat,
+                                         width, border, imageSize, data);
    }
    else {
       Node *n;
@@ -3652,8 +3652,8 @@ save_CompressedTexImage1DARB(GLenum target, GLint level,
          FREE(image);
       }
       if (ctx->ExecuteFlag) {
-         (*ctx->Exec->CompressedTexImage1DARB)(target, level, internalFormat,
-                                               width, border, imageSize, data);
+         (*ctx->Exec->CompressedTexImage1D)(target, level, internalFormat,
+                                            width, border, imageSize, data);
       }
    }
 }
@@ -3668,7 +3668,7 @@ save_CompressedTexImage2DARB(GLenum target, GLint level,
    GET_CURRENT_CONTEXT(ctx);
    if (target == GL_PROXY_TEXTURE_2D) {
       /* don't compile, execute immediately */
-      (*ctx->Exec->CompressedTexImage2DARB)(target, level, internalFormat,
+      (*ctx->Exec->CompressedTexImage2D)(target, level, internalFormat,
                                        width, height, border, imageSize, data);
    }
    else {
@@ -3697,7 +3697,7 @@ save_CompressedTexImage2DARB(GLenum target, GLint level,
          FREE(image);
       }
       if (ctx->ExecuteFlag) {
-         (*ctx->Exec->CompressedTexImage2DARB)(target, level, internalFormat,
+         (*ctx->Exec->CompressedTexImage2D)(target, level, internalFormat,
                                       width, height, border, imageSize, data);
       }
    }
@@ -3713,7 +3713,7 @@ save_CompressedTexImage3DARB(GLenum target, GLint level,
    GET_CURRENT_CONTEXT(ctx);
    if (target == GL_PROXY_TEXTURE_3D) {
       /* don't compile, execute immediately */
-      (*ctx->Exec->CompressedTexImage3DARB)(target, level, internalFormat,
+      (*ctx->Exec->CompressedTexImage3D)(target, level, internalFormat,
                                 width, height, depth, border, imageSize, data);
    }
    else {
@@ -3743,7 +3743,7 @@ save_CompressedTexImage3DARB(GLenum target, GLint level,
          FREE(image);
       }
       if (ctx->ExecuteFlag) {
-         (*ctx->Exec->CompressedTexImage3DARB)(target, level, internalFormat,
+         (*ctx->Exec->CompressedTexImage3D)(target, level, internalFormat,
                                 width, height, depth, border, imageSize, data);
       }
    }
@@ -3782,8 +3782,8 @@ save_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset,
       FREE(image);
    }
    if (ctx->ExecuteFlag) {
-      (*ctx->Exec->CompressedTexSubImage1DARB)(target, level, xoffset,
-                                               width, format, imageSize, data);
+      (*ctx->Exec->CompressedTexSubImage1D)(target, level, xoffset,
+                                            width, format, imageSize, data);
    }
 }
 
@@ -3823,7 +3823,7 @@ save_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset,
       FREE(image);
    }
    if (ctx->ExecuteFlag) {
-      (*ctx->Exec->CompressedTexSubImage2DARB)(target, level, xoffset, yoffset,
+      (*ctx->Exec->CompressedTexSubImage2D)(target, level, xoffset, yoffset,
                                        width, height, format, imageSize, data);
    }
 }
@@ -3866,7 +3866,7 @@ save_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,
       FREE(image);
    }
    if (ctx->ExecuteFlag) {
-      (*ctx->Exec->CompressedTexSubImage3DARB)(target, level, xoffset, yoffset,
+      (*ctx->Exec->CompressedTexSubImage3D)(target, level, xoffset, yoffset,
                        zoffset, width, height, depth, format, imageSize, data);
    }
 }
@@ -3885,7 +3885,7 @@ save_SampleCoverageARB(GLclampf value, GLboolean invert)
       n[2].b = invert;
    }
    if (ctx->ExecuteFlag) {
-      (*ctx->Exec->SampleCoverageARB)( value, invert );
+      (*ctx->Exec->SampleCoverage)( value, invert );
    }
 }
 
@@ -4386,7 +4386,7 @@ execute_list( GLcontext *ctx, GLuint list )
 		params[0] = n[2].f;
 		params[1] = n[3].f;
 		params[2] = n[4].f;
-		(*ctx->Exec->PointParameterfvEXT)( n[1].e, params );
+		(*ctx->Exec->PointParameterfvARB)( n[1].e, params );
 	    }
 	    break;
 	 case OPCODE_POLYGON_MODE:
@@ -4575,7 +4575,7 @@ execute_list( GLcontext *ctx, GLuint list )
             (*ctx->Exec->WindowPos4fMESA)( n[1].f, n[2].f, n[3].f, n[4].f );
 	    break;
          case OPCODE_ACTIVE_TEXTURE:  /* GL_ARB_multitexture */
-            (*ctx->Exec->ActiveTextureARB)( n[1].e );
+            (*ctx->Exec->ActiveTexture)( n[1].e );
             break;
          case OPCODE_PIXEL_TEXGEN_SGIX:  /* GL_SGIX_pixel_texture */
             (*ctx->Exec->PixelTexGenSGIX)( n[1].e );
@@ -4584,32 +4584,32 @@ execute_list( GLcontext *ctx, GLuint list )
             (*ctx->Exec->PixelTexGenParameteriSGIS)( n[1].e, n[2].i );
             break;
          case OPCODE_COMPRESSED_TEX_IMAGE_1D: /* GL_ARB_texture_compression */
-            (*ctx->Exec->CompressedTexImage1DARB)(n[1].e, n[2].i, n[3].e,
+            (*ctx->Exec->CompressedTexImage1D)(n[1].e, n[2].i, n[3].e,
                                             n[4].i, n[5].i, n[6].i, n[7].data);
             break;
          case OPCODE_COMPRESSED_TEX_IMAGE_2D: /* GL_ARB_texture_compression */
-            (*ctx->Exec->CompressedTexImage2DARB)(n[1].e, n[2].i, n[3].e,
+            (*ctx->Exec->CompressedTexImage2D)(n[1].e, n[2].i, n[3].e,
                                     n[4].i, n[5].i, n[6].i, n[7].i, n[8].data);
             break;
          case OPCODE_COMPRESSED_TEX_IMAGE_3D: /* GL_ARB_texture_compression */
-            (*ctx->Exec->CompressedTexImage3DARB)(n[1].e, n[2].i, n[3].e,
+            (*ctx->Exec->CompressedTexImage3D)(n[1].e, n[2].i, n[3].e,
                             n[4].i, n[5].i, n[6].i, n[7].i, n[8].i, n[9].data);
             break;
          case OPCODE_COMPRESSED_TEX_SUB_IMAGE_1D: /* GL_ARB_texture_compress */
-            (*ctx->Exec->CompressedTexSubImage1DARB)(n[1].e, n[2].i, n[3].i,
+            (*ctx->Exec->CompressedTexSubImage1D)(n[1].e, n[2].i, n[3].i,
                                             n[4].i, n[5].e, n[6].i, n[7].data);
             break;
          case OPCODE_COMPRESSED_TEX_SUB_IMAGE_2D: /* GL_ARB_texture_compress */
-            (*ctx->Exec->CompressedTexSubImage2DARB)(n[1].e, n[2].i, n[3].i,
+            (*ctx->Exec->CompressedTexSubImage2D)(n[1].e, n[2].i, n[3].i,
                             n[4].i, n[5].i, n[6].i, n[7].e, n[8].i, n[9].data);
             break;
          case OPCODE_COMPRESSED_TEX_SUB_IMAGE_3D: /* GL_ARB_texture_compress */
-            (*ctx->Exec->CompressedTexSubImage3DARB)(n[1].e, n[2].i, n[3].i,
+            (*ctx->Exec->CompressedTexSubImage3D)(n[1].e, n[2].i, n[3].i,
                                         n[4].i, n[5].i, n[6].i, n[7].i, n[8].i,
                                         n[9].e, n[10].i, n[11].data);
             break;
          case OPCODE_SAMPLE_COVERAGE: /* GL_ARB_multisample */
-            (*ctx->Exec->SampleCoverageARB)(n[1].f, n[2].b);
+            (*ctx->Exec->SampleCoverage)(n[1].f, n[2].b);
             break;
 	 case OPCODE_CONTINUE:
 	    n = (Node *) n[1].next;
@@ -5271,7 +5271,7 @@ static void exec_GetCompressedTexImageARB(GLenum target, GLint level,
 {
    GET_CURRENT_CONTEXT(ctx);
    FLUSH_VERTICES(ctx, 0);
-   ctx->Exec->GetCompressedTexImageARB( target, level, img);
+   ctx->Exec->GetCompressedTexImage( target, level, img);
 }
 
 static void exec_VertexPointer(GLint size, GLenum type, GLsizei stride,
@@ -5503,7 +5503,7 @@ static void exec_ClientActiveTextureARB( GLenum target )
 {
    GET_CURRENT_CONTEXT(ctx);
    FLUSH_VERTICES(ctx, 0);
-   ctx->Exec->ClientActiveTextureARB(target);
+   ctx->Exec->ClientActiveTexture(target);
 }
 
 static void exec_SecondaryColorPointerEXT(GLint size, GLenum type,
@@ -5823,8 +5823,8 @@ _mesa_init_dlist_table( struct _glapi_table *table, GLuint tableSize )
 #endif
 
    /* 54. GL_EXT_point_parameters */
-   table->PointParameterfEXT = save_PointParameterfEXT;
-   table->PointParameterfvEXT = save_PointParameterfvEXT;
+   table->PointParameterfARB = save_PointParameterfEXT;
+   table->PointParameterfvARB = save_PointParameterfvEXT;
 
    /* 78. GL_EXT_paletted_texture */
 #if 0
@@ -5840,8 +5840,8 @@ _mesa_init_dlist_table( struct _glapi_table *table, GLuint tableSize )
    table->UnlockArraysEXT = exec_UnlockArraysEXT;
 
    /* GL_ARB_multitexture */
-   table->ActiveTextureARB = save_ActiveTextureARB;
-   table->ClientActiveTextureARB = exec_ClientActiveTextureARB;
+   table->ActiveTexture = save_ActiveTextureARB;
+   table->ClientActiveTexture = exec_ClientActiveTextureARB;
 
    /* GL_EXT_blend_func_separate */
    table->BlendFuncSeparateEXT = save_BlendFuncSeparateEXT;
@@ -5876,22 +5876,22 @@ _mesa_init_dlist_table( struct _glapi_table *table, GLuint tableSize )
    table->ResizeBuffersMESA = exec_ResizeBuffersMESA;
 
    /* GL_ARB_transpose_matrix */
-   table->LoadTransposeMatrixdARB = save_LoadTransposeMatrixdARB;
-   table->LoadTransposeMatrixfARB = save_LoadTransposeMatrixfARB;
-   table->MultTransposeMatrixdARB = save_MultTransposeMatrixdARB;
-   table->MultTransposeMatrixfARB = save_MultTransposeMatrixfARB;
+   table->LoadTransposeMatrixd = save_LoadTransposeMatrixdARB;
+   table->LoadTransposeMatrixf = save_LoadTransposeMatrixfARB;
+   table->MultTransposeMatrixd = save_MultTransposeMatrixdARB;
+   table->MultTransposeMatrixf = save_MultTransposeMatrixfARB;
 
    /* GL_ARB_multisample */
-   table->SampleCoverageARB = save_SampleCoverageARB;
+   table->SampleCoverage = save_SampleCoverageARB;
 
    /* ARB 12. GL_ARB_texture_compression */
-   table->CompressedTexImage3DARB = save_CompressedTexImage3DARB;
-   table->CompressedTexImage2DARB = save_CompressedTexImage2DARB;
-   table->CompressedTexImage1DARB = save_CompressedTexImage1DARB;
-   table->CompressedTexSubImage3DARB = save_CompressedTexSubImage3DARB;
-   table->CompressedTexSubImage2DARB = save_CompressedTexSubImage2DARB;
-   table->CompressedTexSubImage1DARB = save_CompressedTexSubImage1DARB;
-   table->GetCompressedTexImageARB = exec_GetCompressedTexImageARB;
+   table->CompressedTexImage3D = save_CompressedTexImage3DARB;
+   table->CompressedTexImage2D = save_CompressedTexImage2DARB;
+   table->CompressedTexImage1D = save_CompressedTexImage1DARB;
+   table->CompressedTexSubImage3D = save_CompressedTexSubImage3DARB;
+   table->CompressedTexSubImage2D = save_CompressedTexSubImage2DARB;
+   table->CompressedTexSubImage1D = save_CompressedTexSubImage1DARB;
+   table->GetCompressedTexImage = exec_GetCompressedTexImageARB;
 
    /* GL_EXT_secondary_color */
    table->SecondaryColorPointerEXT = exec_SecondaryColorPointerEXT;
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index c1d5a0dace..0c884e1959 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -1,4 +1,4 @@
-/* $Id: state.c,v 1.69 2001/09/18 23:06:14 kschultz Exp $ */
+/* $Id: state.c,v 1.70 2001/11/18 22:48:13 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -408,8 +408,8 @@ _mesa_init_exec_table(struct _glapi_table *exec, GLuint tableSize)
 #endif
 
    /* 54. GL_EXT_point_parameters */
-   exec->PointParameterfEXT = _mesa_PointParameterfEXT;
-   exec->PointParameterfvEXT = _mesa_PointParameterfvEXT;
+   exec->PointParameterfARB = _mesa_PointParameterfEXT;
+   exec->PointParameterfvARB = _mesa_PointParameterfvEXT;
 
    /* 78. GL_EXT_paletted_texture */
 #if 0
@@ -457,26 +457,26 @@ _mesa_init_exec_table(struct _glapi_table *exec, GLuint tableSize)
    exec->WindowPos4svMESA = _mesa_WindowPos4svMESA;
 
    /* ARB 1. GL_ARB_multitexture */
-   exec->ActiveTextureARB = _mesa_ActiveTextureARB;
-   exec->ClientActiveTextureARB = _mesa_ClientActiveTextureARB;
+   exec->ActiveTexture = _mesa_ActiveTextureARB;
+   exec->ClientActiveTexture = _mesa_ClientActiveTextureARB;
 
    /* ARB 3. GL_ARB_transpose_matrix */
-   exec->LoadTransposeMatrixdARB = _mesa_LoadTransposeMatrixdARB;
-   exec->LoadTransposeMatrixfARB = _mesa_LoadTransposeMatrixfARB;
-   exec->MultTransposeMatrixdARB = _mesa_MultTransposeMatrixdARB;
-   exec->MultTransposeMatrixfARB = _mesa_MultTransposeMatrixfARB;
+   exec->LoadTransposeMatrixd = _mesa_LoadTransposeMatrixdARB;
+   exec->LoadTransposeMatrixf = _mesa_LoadTransposeMatrixfARB;
+   exec->MultTransposeMatrixd = _mesa_MultTransposeMatrixdARB;
+   exec->MultTransposeMatrixf = _mesa_MultTransposeMatrixfARB;
 
    /* ARB 5. GL_ARB_multisample */
-   exec->SampleCoverageARB = _mesa_SampleCoverageARB;
+   exec->SampleCoverage = _mesa_SampleCoverageARB;
 
    /* ARB 12. GL_ARB_texture_compression */
-   exec->CompressedTexImage3DARB = _mesa_CompressedTexImage3DARB;
-   exec->CompressedTexImage2DARB = _mesa_CompressedTexImage2DARB;
-   exec->CompressedTexImage1DARB = _mesa_CompressedTexImage1DARB;
-   exec->CompressedTexSubImage3DARB = _mesa_CompressedTexSubImage3DARB;
-   exec->CompressedTexSubImage2DARB = _mesa_CompressedTexSubImage2DARB;
-   exec->CompressedTexSubImage1DARB = _mesa_CompressedTexSubImage1DARB;
-   exec->GetCompressedTexImageARB = _mesa_GetCompressedTexImageARB;
+   exec->CompressedTexImage3D = _mesa_CompressedTexImage3DARB;
+   exec->CompressedTexImage2D = _mesa_CompressedTexImage2DARB;
+   exec->CompressedTexImage1D = _mesa_CompressedTexImage1DARB;
+   exec->CompressedTexSubImage3D = _mesa_CompressedTexSubImage3DARB;
+   exec->CompressedTexSubImage2D = _mesa_CompressedTexSubImage2DARB;
+   exec->CompressedTexSubImage1D = _mesa_CompressedTexSubImage1DARB;
+   exec->GetCompressedTexImage = _mesa_GetCompressedTexImageARB;
 
 }
 
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 3e955c7004..89cf12c8d0 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -1,4 +1,4 @@
-/* $Id: teximage.c,v 1.105 2001/11/03 04:11:26 brianp Exp $ */
+/* $Id: teximage.c,v 1.106 2001/11/18 22:48:13 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -1565,7 +1565,7 @@ _mesa_TexImage2D( GLenum target, GLint level, GLint internalFormat,
  * Note that width and height include the border.
  */
 void
-_mesa_TexImage3D( GLenum target, GLint level, GLenum internalFormat,
+_mesa_TexImage3D( GLenum target, GLint level, GLint internalFormat,
                   GLsizei width, GLsizei height, GLsizei depth,
                   GLint border, GLenum format, GLenum type,
                   const GLvoid *pixels )
diff --git a/src/mesa/main/teximage.h b/src/mesa/main/teximage.h
index 12c6c99e5f..b86a280512 100644
--- a/src/mesa/main/teximage.h
+++ b/src/mesa/main/teximage.h
@@ -1,4 +1,4 @@
-/* $Id: teximage.h,v 1.19 2001/05/21 16:41:03 brianp Exp $ */
+/* $Id: teximage.h,v 1.20 2001/11/18 22:48:13 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -87,7 +87,7 @@ _mesa_TexImage2D( GLenum target, GLint level, GLint internalformat,
 
 
 extern void
-_mesa_TexImage3D( GLenum target, GLint level, GLenum internalformat,
+_mesa_TexImage3D( GLenum target, GLint level, GLint internalformat,
                   GLsizei width, GLsizei height, GLsizei depth, GLint border,
                   GLenum format, GLenum type, const GLvoid *pixels );
 
diff --git a/src/mesa/main/vtxfmt.c b/src/mesa/main/vtxfmt.c
index 7e339da052..9df1b52a89 100644
--- a/src/mesa/main/vtxfmt.c
+++ b/src/mesa/main/vtxfmt.c
@@ -1,4 +1,4 @@
-/* $Id: vtxfmt.c,v 1.6 2001/03/12 01:06:44 gareth Exp $ */
+/* $Id: vtxfmt.c,v 1.7 2001/11/18 22:48:13 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -107,14 +107,14 @@ static void install_vtxfmt( struct _glapi_table *tab, GLvertexformat *vfmt )
    tab->Indexi = vfmt->Indexi;
    tab->Indexiv = vfmt->Indexiv;
    tab->Materialfv = vfmt->Materialfv;
-   tab->MultiTexCoord1fARB = vfmt->MultiTexCoord1fARB;
-   tab->MultiTexCoord1fvARB = vfmt->MultiTexCoord1fvARB;
-   tab->MultiTexCoord2fARB = vfmt->MultiTexCoord2fARB;
-   tab->MultiTexCoord2fvARB = vfmt->MultiTexCoord2fvARB;
-   tab->MultiTexCoord3fARB = vfmt->MultiTexCoord3fARB;
-   tab->MultiTexCoord3fvARB = vfmt->MultiTexCoord3fvARB;
-   tab->MultiTexCoord4fARB = vfmt->MultiTexCoord4fARB;
-   tab->MultiTexCoord4fvARB = vfmt->MultiTexCoord4fvARB;
+   tab->MultiTexCoord1f = vfmt->MultiTexCoord1f;
+   tab->MultiTexCoord1fv = vfmt->MultiTexCoord1fv;
+   tab->MultiTexCoord2f = vfmt->MultiTexCoord2f;
+   tab->MultiTexCoord2fv = vfmt->MultiTexCoord2fv;
+   tab->MultiTexCoord3f = vfmt->MultiTexCoord3f;
+   tab->MultiTexCoord3fv = vfmt->MultiTexCoord3fv;
+   tab->MultiTexCoord4f = vfmt->MultiTexCoord4f;
+   tab->MultiTexCoord4fv = vfmt->MultiTexCoord4fv;
    tab->Normal3f = vfmt->Normal3f;
    tab->Normal3fv = vfmt->Normal3fv;
    tab->SecondaryColor3fEXT = vfmt->SecondaryColor3fEXT;
diff --git a/src/mesa/main/vtxfmt_tmp.h b/src/mesa/main/vtxfmt_tmp.h
index 028e6dd9da..890d15d958 100644
--- a/src/mesa/main/vtxfmt_tmp.h
+++ b/src/mesa/main/vtxfmt_tmp.h
@@ -1,4 +1,4 @@
-/* $Id: vtxfmt_tmp.h,v 1.4 2001/03/12 00:48:39 gareth Exp $ */
+/* $Id: vtxfmt_tmp.h,v 1.5 2001/11/18 22:48:13 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -163,54 +163,54 @@ static void TAG(Materialfv)( GLenum face, GLenum pname, const GLfloat *v )
    glMaterialfv( face, pname, v );
 }
 
-static void TAG(MultiTexCoord1fARB)( GLenum target, GLfloat a )
+static void TAG(MultiTexCoord1f)( GLenum target, GLfloat a )
 {
-   PRE_LOOPBACK( MultiTexCoord1fARB );
-   glMultiTexCoord1fARB( target, a );
+   PRE_LOOPBACK( MultiTexCoord1f );
+   glMultiTexCoord1f( target, a );
 }
 
-static void TAG(MultiTexCoord1fvARB)( GLenum target, const GLfloat *tc )
+static void TAG(MultiTexCoord1fv)( GLenum target, const GLfloat *tc )
 {
-   PRE_LOOPBACK( MultiTexCoord1fvARB );
-   glMultiTexCoord1fvARB( target, tc );
+   PRE_LOOPBACK( MultiTexCoord1fv );
+   glMultiTexCoord1fv( target, tc );
 }
 
-static void TAG(MultiTexCoord2fARB)( GLenum target, GLfloat a, GLfloat b )
+static void TAG(MultiTexCoord2f)( GLenum target, GLfloat a, GLfloat b )
 {
-   PRE_LOOPBACK( MultiTexCoord2fARB );
-   glMultiTexCoord2fARB( target, a, b );
+   PRE_LOOPBACK( MultiTexCoord2f );
+   glMultiTexCoord2f( target, a, b );
 }
 
-static void TAG(MultiTexCoord2fvARB)( GLenum target, const GLfloat *tc )
+static void TAG(MultiTexCoord2fv)( GLenum target, const GLfloat *tc )
 {
-   PRE_LOOPBACK( MultiTexCoord2fvARB );
-   glMultiTexCoord2fvARB( target, tc );
+   PRE_LOOPBACK( MultiTexCoord2fv );
+   glMultiTexCoord2fv( target, tc );
 }
 
-static void TAG(MultiTexCoord3fARB)( GLenum target, GLfloat a,
+static void TAG(MultiTexCoord3f)( GLenum target, GLfloat a,
 				     GLfloat b, GLfloat c )
 {
-   PRE_LOOPBACK( MultiTexCoord3fARB );
-   glMultiTexCoord3fARB( target, a, b, c );
+   PRE_LOOPBACK( MultiTexCoord3f );
+   glMultiTexCoord3f( target, a, b, c );
 }
 
-static void TAG(MultiTexCoord3fvARB)( GLenum target, const GLfloat *tc )
+static void TAG(MultiTexCoord3fv)( GLenum target, const GLfloat *tc )
 {
-   PRE_LOOPBACK( MultiTexCoord3fvARB );
-   glMultiTexCoord3fvARB( target, tc );
+   PRE_LOOPBACK( MultiTexCoord3fv );
+   glMultiTexCoord3fv( target, tc );
 }
 
-static void TAG(MultiTexCoord4fARB)( GLenum target, GLfloat a,
+static void TAG(MultiTexCoord4f)( GLenum target, GLfloat a,
 				     GLfloat b, GLfloat c, GLfloat d )
 {
-   PRE_LOOPBACK( MultiTexCoord4fARB );
-   glMultiTexCoord4fARB( target, a, b, c, d );
+   PRE_LOOPBACK( MultiTexCoord4f );
+   glMultiTexCoord4f( target, a, b, c, d );
 }
 
-static void TAG(MultiTexCoord4fvARB)( GLenum target, const GLfloat *tc )
+static void TAG(MultiTexCoord4fv)( GLenum target, const GLfloat *tc )
 {
-   PRE_LOOPBACK( MultiTexCoord4fvARB );
-   glMultiTexCoord4fvARB( target, tc );
+   PRE_LOOPBACK( MultiTexCoord4fv );
+   glMultiTexCoord4fv( target, tc );
 }
 
 static void TAG(Normal3f)( GLfloat a, GLfloat b, GLfloat c )
@@ -415,14 +415,14 @@ static GLvertexformat TAG(vtxfmt) = {
    TAG(Indexi),
    TAG(Indexiv),
    TAG(Materialfv),
-   TAG(MultiTexCoord1fARB),
-   TAG(MultiTexCoord1fvARB),
-   TAG(MultiTexCoord2fARB),
-   TAG(MultiTexCoord2fvARB),
-   TAG(MultiTexCoord3fARB),
-   TAG(MultiTexCoord3fvARB),
-   TAG(MultiTexCoord4fARB),
-   TAG(MultiTexCoord4fvARB),
+   TAG(MultiTexCoord1f),
+   TAG(MultiTexCoord1fv),
+   TAG(MultiTexCoord2f),
+   TAG(MultiTexCoord2fv),
+   TAG(MultiTexCoord3f),
+   TAG(MultiTexCoord3fv),
+   TAG(MultiTexCoord4f),
+   TAG(MultiTexCoord4fv),
    TAG(Normal3f),
    TAG(Normal3fv),
    TAG(SecondaryColor3fEXT),