dispatch changes to minimize hassle with XFree86 libGL

1 files changed, 42 insertions, 42 deletions

diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index ea6d6d7663..768d3ac707 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -1,4 +1,4 @@
-/* $Id: dlist.c,v 1.78 2001/11/18 23:52:37 brianp Exp $ */
+/* $Id: dlist.c,v 1.79 2001/12/04 23:43:31 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -2490,7 +2490,7 @@ save_PointParameterfvEXT( GLenum pname, const GLfloat *params )
       n[4].f = params[2];
    }
    if (ctx->ExecuteFlag) {
-      (*ctx->Exec->PointParameterfvARB)( pname, params );
+      (*ctx->Exec->PointParameterfvEXT)( pname, params );
    }
 }
 
@@ -3658,7 +3658,7 @@ static void save_ActiveTextureARB( GLenum target )
       n[1].e = target;
    }
    if (ctx->ExecuteFlag) {
-      (*ctx->Exec->ActiveTexture)( target );
+      (*ctx->Exec->ActiveTextureARB)( target );
    }
 }
 
@@ -3725,8 +3725,8 @@ save_CompressedTexImage1DARB(GLenum target, GLint level,
    GET_CURRENT_CONTEXT(ctx);
    if (target == GL_PROXY_TEXTURE_1D) {
       /* don't compile, execute immediately */
-      (*ctx->Exec->CompressedTexImage1D)(target, level, internalFormat,
-                                         width, border, imageSize, data);
+      (*ctx->Exec->CompressedTexImage1DARB)(target, level, internalFormat,
+                                            width, border, imageSize, data);
    }
    else {
       Node *n;
@@ -3753,8 +3753,8 @@ save_CompressedTexImage1DARB(GLenum target, GLint level,
          FREE(image);
       }
       if (ctx->ExecuteFlag) {
-         (*ctx->Exec->CompressedTexImage1D)(target, level, internalFormat,
-                                            width, border, imageSize, data);
+         (*ctx->Exec->CompressedTexImage1DARB)(target, level, internalFormat,
+                                               width, border, imageSize, data);
       }
    }
 }
@@ -3769,7 +3769,7 @@ save_CompressedTexImage2DARB(GLenum target, GLint level,
    GET_CURRENT_CONTEXT(ctx);
    if (target == GL_PROXY_TEXTURE_2D) {
       /* don't compile, execute immediately */
-      (*ctx->Exec->CompressedTexImage2D)(target, level, internalFormat,
+      (*ctx->Exec->CompressedTexImage2DARB)(target, level, internalFormat,
                                        width, height, border, imageSize, data);
    }
    else {
@@ -3798,7 +3798,7 @@ save_CompressedTexImage2DARB(GLenum target, GLint level,
          FREE(image);
       }
       if (ctx->ExecuteFlag) {
-         (*ctx->Exec->CompressedTexImage2D)(target, level, internalFormat,
+         (*ctx->Exec->CompressedTexImage2DARB)(target, level, internalFormat,
                                       width, height, border, imageSize, data);
       }
    }
@@ -3814,7 +3814,7 @@ save_CompressedTexImage3DARB(GLenum target, GLint level,
    GET_CURRENT_CONTEXT(ctx);
    if (target == GL_PROXY_TEXTURE_3D) {
       /* don't compile, execute immediately */
-      (*ctx->Exec->CompressedTexImage3D)(target, level, internalFormat,
+      (*ctx->Exec->CompressedTexImage3DARB)(target, level, internalFormat,
                                 width, height, depth, border, imageSize, data);
    }
    else {
@@ -3844,7 +3844,7 @@ save_CompressedTexImage3DARB(GLenum target, GLint level,
          FREE(image);
       }
       if (ctx->ExecuteFlag) {
-         (*ctx->Exec->CompressedTexImage3D)(target, level, internalFormat,
+         (*ctx->Exec->CompressedTexImage3DARB)(target, level, internalFormat,
                                 width, height, depth, border, imageSize, data);
       }
    }
@@ -3883,7 +3883,7 @@ save_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset,
       FREE(image);
    }
    if (ctx->ExecuteFlag) {
-      (*ctx->Exec->CompressedTexSubImage1D)(target, level, xoffset,
+      (*ctx->Exec->CompressedTexSubImage1DARB)(target, level, xoffset,
                                             width, format, imageSize, data);
    }
 }
@@ -3924,7 +3924,7 @@ save_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset,
       FREE(image);
    }
    if (ctx->ExecuteFlag) {
-      (*ctx->Exec->CompressedTexSubImage2D)(target, level, xoffset, yoffset,
+      (*ctx->Exec->CompressedTexSubImage2DARB)(target, level, xoffset, yoffset,
                                        width, height, format, imageSize, data);
    }
 }
@@ -3967,7 +3967,7 @@ save_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,
       FREE(image);
    }
    if (ctx->ExecuteFlag) {
-      (*ctx->Exec->CompressedTexSubImage3D)(target, level, xoffset, yoffset,
+      (*ctx->Exec->CompressedTexSubImage3DARB)(target, level, xoffset, yoffset,
                        zoffset, width, height, depth, format, imageSize, data);
    }
 }
@@ -3986,7 +3986,7 @@ save_SampleCoverageARB(GLclampf value, GLboolean invert)
       n[2].b = invert;
    }
    if (ctx->ExecuteFlag) {
-      (*ctx->Exec->SampleCoverage)( value, invert );
+      (*ctx->Exec->SampleCoverageARB)( value, invert );
    }
 }
 
@@ -4487,7 +4487,7 @@ execute_list( GLcontext *ctx, GLuint list )
 		params[0] = n[2].f;
 		params[1] = n[3].f;
 		params[2] = n[4].f;
-		(*ctx->Exec->PointParameterfvARB)( n[1].e, params );
+		(*ctx->Exec->PointParameterfvEXT)( n[1].e, params );
 	    }
 	    break;
 	 case OPCODE_POLYGON_MODE:
