Wrap every place that accesses a dispatch table with a macro. A new script-

generated file, called src/mesa/glapi/dispatch.h, is added.  This file
contains three macros for each API function.  It contains a GET, a SET, and
a CALL.  Each of the macros take a pointer to the context and a pointer to
the dispatch table.

In several threads on mesa3d-dev we discussed replacing _glapi_add_entrypoint
with a new function called _glapi_add_dispatch.  For this discussion, the
important difference between the two is that the caller of _glapi_add_dispatch
does *not* know what the dispatch offset will be at compile time.  Because of
this callers need to track the dispatch offset returned by
_glapi_add_dispatch.

http://marc.theaimsgroup.com/?t=111947074700001&r=1&w=2

The downside is that driver code then has to access the dispatch table two
different ways.  It accesses it using structure tags (e.g., exec->Begin) for
functions with fixed offsets and via a remap table (e.g., exec[
remap->NewExtensionFunction ]) for functions without fixed offsets. Yuck!

Using the macros allows both types of functions to be accessed
identically.  If a driver needs to set a pointer for Begin, it does
'SET_Begin(ctx, exec, my_begin_function)'.  If it needs to set a pointer
for NewExtensionFunction, it does 'SET_NewExtensionFunction(ctx, exec,
my_NewExtensionFunction_function)'.  Furthermore, if at some point in
the future a static offset is assigned for NewExtensionFunction, only
the macros need to change (instead of every single place that accesses a
table for that function).

This code differs slightly from the originally posted patches in that the
CALL, GET, and SET marcos no longer take a context pointer as a parameter.
Brian Paul had suggested that the remap table could be stored as a global
since it would be set at CreateScreen time and would be constant for all
contexts.  This change reflects that feedback.

http://marc.theaimsgroup.com/?t=112087194700001&r=1&w=2

2 files changed, 39 insertions, 35 deletions

diff --git a/src/mesa/drivers/dri/radeon/radeon_vtxfmt.c b/src/mesa/drivers/dri/radeon/radeon_vtxfmt.c
index b82c158e81..c5ea51cea9 100644
--- a/src/mesa/drivers/dri/radeon/radeon_vtxfmt.c
+++ b/src/mesa/drivers/dri/radeon/radeon_vtxfmt.c
@@ -57,6 +57,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "radeon_swtcl.h"
 #include "radeon_vtxfmt.h"
 
+#include "dispatch.h"
+
 static void radeonVtxfmtFlushVertices( GLcontext *, GLuint );
 
 static void count_func( const char *name,  struct dynfn *l )
@@ -387,7 +389,7 @@ static void VFMT_FALLBACK( const char *caller )
    assert(rmesa->dma.flush == 0);
    rmesa->vb.fell_back = GL_TRUE;
    rmesa->vb.installed = GL_FALSE;
-   GL_CALL(Begin)( prim );
+   CALL_Begin(GET_DISPATCH(), (prim));
    
    if (rmesa->vb.installed_color_3f_sz == 4)
       alpha = ctx->Current.Attrib[VERT_ATTRIB_COLOR0][3];
@@ -397,69 +399,69 @@ static void VFMT_FALLBACK( const char *caller )
    for (i = 0 ; i < nrverts; i++) {
       GLuint offset = 3;
       if (ind & RADEON_CP_VC_FRMT_N0) {
-	 GL_CALL(Normal3fv)( &tmp[i][offset] ); 
+	 CALL_Normal3fv(GET_DISPATCH(), (&tmp[i][offset]));
 	 offset += 3;
       }
 
       if (ind & RADEON_CP_VC_FRMT_PKCOLOR) {
 	 radeon_color_t *col = (radeon_color_t *)&tmp[i][offset];
-	 GL_CALL(Color4ub)( col->red, col->green, col->blue, col->alpha );
+	 CALL_Color4ub(GET_DISPATCH(), (col->red, col->green, col->blue, col->alpha));
 	 offset++;
       }
       else if (ind & RADEON_CP_VC_FRMT_FPALPHA) {
-	 GL_CALL(Color4fv)( &tmp[i][offset] ); 
+	 CALL_Color4fv(GET_DISPATCH(), (&tmp[i][offset]));
 	 offset+=4;
       } 
       else if (ind & RADEON_CP_VC_FRMT_FPCOLOR) {
-	 GL_CALL(Color3fv)( &tmp[i][offset] ); 
+	 CALL_Color3fv(GET_DISPATCH(), (&tmp[i][offset]));
 	 offset+=3;
       }
 
       if (ind & RADEON_CP_VC_FRMT_PKSPEC) {
 	 radeon_color_t *spec = (radeon_color_t *)&tmp[i][offset];
-	 GL_CALL(SecondaryColor3ubEXT)( spec->red, spec->green, spec->blue );
+	 CALL_SecondaryColor3ubEXT(GET_DISPATCH(), (spec->red, spec->green, spec->blue));
 	 offset++;
       }
 
       if (ind & RADEON_CP_VC_FRMT_ST0) {
-	 GL_CALL(TexCoord2fv)( &tmp[i][offset] ); 
+	 CALL_TexCoord2fv(GET_DISPATCH(), (&tmp[i][offset]));
 	 offset += 2;
       }
 
       if (ind & RADEON_CP_VC_FRMT_ST1) {
-	 GL_CALL(MultiTexCoord2fvARB)( GL_TEXTURE1_ARB, &tmp[i][offset] );
+	 CALL_MultiTexCoord2fvARB(GET_DISPATCH(), (GL_TEXTURE1_ARB, &tmp[i][offset]));
 	 offset += 2;
       }
-      GL_CALL(Vertex3fv)( &tmp[i][0] );
+      CALL_Vertex3fv(GET_DISPATCH(), (&tmp[i][0]));
    }
 
    /* Replay current vertex
     */
    if (ind & RADEON_CP_VC_FRMT_N0) 
-      GL_CALL(Normal3fv)( rmesa->vb.normalptr );
+      CALL_Normal3fv(GET_DISPATCH(), (rmesa->vb.normalptr));
 
    if (ind & RADEON_CP_VC_FRMT_PKCOLOR)
-      GL_CALL(Color4ub)( rmesa->vb.colorptr->red, rmesa->vb.colorptr->green, rmesa->vb.colorptr->blue, rmesa->vb.colorptr->alpha );
+      CALL_Color4ub(GET_DISPATCH(), (rmesa->vb.colorptr->red, rmesa->vb.colorptr->green, rmesa->vb.colorptr->blue, rmesa->vb.colorptr->alpha));
    else if (ind & RADEON_CP_VC_FRMT_FPALPHA)
-      GL_CALL(Color4fv)( rmesa->vb.floatcolorptr );
+      CALL_Color4fv(GET_DISPATCH(), (rmesa->vb.floatcolorptr));
    else if (ind & RADEON_CP_VC_FRMT_FPCOLOR) {
       if (rmesa->vb.installed_color_3f_sz == 4 && alpha != 1.0)
-	 GL_CALL(Color4f)( rmesa->vb.floatcolorptr[0],
-			   rmesa->vb.floatcolorptr[1],
-			   rmesa->vb.floatcolorptr[2],
-			   alpha );
+	 CALL_Color4f(GET_DISPATCH(), (rmesa->vb.floatcolorptr[0],
+				       rmesa->vb.floatcolorptr[1],
+				       rmesa->vb.floatcolorptr[2],
+				       alpha));
       else
-	 GL_CALL(Color3fv)( rmesa->vb.floatcolorptr );
+	 CALL_Color3fv(GET_DISPATCH(), (rmesa->vb.floatcolorptr));
    }
 
    if (ind & RADEON_CP_VC_FRMT_PKSPEC) 
-       GL_CALL(SecondaryColor3ubEXT)( rmesa->vb.specptr->red, rmesa->vb.specptr->green, rmesa->vb.specptr->blue ); 
+       CALL_SecondaryColor3ubEXT(GET_DISPATCH(), (rmesa->vb.specptr->red, rmesa->vb.specptr->green, rmesa->vb.specptr->blue));
 
    if (ind & RADEON_CP_VC_FRMT_ST0) 
-      GL_CALL(TexCoord2fv)( rmesa->vb.texcoordptr[0] );
+      CALL_TexCoord2fv(GET_DISPATCH(), (rmesa->vb.texcoordptr[0]));
 
    if (ind & RADEON_CP_VC_FRMT_ST1) 
-      GL_CALL(MultiTexCoord2fvARB)( GL_TEXTURE1_ARB, rmesa->vb.texcoordptr[1] );
+      CALL_MultiTexCoord2fvARB(GET_DISPATCH(), (GL_TEXTURE1_ARB, rmesa->vb.texcoordptr[1]));
 }
 
 