@@ -4676,7 +4676,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->ActiveTexture)( n[1].e );
+            (*ctx->Exec->ActiveTextureARB)( n[1].e );
             break;
          case OPCODE_PIXEL_TEXGEN_SGIX:  /* GL_SGIX_pixel_texture */
             (*ctx->Exec->PixelTexGenSGIX)( n[1].e );
@@ -4685,32 +4685,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->CompressedTexImage1D)(n[1].e, n[2].i, n[3].e,
+            (*ctx->Exec->CompressedTexImage1DARB)(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->CompressedTexImage2D)(n[1].e, n[2].i, n[3].e,
+            (*ctx->Exec->CompressedTexImage2DARB)(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->CompressedTexImage3D)(n[1].e, n[2].i, n[3].e,
+            (*ctx->Exec->CompressedTexImage3DARB)(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->CompressedTexSubImage1D)(n[1].e, n[2].i, n[3].i,
+            (*ctx->Exec->CompressedTexSubImage1DARB)(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->CompressedTexSubImage2D)(n[1].e, n[2].i, n[3].i,
+            (*ctx->Exec->CompressedTexSubImage2DARB)(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->CompressedTexSubImage3D)(n[1].e, n[2].i, n[3].i,
+            (*ctx->Exec->CompressedTexSubImage3DARB)(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->SampleCoverage)(n[1].f, n[2].b);
+            (*ctx->Exec->SampleCoverageARB)(n[1].f, n[2].b);
             break;
 	 case OPCODE_WINDOW_POS_ARB: /* GL_ARB_window_pos */
             (*ctx->Exec->WindowPos3fARB)( n[1].f, n[2].f, n[3].f );
@@ -5375,7 +5375,7 @@ static void exec_GetCompressedTexImageARB(GLenum target, GLint level,
 {
    GET_CURRENT_CONTEXT(ctx);
    FLUSH_VERTICES(ctx, 0);
-   ctx->Exec->GetCompressedTexImage( target, level, img);
+   ctx->Exec->GetCompressedTexImageARB( target, level, img);
 }
 
 static void exec_VertexPointer(GLint size, GLenum type, GLsizei stride,
@@ -5607,7 +5607,7 @@ static void exec_ClientActiveTextureARB( GLenum target )
 {
    GET_CURRENT_CONTEXT(ctx);
    FLUSH_VERTICES(ctx, 0);
-   ctx->Exec->ClientActiveTexture(target);
+   ctx->Exec->ClientActiveTextureARB(target);
 }
 
 static void exec_SecondaryColorPointerEXT(GLint size, GLenum type,
@@ -5927,8 +5927,8 @@ _mesa_init_dlist_table( struct _glapi_table *table, GLuint tableSize )
 #endif
 
    /* 54. GL_EXT_point_parameters */
-   table->PointParameterfARB = save_PointParameterfEXT;
-   table->PointParameterfvARB = save_PointParameterfvEXT;
+   table->PointParameterfEXT = save_PointParameterfEXT;
+   table->PointParameterfvEXT = save_PointParameterfvEXT;
 
    /* 78. GL_EXT_paletted_texture */
 #if 0
@@ -5944,8 +5944,8 @@ _mesa_init_dlist_table( struct _glapi_table *table, GLuint tableSize )
    table->UnlockArraysEXT = exec_UnlockArraysEXT;
 
    /* GL_ARB_multitexture */
-   table->ActiveTexture = save_ActiveTextureARB;
-   table->ClientActiveTexture = exec_ClientActiveTextureARB;
+   table->ActiveTextureARB = save_ActiveTextureARB;
+   table->ClientActiveTextureARB = exec_ClientActiveTextureARB;
 
    /* GL_EXT_blend_func_separate */
    table->BlendFuncSeparateEXT = save_BlendFuncSeparateEXT;
@@ -5980,22 +5980,22 @@ _mesa_init_dlist_table( struct _glapi_table *table, GLuint tableSize )
    table->ResizeBuffersMESA = exec_ResizeBuffersMESA;
 
    /* GL_ARB_transpose_matrix */
-   table->LoadTransposeMatrixd = save_LoadTransposeMatrixdARB;
-   table->LoadTransposeMatrixf = save_LoadTransposeMatrixfARB;
-   table->MultTransposeMatrixd = save_MultTransposeMatrixdARB;
-   table->MultTransposeMatrixf = save_MultTransposeMatrixfARB;
+   table->LoadTransposeMatrixdARB = save_LoadTransposeMatrixdARB;
+   table->LoadTransposeMatrixfARB = save_LoadTransposeMatrixfARB;
+   table->MultTransposeMatrixdARB = save_MultTransposeMatrixdARB;
+   table->MultTransposeMatrixfARB = save_MultTransposeMatrixfARB;
 
    /* GL_ARB_multisample */
-   table->SampleCoverage = save_SampleCoverageARB;
+   table->SampleCoverageARB = save_SampleCoverageARB;
 
    /* ARB 12. GL_ARB_texture_compression */
-   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;
+   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;
 
    /* GL_EXT_secondary_color */
    table->SecondaryColorPointerEXT = exec_SecondaryColorPointerEXT;