@@ -758,7 +760,7 @@ static void radeon_Materialfv( GLenum face, GLenum pname,
 
    if (rmesa->vb.prim[0] != GL_POLYGON+1) {
       VFMT_FALLBACK( __FUNCTION__ );
-      GL_CALL(Materialfv)( face, pname, params );
+      CALL_Materialfv(GET_DISPATCH(), (face, pname, params));
       return;
    }
    _mesa_noop_Materialfv( face, pname, params );
@@ -797,7 +799,7 @@ static void radeon_Begin( GLenum mode )
       radeonVtxfmtValidate( ctx );
 
    if (!rmesa->vb.installed) {
-      GL_CALL(Begin)( mode );
+      CALL_Begin(GET_DISPATCH(), (mode));
       return;
    }
 
diff --git a/src/mesa/drivers/dri/radeon/radeon_vtxfmt_c.c b/src/mesa/drivers/dri/radeon/radeon_vtxfmt_c.c
index 3e8749a8cd..342b0b39c1 100644
--- a/src/mesa/drivers/dri/radeon/radeon_vtxfmt_c.c
+++ b/src/mesa/drivers/dri/radeon/radeon_vtxfmt_c.c
@@ -41,6 +41,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "radeon_vtxfmt.h"
 
+#include "dispatch.h"
+
 /* Fallback versions of all the entrypoints for situations where
  * codegen isn't available.  This is still a lot faster than the
  * vb/pipeline implementation in Mesa.
@@ -623,15 +625,15 @@ static void choose_##FN ARGS1						\
       fprintf(stderr, "%s -- cached codegen\n", __FUNCTION__ );		\
 									\
    if (dfn)								\
-      ctx->Exec->FN = (FNTYPE)(dfn->code);				\
+      SET_ ## FN (ctx->Exec, (FNTYPE)(dfn->code));			\
    else {								\
       if (RADEON_DEBUG & DEBUG_CODEGEN)					\
 	 fprintf(stderr, "%s -- generic version\n", __FUNCTION__ );	\
-      ctx->Exec->FN = radeon_##FN;					\
+      SET_ ## FN (ctx->Exec, radeon_##FN);				\
    }									\
 									\
    ctx->Driver.NeedFlush |= FLUSH_UPDATE_CURRENT;			\
-   ctx->Exec->FN ARGS2;							\
+   CALL_ ## FN (ctx->Exec, ARGS2);					\
 }
 
 
@@ -652,7 +654,7 @@ static void choose_##FN ARGS1						\
    struct dynfn *dfn;							\
 									\
    if (rmesa->vb.vertex_format & ACTIVE_PKCOLOR) {			\
-      ctx->Exec->FN = radeon_##FN##_ub;					\
+      SET_ ## FN (ctx->Exec, radeon_##FN##_ub);				\
    }									\
    else if ((rmesa->vb.vertex_format &					\
             (ACTIVE_FPCOLOR|ACTIVE_FPALPHA)) == ACTIVE_FPCOLOR) {	\
@@ -663,15 +665,15 @@ static void choose_##FN ARGS1						\
          if (ctx->Driver.NeedFlush & FLUSH_UPDATE_CURRENT) {		\
             radeon_copy_to_current( ctx );				\
             _mesa_install_exec_vtxfmt( ctx, &rmesa->vb.vtxfmt );	\
-            ctx->Exec->FN ARGS2;					\
+            CALL_ ## FN (ctx->Exec, ARGS2);				\
             return;							\
          }								\
       }									\
 									\
-      ctx->Exec->FN = radeon_##FN##_3f;					\
+      SET_ ## FN (ctx->Exec, radeon_##FN##_3f);				\
    }									\
    else {								\
-      ctx->Exec->FN = radeon_##FN##_4f;					\
+      SET_ ## FN (ctx->Exec, radeon_##FN##_4f);				\
    }									\
 									\
 									\
@@ -681,13 +683,13 @@ static void choose_##FN ARGS1						\
    if (dfn) {								\
       if (RADEON_DEBUG & DEBUG_CODEGEN)					\
          fprintf(stderr, "%s -- codegen version\n", __FUNCTION__ );	\
-      ctx->Exec->FN = (FNTYPE)dfn->code;				\
+      SET_ ## FN (ctx->Exec, (FNTYPE)dfn->code);			\
    }									\
    else if (RADEON_DEBUG & DEBUG_CODEGEN)				\
          fprintf(stderr, "%s -- 'c' version\n", __FUNCTION__ );		\
 									\
    ctx->Driver.NeedFlush |= FLUSH_UPDATE_CURRENT;			\
-   ctx->Exec->FN ARGS2;							\
+   CALL_ ## FN (ctx->Exec, ARGS2);					\
 }
 
 
@@ -712,16 +714,16 @@ static void choose_##FN ARGS1						\
       fprintf(stderr, "%s -- cached version\n", __FUNCTION__ );		\
 									\
    if (dfn)								\
-      ctx->Exec->FN = (FNTYPE)(dfn->code);				\
+      SET_ ## FN (ctx->Exec, (FNTYPE)(dfn->code));			\
    else {								\
       if (RADEON_DEBUG & DEBUG_CODEGEN)					\
          fprintf(stderr, "%s -- generic version\n", __FUNCTION__ );	\
-      ctx->Exec->FN = ((rmesa->vb.vertex_format & ACTIVE_PKSPEC) != 0)	\
-	  ? radeon_##FN##_ub : radeon_##FN##_3f;			\
+      SET_ ## FN (ctx->Exec, ((rmesa->vb.vertex_format & ACTIVE_PKSPEC) != 0)	\
+	  ? radeon_##FN##_ub : radeon_##FN##_3f);			\
    }									\
 									\
    ctx->Driver.NeedFlush |= FLUSH_UPDATE_CURRENT;			\
-   ctx->Exec->FN ARGS2;							\
+   CALL_ ## FN (ctx->Exec, ARGS2);					\
 }