remove vtxfmt code, switch over to vbo

12 files changed, 9 insertions, 3573 deletions

diff --git a/src/mesa/drivers/dri/r200/Makefile b/src/mesa/drivers/dri/r200/Makefile
index 75c09ff867e..e9144ac75ce 100644
--- a/src/mesa/drivers/dri/r200/Makefile
+++ b/src/mesa/drivers/dri/r200/Makefile
@@ -26,10 +26,6 @@ DRIVER_SOURCES = r200_context.c \
 		 r200_span.c \
 		 r200_maos.c \
 		 r200_sanity.c \
-		 r200_vtxfmt.c \
-		 r200_vtxfmt_c.c \
-		 r200_vtxfmt_sse.c \
-		 r200_vtxfmt_x86.c \
 		 r200_fragshader.c \
 		 r200_vertprog.c \
 		 radeon_screen.c \
@@ -37,7 +33,7 @@ DRIVER_SOURCES = r200_context.c \
 
 C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES)
 
-X86_SOURCES = r200_vtxtmp_x86.S
+X86_SOURCES = 
 
 DRIVER_DEFINES = -DRADEON_COMMON=1 -DRADEON_COMMON_FOR_R200
 
diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c
index 9cec50147df..02651587a6f 100644
--- a/src/mesa/drivers/dri/r200/r200_context.c
+++ b/src/mesa/drivers/dri/r200/r200_context.c
@@ -45,7 +45,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "swrast/swrast.h"
 #include "swrast_setup/swrast_setup.h"
-#include "array_cache/acache.h"
+#include "vbo/vbo.h"
 
 #include "tnl/tnl.h"
 #include "tnl/t_pipeline.h"
@@ -60,7 +60,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "r200_tex.h"
 #include "r200_swtcl.h"
 #include "r200_tcl.h"
-#include "r200_vtxfmt.h"
 #include "r200_maos.h"
 #include "r200_vertprog.h"
 
@@ -434,7 +433,7 @@ GLboolean r200CreateContext( const __GLcontextModes *glVisual,
    /* Initialize the software rasterizer and helper modules.
     */
    _swrast_CreateContext( ctx );
-   _ac_CreateContext( ctx );
+   _vbo_CreateContext( ctx );
    _tnl_CreateContext( ctx );
    _swsetup_CreateContext( ctx );
    _ae_create_context( ctx );
@@ -447,7 +446,7 @@ GLboolean r200CreateContext( const __GLcontextModes *glVisual,
 
    /* Try and keep materials and vertices separate:
     */
-   _tnl_isolate_materials( ctx, GL_TRUE );
+/*    _tnl_isolate_materials( ctx, GL_TRUE ); */
 
 
    /* Configure swrast and TNL to match hardware characteristics:
@@ -552,12 +551,6 @@ GLboolean r200CreateContext( const __GLcontextModes *glVisual,
       TCL_FALLBACK(rmesa->glCtx, R200_TCL_FALLBACK_TCL_DISABLE, 1);
    }
 
-   if (rmesa->r200Screen->chip_flags & RADEON_CHIPSET_TCL) {
-      if (tcl_mode >= DRI_CONF_TCL_VTXFMT)
-	 r200VtxfmtInit( ctx, tcl_mode >= DRI_CONF_TCL_CODEGEN );
-
-      _tnl_need_dlist_norm_lengths( ctx, GL_FALSE );
-   }
    return GL_TRUE;
 }
 
@@ -587,7 +580,7 @@ void r200DestroyContext( __DRIcontextPrivate *driContextPriv )
       release_texture_heaps = (rmesa->glCtx->Shared->RefCount == 1);
       _swsetup_DestroyContext( rmesa->glCtx );
       _tnl_DestroyContext( rmesa->glCtx );
-      _ac_DestroyContext( rmesa->glCtx );
+      _vbo_DestroyContext( rmesa->glCtx );
       _swrast_DestroyContext( rmesa->glCtx );
 
       r200DestroySwtcl( rmesa->glCtx );
@@ -598,12 +591,6 @@ void r200DestroyContext( __DRIcontextPrivate *driContextPriv )
 	 r200FlushCmdBuf( rmesa, __FUNCTION__ );
       }
 
-      if (!(rmesa->TclFallback & R200_TCL_FALLBACK_TCL_DISABLE)) {
-	 int tcl_mode = driQueryOptioni(&rmesa->optionCache, "tcl_mode");
-	 if (tcl_mode >= DRI_CONF_TCL_VTXFMT)
-	    r200VtxfmtDestroy( rmesa->glCtx );
-      }
-
       if (rmesa->state.scissor.pClipRects) {
 	 FREE(rmesa->state.scissor.pClipRects);
 	 rmesa->state.scissor.pClipRects = NULL;
@@ -713,9 +700,6 @@ r200MakeCurrent( __DRIcontextPrivate *driContextPriv,
 			  (GLframebuffer *) driDrawPriv->driverPrivate,
 			  (GLframebuffer *) driReadPriv->driverPrivate );
 
-      if (newCtx->vb.enabled)
-	 r200VtxfmtMakeCurrent( newCtx->glCtx );
-
       _mesa_update_state( newCtx->glCtx );
       r200ValidateState( newCtx->glCtx );
 
@@ -740,6 +724,5 @@ r200UnbindContext( __DRIcontextPrivate *driContextPriv )
    if (R200_DEBUG & DEBUG_DRI)
       fprintf(stderr, "%s ctx %p\n", __FUNCTION__, (void *)rmesa->glCtx);
 
-   r200VtxfmtUnbindContext( rmesa->glCtx );
    return GL_TRUE;
 }
diff --git a/src/mesa/drivers/dri/r200/r200_state.c b/src/mesa/drivers/dri/r200/r200_state.c
index 097fbc868a4..e68f1e30f3a 100644
--- a/src/mesa/drivers/dri/r200/r200_state.c
+++ b/src/mesa/drivers/dri/r200/r200_state.c
@@ -42,7 +42,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "light.h"
 
 #include "swrast/swrast.h"
-#include "array_cache/acache.h"
+#include "vbo/vbo.h"
 #include "tnl/tnl.h"
 #include "tnl/t_pipeline.h"
 #include "swrast_setup/swrast_setup.h"
@@ -53,7 +53,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "r200_tcl.h"
 #include "r200_tex.h"
 #include "r200_swtcl.h"
-#include "r200_vtxfmt.h"
 #include "r200_vertprog.h"
 
 #include "drirenderbuffer.h"
@@ -2517,11 +2516,10 @@ static void r200InvalidateState( GLcontext *ctx, GLuint new_state )
 {
    _swrast_InvalidateState( ctx, new_state );
    _swsetup_InvalidateState( ctx, new_state );
-   _ac_InvalidateState( ctx, new_state );
+   _vbo_InvalidateState( ctx, new_state );
    _tnl_InvalidateState( ctx, new_state );
    _ae_invalidate_state( ctx, new_state );
    R200_CONTEXT(ctx)->NewGLState |= new_state;
-   r200VtxfmtInvalidate( ctx );
 }
 
 /* A hack.  The r200 can actually cope just fine with materials
diff --git a/src/mesa/drivers/dri/r200/r200_state_init.c b/src/mesa/drivers/dri/r200/r200_state_init.c
index d95a80c7bbc..b40d0bdcb7c 100644
--- a/src/mesa/drivers/dri/r200/r200_state_init.c
+++ b/src/mesa/drivers/dri/r200/r200_state_init.c
@@ -39,7 +39,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "api_arrayelt.h"
 
 #include "swrast/swrast.h"
-#include "array_cache/acache.h"
+#include "vbo/vbo.h"
 #include "tnl/tnl.h"
 #include "tnl/t_pipeline.h"
 #include "swrast_setup/swrast_setup.h"
@@ -50,7 +50,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "r200_tcl.h"
 #include "r200_tex.h"
 #include "r200_swtcl.h"
-#include "r200_vtxfmt.h"
 
 #include "xmlpool.h"
 
diff --git a/src/mesa/drivers/dri/r200/r200_swtcl.c b/src/mesa/drivers/dri/r200/r200_swtcl.c
index c14a275f7a3..25d229d8ed6 100644
--- a/src/mesa/drivers/dri/r200/r200_swtcl.c
+++ b/src/mesa/drivers/dri/r200/r200_swtcl.c
@@ -48,7 +48,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "tnl/tnl.h"
 #include "tnl/t_context.h"
 #include "tnl/t_pipeline.h"
-#include "tnl/t_vtx_api.h"
 
 #include "r200_context.h"
 #include "r200_ioctl.h"
@@ -936,13 +935,6 @@ r200PointsBitmap( GLcontext *ctx, GLint px, GLint py,
 }
 
 
-void r200FlushVertices( GLcontext *ctx, GLuint flags )
-{
-   _tnl_FlushVertices( ctx, flags );
-
-   if (flags & FLUSH_STORED_VERTICES)
-      R200_NEWPRIM( R200_CONTEXT( ctx ) );
-}
 
 /**********************************************************************/
 /*                            Initialization.                         */
diff --git a/src/mesa/drivers/dri/r200/r200_tcl.c b/src/mesa/drivers/dri/r200/r200_tcl.c
index dab478db92d..0b3bb281e01 100644
--- a/src/mesa/drivers/dri/r200/r200_tcl.c
+++ b/src/mesa/drivers/dri/r200/r200_tcl.c
@@ -40,7 +40,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "colormac.h"
 #include "light.h"
 
-#include "array_cache/acache.h"
+#include "vbo/vbo.h"
 #include "tnl/tnl.h"
 #include "tnl/t_pipeline.h"
 
diff --git a/src/mesa/drivers/dri/r200/r200_vtxfmt.c b/src/mesa/drivers/dri/r200/r200_vtxfmt.c
deleted file mode 100644
index d73fbbafd5f..00000000000
--- a/src/mesa/drivers/dri/r200/r200_vtxfmt.c
+++ /dev/null
@@ -1,1234 +0,0 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/r200/r200_vtxfmt.c,v 1.4 2003/05/06 23:52:08 daenzer Exp $ */
-/*
-Copyright (C) The Weather Channel, Inc.  2002.  All Rights Reserved.
-
-The Weather Channel (TM) funded Tungsten Graphics to develop the
-initial release of the Radeon 8500 driver under the XFree86 license.
-This notice must be preserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial
-portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-**************************************************************************/
-
-/*
- * Authors:
- *   Keith Whitwell <[email protected]>
- */
-
-#include "glheader.h"
-#include "imports.h"
-#include "r200_context.h"
-#include "r200_state.h"
-#include "r200_ioctl.h"
-#include "r200_tex.h"
-#include "r200_tcl.h"
-#include "r200_swtcl.h"
-#include "r200_vtxfmt.h"
-
-#include "api_noop.h"
-#include "api_arrayelt.h"
-#include "context.h"
-#include "mtypes.h"
-#include "enums.h"
-#include "glapi.h"
-#include "colormac.h"
-#include "light.h"
-#include "state.h"
-#include "vtxfmt.h"
-
-#include "tnl/tnl.h"
-#include "tnl/t_context.h"
-#include "tnl/t_array_api.h"
-#include "tnl/t_save_api.h"
-
-#include "dispatch.h"
-
-static void r200VtxFmtFlushVertices( GLcontext *, GLuint );
-
-static void count_func( const char *name,  struct dynfn *l )
-{
-   int i = 0;
-   struct dynfn *f;
-   foreach (f, l) i++;
-   if (i) fprintf(stderr, "%s: %d\n", name, i );
-}
-
-static void count_funcs( r200ContextPtr rmesa )
-{
-   count_func( "Vertex2f", &rmesa->vb.dfn_cache.Vertex2f );
-   count_func( "Vertex2fv", &rmesa->vb.dfn_cache.Vertex2fv );
-   count_func( "Vertex3f", &rmesa->vb.dfn_cache.Vertex3f );
-   count_func( "Vertex3fv", &rmesa->vb.dfn_cache.Vertex3fv );
-   count_func( "Color4ub", &rmesa->vb.dfn_cache.Color4ub ); 
-   count_func( "Color4ubv", &rmesa->vb.dfn_cache.Color4ubv ); 
-   count_func( "Color3ub", &rmesa->vb.dfn_cache.Color3ub ); 
-   count_func( "Color3ubv", &rmesa->vb.dfn_cache.Color3ubv ); 
-   count_func( "Color4f", &rmesa->vb.dfn_cache.Color4f );
-   count_func( "Color4fv", &rmesa->vb.dfn_cache.Color4fv );
-   count_func( "Color3f", &rmesa->vb.dfn_cache.Color3f );
-   count_func( "Color3fv", &rmesa->vb.dfn_cache.Color3fv );
-   count_func( "SecondaryColor3f", &rmesa->vb.dfn_cache.SecondaryColor3fEXT );
-   count_func( "SecondaryColor3fv", &rmesa->vb.dfn_cache.SecondaryColor3fvEXT );
-   count_func( "SecondaryColor3ub", &rmesa->vb.dfn_cache.SecondaryColor3ubEXT );
-   count_func( "SecondaryColor3ubv", &rmesa->vb.dfn_cache.SecondaryColor3ubvEXT );
-   count_func( "Normal3f", &rmesa->vb.dfn_cache.Normal3f );
-   count_func( "Normal3fv", &rmesa->vb.dfn_cache.Normal3fv );
-   count_func( "TexCoord3f", &rmesa->vb.dfn_cache.TexCoord3f );
-   count_func( "TexCoord3fv", &rmesa->vb.dfn_cache.TexCoord3fv );
-   count_func( "TexCoord2f", &rmesa->vb.dfn_cache.TexCoord2f );
-   count_func( "TexCoord2fv", &rmesa->vb.dfn_cache.TexCoord2fv );
-   count_func( "TexCoord1f", &rmesa->vb.dfn_cache.TexCoord1f );
-   count_func( "TexCoord1fv", &rmesa->vb.dfn_cache.TexCoord1fv );
-   count_func( "MultiTexCoord3fARB", &rmesa->vb.dfn_cache.MultiTexCoord3fARB );
-   count_func( "MultiTexCoord3fvARB", &rmesa->vb.dfn_cache.MultiTexCoord3fvARB );
-   count_func( "MultiTexCoord2fARB", &rmesa->vb.dfn_cache.MultiTexCoord2fARB );
-   count_func( "MultiTexCoord2fvARB", &rmesa->vb.dfn_cache.MultiTexCoord2fvARB );
-   count_func( "MultiTexCoord1fARB", &rmesa->vb.dfn_cache.MultiTexCoord1fARB );
-   count_func( "MultiTexCoord1fvARB", &rmesa->vb.dfn_cache.MultiTexCoord1fvARB );
-/*   count_func( "FogCoordfEXT", &rmesa->vb.dfn_cache.FogCoordfEXT );
-   count_func( "FogCoordfvEXT", &rmesa->vb.dfn_cache.FogCoordfvEXT );*/
-}
-
-static void r200NewList( GLcontext *ctx, GLuint list, GLenum mode )
-{
-   VFMT_FALLBACK( __FUNCTION__ );
-   _tnl_NewList( ctx, list, mode );
-   return;
-}
-
-void r200_copy_to_current( GLcontext *ctx ) 
-{
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   unsigned i;
-
-   if (R200_DEBUG & DEBUG_VFMT)
-      fprintf(stderr, "%s\n", __FUNCTION__);
-
-   assert(ctx->Driver.NeedFlush & FLUSH_UPDATE_CURRENT);
-
-   if (rmesa->vb.vtxfmt_0 & R200_VTX_N0) {
-      ctx->Current.Attrib[VERT_ATTRIB_NORMAL][0] = rmesa->vb.normalptr[0];
-      ctx->Current.Attrib[VERT_ATTRIB_NORMAL][1] = rmesa->vb.normalptr[1];
-      ctx->Current.Attrib[VERT_ATTRIB_NORMAL][2] = rmesa->vb.normalptr[2];
-   }
-
-   if (rmesa->vb.vtxfmt_0 & R200_VTX_DISCRETE_FOG) {
-      ctx->Current.Attrib[VERT_ATTRIB_FOG][0] = rmesa->vb.fogptr[0];
-   }
-
-   switch( VTX_COLOR(rmesa->vb.vtxfmt_0, 0) ) {
-   case R200_VTX_PK_RGBA:
-      ctx->Current.Attrib[VERT_ATTRIB_COLOR0][0] = UBYTE_TO_FLOAT( rmesa->vb.colorptr->red );
-      ctx->Current.Attrib[VERT_ATTRIB_COLOR0][1] = UBYTE_TO_FLOAT( rmesa->vb.colorptr->green );
-      ctx->Current.Attrib[VERT_ATTRIB_COLOR0][2] = UBYTE_TO_FLOAT( rmesa->vb.colorptr->blue );
-      ctx->Current.Attrib[VERT_ATTRIB_COLOR0][3] = UBYTE_TO_FLOAT( rmesa->vb.colorptr->alpha );
-      break;
-
-   case R200_VTX_FP_RGB:
-      ctx->Current.Attrib[VERT_ATTRIB_COLOR0][0] = rmesa->vb.floatcolorptr[0];
-      ctx->Current.Attrib[VERT_ATTRIB_COLOR0][1] = rmesa->vb.floatcolorptr[1];
-      ctx->Current.Attrib[VERT_ATTRIB_COLOR0][2] = rmesa->vb.floatcolorptr[2];
-      break;
-
-   case R200_VTX_FP_RGBA:
-      ctx->Current.Attrib[VERT_ATTRIB_COLOR0][0] = rmesa->vb.floatcolorptr[0];
-      ctx->Current.Attrib[VERT_ATTRIB_COLOR0][1] = rmesa->vb.floatcolorptr[1];
-      ctx->Current.Attrib[VERT_ATTRIB_COLOR0][2] = rmesa->vb.floatcolorptr[2];
-      ctx->Current.Attrib[VERT_ATTRIB_COLOR0][3] = rmesa->vb.floatcolorptr[3];
-      break;
-      
-   default:
-      break;
-   }
-      
-   if (VTX_COLOR(rmesa->vb.vtxfmt_0, 1) == R200_VTX_PK_RGBA) {
-      ctx->Current.Attrib[VERT_ATTRIB_COLOR1][0] = UBYTE_TO_FLOAT( rmesa->vb.specptr->red );
-      ctx->Current.Attrib[VERT_ATTRIB_COLOR1][1] = UBYTE_TO_FLOAT( rmesa->vb.specptr->green );
-      ctx->Current.Attrib[VERT_ATTRIB_COLOR1][2] = UBYTE_TO_FLOAT( rmesa->vb.specptr->blue );
-   } 
-
-   for ( i = 0 ; i < ctx->Const.MaxTextureUnits ; i++ ) {
-      const unsigned count = VTX_TEXn_COUNT( rmesa->vb.vtxfmt_1, i );
-      GLfloat * const src = rmesa->vb.texcoordptr[i];
-
-      if ( count != 0 ) {
-	 switch( count ) {
-	 case 3:
-	    ctx->Current.Attrib[VERT_ATTRIB_TEX0+i][1] = src[1];
-	    ctx->Current.Attrib[VERT_ATTRIB_TEX0+i][2] = src[2];
-	    break;
-	 case 2:
-	    ctx->Current.Attrib[VERT_ATTRIB_TEX0+i][1] = src[1];
-	    ctx->Current.Attrib[VERT_ATTRIB_TEX0+i][2] = 0.0F;
-	    break;
-	 case 1:
-	    ctx->Current.Attrib[VERT_ATTRIB_TEX0+i][1] = 0.0F;
-	    ctx->Current.Attrib[VERT_ATTRIB_TEX0+i][2] = 0.0F;
-	    break;
-	 }
-
-	 ctx->Current.Attrib[VERT_ATTRIB_TEX0+i][0] = src[0];
-	 ctx->Current.Attrib[VERT_ATTRIB_TEX0+i][3] = 1.0F;
-      }
-   }
-
-   ctx->Driver.NeedFlush &= ~FLUSH_UPDATE_CURRENT;
-}
-
-static GLboolean discreet_gl_prim[GL_POLYGON+1] = {
-   1,				/* 0 points */
-   1,				/* 1 lines */
-   0,				/* 2 line_strip */
-   0,				/* 3 line_loop */
-   1,				/* 4 tris */
-   0,				/* 5 tri_fan */
-   0,				/* 6 tri_strip */
-   1,				/* 7 quads */
-   0,				/* 8 quadstrip */
-   0,				/* 9 poly */
-};
-
-static void flush_prims( r200ContextPtr rmesa )
-{
-   int i,j;
-   struct r200_dma_region tmp = rmesa->dma.current;
-   
-   tmp.buf->refcount++;
-   tmp.aos_size = rmesa->vb.vertex_size;
-   tmp.aos_stride = rmesa->vb.vertex_size;
-   tmp.aos_start = GET_START(&tmp);
-
-   rmesa->dma.current.ptr = rmesa->dma.current.start += 
-      (rmesa->vb.initial_counter - rmesa->vb.counter) * 
-      rmesa->vb.vertex_size * 4; 
-
-   rmesa->tcl.vertex_format = rmesa->vb.vtxfmt_0;
-   rmesa->tcl.aos_components[0] = &tmp;
-   rmesa->tcl.nr_aos_components = 1;
-   rmesa->dma.flush = NULL;
-
-   /* Optimize the primitive list:
-    */
-   if (rmesa->vb.nrprims > 1) {
-      for (j = 0, i = 1 ; i < rmesa->vb.nrprims; i++) {
-	 int pj = rmesa->vb.primlist[j].prim & 0xf;
-	 int pi = rmesa->vb.primlist[i].prim & 0xf;
-      
-	 if (pj == pi && discreet_gl_prim[pj] &&
-	     rmesa->vb.primlist[i].start == rmesa->vb.primlist[j].end) {
-	    rmesa->vb.primlist[j].end = rmesa->vb.primlist[i].end;
-	 }
-	 else {
-	    j++;
-	    if (j != i) rmesa->vb.primlist[j] = rmesa->vb.primlist[i];
-	 }
-      }
-      rmesa->vb.nrprims = j+1;
-   }
-
-   if (rmesa->vb.vtxfmt_0 != rmesa->hw.vtx.cmd[VTX_VTXFMT_0] ||
-       rmesa->vb.vtxfmt_1 != rmesa->hw.vtx.cmd[VTX_VTXFMT_1]) { 
-      R200_STATECHANGE( rmesa, vtx ); 
-      rmesa->hw.vtx.cmd[VTX_VTXFMT_0] = rmesa->vb.vtxfmt_0;
-      rmesa->hw.vtx.cmd[VTX_VTXFMT_1] = rmesa->vb.vtxfmt_1;
-   } 
-
-
-   for (i = 0 ; i < rmesa->vb.nrprims; i++) {
-      if (R200_DEBUG & DEBUG_PRIMS)
-	 fprintf(stderr, "vtxfmt prim %d: %s %d..%d\n", i,
-		 _mesa_lookup_enum_by_nr( rmesa->vb.primlist[i].prim & 
-					  PRIM_MODE_MASK ),
-		 rmesa->vb.primlist[i].start,
-		 rmesa->vb.primlist[i].end);
-
-      if (rmesa->vb.primlist[i].start < rmesa->vb.primlist[i].end)
-	 r200EmitPrimitive( rmesa->glCtx,
-			    rmesa->vb.primlist[i].start,
-			    rmesa->vb.primlist[i].end,
-			    rmesa->vb.primlist[i].prim );
-   }
-
-   rmesa->vb.nrprims = 0;
-   r200ReleaseDmaRegion( rmesa, &tmp, __FUNCTION__ );
-}
-
-
-static void start_prim( r200ContextPtr rmesa, GLuint mode )
-{
-   if (R200_DEBUG & DEBUG_VFMT)
-      fprintf(stderr, "%s %d\n", __FUNCTION__, 
-	      rmesa->vb.initial_counter - rmesa->vb.counter);
-
-   rmesa->vb.primlist[rmesa->vb.nrprims].start = 
-      rmesa->vb.initial_counter - rmesa->vb.counter;
-   rmesa->vb.primlist[rmesa->vb.nrprims].prim = mode;
-}
-
-static void note_last_prim( r200ContextPtr rmesa, GLuint flags )
-{
-   if (R200_DEBUG & DEBUG_VFMT)
-      fprintf(stderr, "%s %d\n", __FUNCTION__, 
-	      rmesa->vb.initial_counter - rmesa->vb.counter);
-
-   if (rmesa->vb.prim[0] != GL_POLYGON+1) {
-      rmesa->vb.primlist[rmesa->vb.nrprims].prim |= flags;
-      rmesa->vb.primlist[rmesa->vb.nrprims].end = 
-	 rmesa->vb.initial_counter - rmesa->vb.counter;
-
-      if (++(rmesa->vb.nrprims) == R200_MAX_PRIMS)
-	 flush_prims( rmesa );
-   }
-}
-
-
-static void copy_vertex( r200ContextPtr rmesa, GLuint n, GLfloat *dst )
-{
-   GLuint i;
-   GLfloat *src = (GLfloat *)(rmesa->dma.current.address + 
-			      rmesa->dma.current.ptr + 
-			      (rmesa->vb.primlist[rmesa->vb.nrprims].start + n) * 
-			      rmesa->vb.vertex_size * 4);
-
-   if (R200_DEBUG & DEBUG_VFMT) 
-      fprintf(stderr, "copy_vertex %d\n", rmesa->vb.primlist[rmesa->vb.nrprims].start + n);
-
-   for (i = 0 ; i < rmesa->vb.vertex_size; i++) {
-      dst[i] = src[i];
-   }
-}
-
-/* NOTE: This actually reads the copied vertices back from uncached
- * memory.  Could also use the counter/notify mechanism to populate
- * tmp on the fly as vertices are generated.  
- */
-static GLuint copy_dma_verts( r200ContextPtr rmesa, GLfloat (*tmp)[R200_MAX_VERTEX_SIZE] )
-{
-   GLuint ovf, i;
-   GLuint nr = (rmesa->vb.initial_counter - rmesa->vb.counter) - 
-      rmesa->vb.primlist[rmesa->vb.nrprims].start;
-
-   if (R200_DEBUG & DEBUG_VFMT)
-      fprintf(stderr, "%s %d verts\n", __FUNCTION__, nr);
-
-   switch( rmesa->vb.prim[0] )
-   {
-   case GL_POINTS:
-      return 0;
-   case GL_LINES:
-      ovf = nr&1;
-      for (i = 0 ; i < ovf ; i++)
-	 copy_vertex( rmesa, nr-ovf+i, tmp[i] );
-      return i;
-   case GL_TRIANGLES:
-      ovf = nr%3;
-      for (i = 0 ; i < ovf ; i++)
-	 copy_vertex( rmesa, nr-ovf+i, tmp[i] );
-      return i;
-   case GL_QUADS:
-      ovf = nr&3;
-      for (i = 0 ; i < ovf ; i++)
-	 copy_vertex( rmesa, nr-ovf+i, tmp[i] );
-      return i;
-   case GL_LINE_STRIP:
-      if (nr == 0) 
-	 return 0;
-      copy_vertex( rmesa, nr-1, tmp[0] );
-      return 1;
-   case GL_LINE_LOOP:
-   case GL_TRIANGLE_FAN:
-   case GL_POLYGON:
-      if (nr == 0) 
-	 return 0;
-      else if (nr == 1) {
-	 copy_vertex( rmesa, 0, tmp[0] );
-	 return 1;
-      } else {
-	 copy_vertex( rmesa, 0, tmp[0] );
-	 copy_vertex( rmesa, nr-1, tmp[1] );
-	 return 2;
-      }
-   case GL_TRIANGLE_STRIP:
-      ovf = MIN2( nr, 2 );
-      for (i = 0 ; i < ovf ; i++)
-	 copy_vertex( rmesa, nr-ovf+i, tmp[i] );
-      return i;
-   case GL_QUAD_STRIP:
-      switch (nr) {
-      case 0: ovf = 0; break;
-      case 1: ovf = 1; break;
-      default: ovf = 2 + (nr&1); break;
-      }
-      for (i = 0 ; i < ovf ; i++)
-	 copy_vertex( rmesa, nr-ovf+i, tmp[i] );
-      return i;
-   default:
-      assert(0);
-      return 0;
-   }
-}
-
-static void VFMT_FALLBACK_OUTSIDE_BEGIN_END( const char *caller )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-
-   if (R200_DEBUG & (DEBUG_VFMT|DEBUG_FALLBACKS))
-      fprintf(stderr, "%s from %s\n", __FUNCTION__, caller);
-
-   if (ctx->Driver.NeedFlush) 
-      r200VtxFmtFlushVertices( ctx, ctx->Driver.NeedFlush );
-
-   if (ctx->NewState)
-      _mesa_update_state( ctx ); /* clear state so fell_back sticks */
-
-   _tnl_wakeup_exec( ctx );
-   ctx->Driver.FlushVertices = r200FlushVertices;
-   ctx->Driver.NewList = _tnl_NewList;
-
-   assert( rmesa->dma.flush == 0 );
-   rmesa->vb.fell_back = GL_TRUE;
-   rmesa->vb.installed = GL_FALSE;
-}
-
-
-/**
- * \todo
- * An interesting optimization of this function would be to have 3 element
- * table with the dispatch offsets of the TexCoord?fv functions, use count
- * to look-up the table, and a specialized version of GL_CALL that used the
- * offset number instead of the name.
- */
-static void dispatch_multitexcoord( GLuint count, GLuint unit, GLfloat * f )
-{
-   switch( count ) {
-   case 3:
-      CALL_MultiTexCoord3fvARB(GET_DISPATCH(), (GL_TEXTURE0+unit, f));
-      break;
-   case 2:
-      CALL_MultiTexCoord2fvARB(GET_DISPATCH(), (GL_TEXTURE0+unit, f));
-      break;
-   case 1:
-      CALL_MultiTexCoord1fvARB(GET_DISPATCH(), (GL_TEXTURE0+unit, f));
-      break;
-   default:
-      assert( count == 0 );
-      break;
-   }
-}
-
-void VFMT_FALLBACK( const char *caller )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   GLfloat tmp[3][R200_MAX_VERTEX_SIZE];
-   GLuint i, prim;
-   GLuint ind0 = rmesa->vb.vtxfmt_0;
-   GLuint ind1 = rmesa->vb.vtxfmt_1;
-   GLuint nrverts;
-   GLfloat alpha = 1.0;
-   GLuint count;
-   GLuint unit;
-
-   if (R200_DEBUG & (DEBUG_FALLBACKS|DEBUG_VFMT))
-      fprintf(stderr, "%s from %s\n", __FUNCTION__, caller);
-
-   if (rmesa->vb.prim[0] == GL_POLYGON+1) {
-      VFMT_FALLBACK_OUTSIDE_BEGIN_END( __FUNCTION__ );
-      return;
-   }
-
-   /* Copy vertices out of dma:
-    */
-   nrverts = copy_dma_verts( rmesa, tmp );
-
-   /* Finish the prim at this point:
-    */
-   note_last_prim( rmesa, 0 );
-   flush_prims( rmesa );
-
-   /* Update ctx->Driver.CurrentExecPrimitive and swap in swtnl. 
-    */
-   prim = rmesa->vb.prim[0];
-   ctx->Driver.CurrentExecPrimitive = GL_POLYGON+1;
-   _tnl_wakeup_exec( ctx );
-   ctx->Driver.FlushVertices = r200FlushVertices;
-
-   assert(rmesa->dma.flush == 0);
-   rmesa->vb.fell_back = GL_TRUE;
-   rmesa->vb.installed = GL_FALSE;
-   CALL_Begin(GET_DISPATCH(), (prim));
-
-   if (rmesa->vb.installed_color_3f_sz == 4)
-      alpha = ctx->Current.Attrib[VERT_ATTRIB_COLOR0][3];
-
-   /* Replay saved vertices
-    */
-   for (i = 0 ; i < nrverts; i++) {
-      GLuint offset = 3;
-
-      if (ind0 & R200_VTX_N0) {
-	 CALL_Normal3fv(GET_DISPATCH(), (&tmp[i][offset]));
-	 offset += 3;
-      }
-
-      if (ind0 & R200_VTX_DISCRETE_FOG) {
-	 CALL_FogCoordfvEXT(GET_DISPATCH(), (&tmp[i][offset]));
-	 offset++;
-      }
-
-      if (VTX_COLOR(ind0, 0) == R200_VTX_PK_RGBA) {
-	 CALL_Color4ubv(GET_DISPATCH(), ((GLubyte *)&tmp[i][offset]));
-	 offset++;
-      }
-      else if (VTX_COLOR(ind0, 0) == R200_VTX_FP_RGBA) {
-	 CALL_Color4fv(GET_DISPATCH(), (&tmp[i][offset]));
-	 offset+=4;
-      } 
-      else if (VTX_COLOR(ind0, 0) == R200_VTX_FP_RGB) {
-	 CALL_Color3fv(GET_DISPATCH(), (&tmp[i][offset]));
-	 offset+=3;
-      }
-
-      if (VTX_COLOR(ind0, 1) == R200_VTX_PK_RGBA) {
-	 CALL_SecondaryColor3ubvEXT(GET_DISPATCH(), ((GLubyte *)&tmp[i][offset]));
-	 offset++;
-      }
-
-      for ( unit = 0 ; unit < ctx->Const.MaxTextureUnits ; unit++ ) {
-	 count = VTX_TEXn_COUNT( ind1, unit );
-	 dispatch_multitexcoord( count, unit, &tmp[i][offset] );
-	 offset += count;
-      }
-
-      CALL_Vertex3fv(GET_DISPATCH(), (&tmp[i][0]));
-   }
-
-   /* Replay current vertex
-    */
-   if (ind0 & R200_VTX_N0) 
-      CALL_Normal3fv(GET_DISPATCH(), (rmesa->vb.normalptr));
-   if (ind0 & R200_VTX_DISCRETE_FOG) {
-      CALL_FogCoordfvEXT(GET_DISPATCH(), (rmesa->vb.fogptr));
-   }
-
-   if (VTX_COLOR(ind0, 0) == R200_VTX_PK_RGBA) {
-      CALL_Color4ub(GET_DISPATCH(), (rmesa->vb.colorptr->red,
-				     rmesa->vb.colorptr->green,
-				     rmesa->vb.colorptr->blue,
-				     rmesa->vb.colorptr->alpha));
-   }
-   else if (VTX_COLOR(ind0, 0) == R200_VTX_FP_RGBA) {
-      CALL_Color4fv(GET_DISPATCH(), (rmesa->vb.floatcolorptr));
-   }
-   else if (VTX_COLOR(ind0, 0) == R200_VTX_FP_RGB) {
-      if (rmesa->vb.installed_color_3f_sz == 4 && alpha != 1.0) {
-	 CALL_Color4f(GET_DISPATCH(), (rmesa->vb.floatcolorptr[0],
-				       rmesa->vb.floatcolorptr[1],
-				       rmesa->vb.floatcolorptr[2],
-				       alpha));
-      }
-      else {
-	 CALL_Color3fv(GET_DISPATCH(), (rmesa->vb.floatcolorptr));
-      }
-   }
-
-   if (VTX_COLOR(ind0, 1) == R200_VTX_PK_RGBA) 
-       CALL_SecondaryColor3ubEXT(GET_DISPATCH(), (rmesa->vb.specptr->red, 
-						  rmesa->vb.specptr->green,
-						  rmesa->vb.specptr->blue));
-
-   for ( unit = 0 ; unit < ctx->Const.MaxTextureUnits ; unit++ ) {
-      count = VTX_TEXn_COUNT( ind1, unit );
-      dispatch_multitexcoord( count, unit, rmesa->vb.texcoordptr[unit] );
-   }
-}
-
-
-
-static void wrap_buffer( void )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   GLfloat tmp[3][R200_MAX_VERTEX_SIZE];
-   GLuint i, nrverts;
-
-   if (R200_DEBUG & (DEBUG_VFMT|DEBUG_PRIMS))
-      fprintf(stderr, "%s %d\n", __FUNCTION__,
-	      rmesa->vb.initial_counter - rmesa->vb.counter);
-
-   /* Don't deal with parity.
-    */
-   if ((((rmesa->vb.initial_counter - rmesa->vb.counter) -  
-	 rmesa->vb.primlist[rmesa->vb.nrprims].start) & 1)) {
-      rmesa->vb.counter++;
-      rmesa->vb.initial_counter++;
-      return;
-   }
-
-   /* Copy vertices out of dma:
-    */
-   if (rmesa->vb.prim[0] == GL_POLYGON+1) 
-      nrverts = 0;
-   else {
-      nrverts = copy_dma_verts( rmesa, tmp );
-
-      if (R200_DEBUG & DEBUG_VFMT)
-	 fprintf(stderr, "%d vertices to copy\n", nrverts);
-   
-      /* Finish the prim at this point:
-       */
-      note_last_prim( rmesa, 0 );
-   }
-
-   /* Fire any buffered primitives
-    */
-   flush_prims( rmesa );
-
-   /* Get new buffer
-    */
-   r200RefillCurrentDmaRegion( rmesa );
-
-   /* Reset counter, dmaptr
-    */
-   rmesa->vb.dmaptr = (int *)(rmesa->dma.current.ptr + rmesa->dma.current.address);
-   rmesa->vb.counter = (rmesa->dma.current.end - rmesa->dma.current.ptr) / 
-      (rmesa->vb.vertex_size * 4);
-   rmesa->vb.counter--;
-   rmesa->vb.initial_counter = rmesa->vb.counter;
-   rmesa->vb.notify = wrap_buffer;
-
-   rmesa->dma.flush = flush_prims;
-
-   /* Restart wrapped primitive:
-    */
-   if (rmesa->vb.prim[0] != GL_POLYGON+1)
-      start_prim( rmesa, rmesa->vb.prim[0] );
-
-
-   /* Reemit saved vertices
-    */
-   for (i = 0 ; i < nrverts; i++) {
-      if (R200_DEBUG & DEBUG_VERTS) {
-	 int j;
-	 fprintf(stderr, "re-emit vertex %d to %p\n", i, 
-		 (void *)rmesa->vb.dmaptr);
-	 if (R200_DEBUG & DEBUG_VERBOSE)
-	    for (j = 0 ; j < rmesa->vb.vertex_size; j++) 
-	       fprintf(stderr, "\t%08x/%f\n", *(int*)&tmp[i][j], tmp[i][j]);
-      }
-
-      memcpy( rmesa->vb.dmaptr, tmp[i], rmesa->vb.vertex_size * 4 );
-      rmesa->vb.dmaptr += rmesa->vb.vertex_size;
-      rmesa->vb.counter--;
-   }
-}
-
-
-/**
- * Determines the hardware vertex format based on the current state vector.
- * 
- * \returns
- * If the hardware TCL unit is capable of handling the current state vector,
- * \c GL_TRUE is returned.  Otherwise, \c GL_FALSE is returned.
- *
- * \todo
- * Make this color format selection data driven.  If we receive only ubytes,
- * send color as ubytes.  Also check if converting (with free checking for
- * overflow) is cheaper than sending floats directly.
- *
- * \todo
- * When intializing texture coordinates, it might be faster to just copy the
- * entire \c VERT_ATTRIB_TEX0 vector into the vertex buffer.  It may mean that
- * some of the data (i.e., the last texture coordinate components) get copied
- * over, but that still may be faster than the conditional branching.  If
- * nothing else, the code will be smaller and easier to follow.
- */
-static GLboolean check_vtx_fmt( GLcontext *ctx )
-{
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   GLuint ind0 = R200_VTX_Z0;
-   GLuint ind1 = 0;
-   GLuint i;
-   GLuint count[R200_MAX_TEXTURE_UNITS];
-
-   if (rmesa->TclFallback || rmesa->vb.fell_back || ctx->CompileFlag ||
-      (ctx->Fog.Enabled && (ctx->Fog.FogCoordinateSource == GL_FOG_COORD)) ||
-      /* TODO: set tcl out fmt/compsel and reenable vtxfmt code */
-      ctx->VertexProgram._Enabled)
-      return GL_FALSE;
-
-   if (ctx->Driver.NeedFlush & FLUSH_UPDATE_CURRENT) 
-      ctx->Driver.FlushVertices( ctx, FLUSH_UPDATE_CURRENT );
-   
-   /* Make all this event-driven:
-    */
-   if (ctx->Light.Enabled) {
-      ind0 |= R200_VTX_N0;
-
-      if (ctx->Light.ColorMaterialEnabled) 
-	 ind0 |= R200_VTX_FP_RGBA << R200_VTX_COLOR_0_SHIFT;
-      else
-	 ind0 |= R200_VTX_PK_RGBA << R200_VTX_COLOR_0_SHIFT;
-   }
-   else {
-      /* TODO: make this data driven?
-       */
-      ind0 |= R200_VTX_PK_RGBA << R200_VTX_COLOR_0_SHIFT;
-	 
-      if (ctx->_TriangleCaps & DD_SEPARATE_SPECULAR) {
-	 ind0 |= R200_VTX_PK_RGBA << R200_VTX_COLOR_1_SHIFT;
-      }
-   }
-
-   if ( ctx->Fog.FogCoordinateSource == GL_FOG_COORD ) {
-      ind0 |= R200_VTX_DISCRETE_FOG;
-   }
-
-   for ( i = 0 ; i < ctx->Const.MaxTextureUnits ; i++ ) {
-      count[i] = 0;
-
-      if (ctx->Texture.Unit[i]._ReallyEnabled) {
-	 if (rmesa->TexGenNeedNormals[i]) {
-	    ind0 |= R200_VTX_N0;
-	 }
-	 else {
-	    switch( ctx->Texture.Unit[i]._ReallyEnabled ) {
-	    case TEXTURE_CUBE_BIT:
-	    case TEXTURE_3D_BIT:
-	       count[i] = 3;
-	       break;
-	    case TEXTURE_2D_BIT:
-	    case TEXTURE_RECT_BIT:
-	       count[i] = 2;
-	       break;
-	    case TEXTURE_1D_BIT:
-	       count[i] = 1;
-	       break;
-	    }
-
-	    ind1 |= count[i] << (3 * i);
-	 }
-      }
-   }
-
-   if (R200_DEBUG & (DEBUG_VFMT|DEBUG_STATE))
-      fprintf(stderr, "%s: format: 0x%x, 0x%x\n", __FUNCTION__, ind0, ind1 );
-
-   R200_NEWPRIM(rmesa);
-   rmesa->vb.vtxfmt_0 = ind0;
-   rmesa->vb.vtxfmt_1 = ind1;
-   rmesa->vb.prim = &ctx->Driver.CurrentExecPrimitive;
-
-   rmesa->vb.vertex_size = 3;
-   rmesa->vb.normalptr = ctx->Current.Attrib[VERT_ATTRIB_NORMAL];
-   rmesa->vb.colorptr = NULL;
-   rmesa->vb.floatcolorptr = ctx->Current.Attrib[VERT_ATTRIB_COLOR0];
-   rmesa->vb.fogptr = ctx->Current.Attrib[VERT_ATTRIB_FOG];
-   rmesa->vb.specptr = NULL;
-   rmesa->vb.floatspecptr = ctx->Current.Attrib[VERT_ATTRIB_COLOR1];
-   rmesa->vb.texcoordptr[0] = ctx->Current.Attrib[VERT_ATTRIB_TEX0];
-   rmesa->vb.texcoordptr[1] = ctx->Current.Attrib[VERT_ATTRIB_TEX1];
-   rmesa->vb.texcoordptr[2] = ctx->Current.Attrib[VERT_ATTRIB_TEX2];
-   rmesa->vb.texcoordptr[3] = ctx->Current.Attrib[VERT_ATTRIB_TEX3];
-   rmesa->vb.texcoordptr[4] = ctx->Current.Attrib[VERT_ATTRIB_TEX4];
-   rmesa->vb.texcoordptr[5] = ctx->Current.Attrib[VERT_ATTRIB_TEX5];
-   rmesa->vb.texcoordptr[6] = ctx->Current.Attrib[VERT_ATTRIB_TEX0];	/* dummy */
-   rmesa->vb.texcoordptr[7] = ctx->Current.Attrib[VERT_ATTRIB_TEX0];	/* dummy */
-
-   /* Run through and initialize the vertex components in the order
-    * the hardware understands:
-    */
-   if (ind0 & R200_VTX_N0) {
-      rmesa->vb.normalptr = &rmesa->vb.vertex[rmesa->vb.vertex_size].f;
-      rmesa->vb.vertex_size += 3;
-      rmesa->vb.normalptr[0] = ctx->Current.Attrib[VERT_ATTRIB_NORMAL][0];
-      rmesa->vb.normalptr[1] = ctx->Current.Attrib[VERT_ATTRIB_NORMAL][1];
-      rmesa->vb.normalptr[2] = ctx->Current.Attrib[VERT_ATTRIB_NORMAL][2];
-   }
-
-   if (ind0 & R200_VTX_DISCRETE_FOG) {
-      rmesa->vb.fogptr = &rmesa->vb.vertex[rmesa->vb.vertex_size].f;
-      rmesa->vb.vertex_size += 1;
-      rmesa->vb.fogptr[0] = ctx->Current.Attrib[VERT_ATTRIB_FOG][0];
-   }
-
-   if (VTX_COLOR(ind0, 0) == R200_VTX_PK_RGBA) {
-      rmesa->vb.colorptr = &rmesa->vb.vertex[rmesa->vb.vertex_size].color;
-      rmesa->vb.vertex_size += 1;
-      UNCLAMPED_FLOAT_TO_CHAN( rmesa->vb.colorptr->red,   ctx->Current.Attrib[VERT_ATTRIB_COLOR0][0] );
-      UNCLAMPED_FLOAT_TO_CHAN( rmesa->vb.colorptr->green, ctx->Current.Attrib[VERT_ATTRIB_COLOR0][1] );
-      UNCLAMPED_FLOAT_TO_CHAN( rmesa->vb.colorptr->blue,  ctx->Current.Attrib[VERT_ATTRIB_COLOR0][2] );
-      UNCLAMPED_FLOAT_TO_CHAN( rmesa->vb.colorptr->alpha, ctx->Current.Attrib[VERT_ATTRIB_COLOR0][3] );
-   }
-   else if (VTX_COLOR(ind0, 0) == R200_VTX_FP_RGBA) {
-      rmesa->vb.floatcolorptr = &rmesa->vb.vertex[rmesa->vb.vertex_size].f;
-      rmesa->vb.vertex_size += 4;
-      rmesa->vb.floatcolorptr[0] = ctx->Current.Attrib[VERT_ATTRIB_COLOR0][0];
-      rmesa->vb.floatcolorptr[1] = ctx->Current.Attrib[VERT_ATTRIB_COLOR0][1];
-      rmesa->vb.floatcolorptr[2] = ctx->Current.Attrib[VERT_ATTRIB_COLOR0][2];
-      rmesa->vb.floatcolorptr[3] = ctx->Current.Attrib[VERT_ATTRIB_COLOR0][3];
-   }
-   else if (VTX_COLOR(ind0, 0) == R200_VTX_FP_RGB) {
-      rmesa->vb.floatcolorptr = &rmesa->vb.vertex[rmesa->vb.vertex_size].f;
-      rmesa->vb.vertex_size += 3;
-      rmesa->vb.floatcolorptr[0] = ctx->Current.Attrib[VERT_ATTRIB_COLOR0][0];
-      rmesa->vb.floatcolorptr[1] = ctx->Current.Attrib[VERT_ATTRIB_COLOR0][1];
-      rmesa->vb.floatcolorptr[2] = ctx->Current.Attrib[VERT_ATTRIB_COLOR0][2];
-   }   
-   
-   if (VTX_COLOR(ind0, 1) == R200_VTX_PK_RGBA) {
-      rmesa->vb.specptr = &rmesa->vb.vertex[rmesa->vb.vertex_size].color;
-      rmesa->vb.vertex_size += 1;
-      UNCLAMPED_FLOAT_TO_CHAN( rmesa->vb.specptr->red,   ctx->Current.Attrib[VERT_ATTRIB_COLOR1][0] );
-      UNCLAMPED_FLOAT_TO_CHAN( rmesa->vb.specptr->green, ctx->Current.Attrib[VERT_ATTRIB_COLOR1][1] );
-      UNCLAMPED_FLOAT_TO_CHAN( rmesa->vb.specptr->blue,  ctx->Current.Attrib[VERT_ATTRIB_COLOR1][2] );
-   }
-
-
-   for ( i = 0 ; i < ctx->Const.MaxTextureUnits ; i++ ) {
-      if ( count[i] != 0 ) {
-	 float * const attr = ctx->Current.Attrib[VERT_ATTRIB_TEX0+i];
-	 unsigned  j;
-
-	 rmesa->vb.texcoordptr[i] = &rmesa->vb.vertex[rmesa->vb.vertex_size].f;
-
-	 for ( j = 0 ; j < count[i] ; j++ ) {
-	    rmesa->vb.texcoordptr[i][j] = attr[j];
-	 }
-
-	 rmesa->vb.vertex_size += count[i];
-      }
-   }
-
-   if (rmesa->vb.installed_vertex_format != rmesa->vb.vtxfmt_0) {
-      if (R200_DEBUG & DEBUG_VFMT)
-	 fprintf(stderr, "reinstall on vertex_format change\n");
-      _mesa_install_exec_vtxfmt( ctx, &rmesa->vb.vtxfmt );
-      rmesa->vb.installed_vertex_format = rmesa->vb.vtxfmt_0;
-   }
-
-   if (R200_DEBUG & DEBUG_VFMT)
-      fprintf(stderr, "%s -- success\n", __FUNCTION__);
-
-   return GL_TRUE;
-}
-
-
-void r200VtxfmtInvalidate( GLcontext *ctx )
-{
-   r200ContextPtr rmesa = R200_CONTEXT( ctx );
-
-   rmesa->vb.recheck = GL_TRUE;
-   rmesa->vb.fell_back = GL_FALSE;
-}
-
-
-static void r200VtxfmtValidate( GLcontext *ctx )
-{
-   r200ContextPtr rmesa = R200_CONTEXT( ctx );
-
-   if (R200_DEBUG & DEBUG_VFMT)
-      fprintf(stderr, "%s\n", __FUNCTION__);
-
-   if (ctx->Driver.NeedFlush)
-      ctx->Driver.FlushVertices( ctx, ctx->Driver.NeedFlush );
-
-   rmesa->vb.recheck = GL_FALSE;
-
-   if (check_vtx_fmt( ctx )) {
-      if (!rmesa->vb.installed) {
-	 if (R200_DEBUG & DEBUG_VFMT)
-	    fprintf(stderr, "reinstall (new install)\n");
-
-	 _mesa_install_exec_vtxfmt( ctx, &rmesa->vb.vtxfmt );
-	 ctx->Driver.FlushVertices = r200VtxFmtFlushVertices;
-	 ctx->Driver.NewList = r200NewList;
-	 rmesa->vb.installed = GL_TRUE;
-      }
-      else if (R200_DEBUG & DEBUG_VFMT)
-	 fprintf(stderr, "%s: already installed", __FUNCTION__);
-   } 
-   else {
-      if (R200_DEBUG & DEBUG_VFMT)
-	 fprintf(stderr, "%s: failed\n", __FUNCTION__);
-
-      if (rmesa->vb.installed) {
-	 if (rmesa->dma.flush)
-	    rmesa->dma.flush( rmesa );
-	 _tnl_wakeup_exec( ctx );
-	 ctx->Driver.FlushVertices = r200FlushVertices;
-	 ctx->Driver.NewList =_tnl_NewList;
-	 rmesa->vb.installed = GL_FALSE;
-      }
-   }      
-}
-
-
-
-/* Materials:
- */
-static void r200_Materialfv( GLenum face, GLenum pname, 
-			       const GLfloat *params )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT( ctx );
-
-   if (R200_DEBUG & DEBUG_VFMT)
-      fprintf(stderr, "%s\n", __FUNCTION__);
-
-   if (rmesa->vb.prim[0] != GL_POLYGON+1) {
-      VFMT_FALLBACK( __FUNCTION__ );
-      CALL_Materialfv(GET_DISPATCH(), (face, pname, params));
-      return;
-   }
-   _mesa_noop_Materialfv( face, pname, params );
-   r200UpdateMaterial( ctx );
-}
-
-
-/* Begin/End
- */
-static void r200_Begin( GLenum mode )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-
-   if (R200_DEBUG & DEBUG_VFMT)
-      fprintf(stderr, "%s( %s )\n", __FUNCTION__,
-	      _mesa_lookup_enum_by_nr( mode ));
-
-   if (mode > GL_POLYGON) {
-      _mesa_error( ctx, GL_INVALID_ENUM, "glBegin" );
-      return;
-   }
-
-   if (rmesa->vb.prim[0] != GL_POLYGON+1) {
-      _mesa_error( ctx, GL_INVALID_OPERATION, "glBegin" );
-      return;
-   }
-   
-   if (ctx->NewState) 
-      _mesa_update_state( ctx );
-
-   if (rmesa->NewGLState)
-      r200ValidateState( ctx );
-
-   if (rmesa->vb.recheck) 
-      r200VtxfmtValidate( ctx );
-
-   if (!rmesa->vb.installed) {
-      CALL_Begin(GET_DISPATCH(), (mode));
-      return;
-   }
-
-
-   if (rmesa->dma.flush && rmesa->vb.counter < 12) {
-      if (R200_DEBUG & DEBUG_VFMT)
-	 fprintf(stderr, "%s: flush almost-empty buffers\n", __FUNCTION__);
-      flush_prims( rmesa );
-   }
-
-   /* Need to arrange to save vertices here?  Or always copy from dma (yuk)?
-    */
-   if (!rmesa->dma.flush) {
-      if (rmesa->dma.current.ptr + 12*rmesa->vb.vertex_size*4 > 
-	  rmesa->dma.current.end) {
-	 R200_NEWPRIM( rmesa );
-	 r200RefillCurrentDmaRegion( rmesa );
-      }
-
-      rmesa->vb.dmaptr = (int *)(rmesa->dma.current.address + rmesa->dma.current.ptr);
-      rmesa->vb.counter = (rmesa->dma.current.end - rmesa->dma.current.ptr) / 
-	 (rmesa->vb.vertex_size * 4);
-      rmesa->vb.counter--;
-      rmesa->vb.initial_counter = rmesa->vb.counter;
-      rmesa->vb.notify = wrap_buffer;
-      rmesa->dma.flush = flush_prims;
-      ctx->Driver.NeedFlush |= FLUSH_STORED_VERTICES;
-   }
-   
-   
-   rmesa->vb.prim[0] = mode;
-   start_prim( rmesa, mode | PRIM_BEGIN );
-}
-
-
-
-static void r200_End( void )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-
-   if (R200_DEBUG & DEBUG_VFMT)
-      fprintf(stderr, "%s\n", __FUNCTION__);
-
-   if (rmesa->vb.prim[0] == GL_POLYGON+1) {
-      _mesa_error( ctx, GL_INVALID_OPERATION, "glEnd" );
-      return;
-   }
-
-   note_last_prim( rmesa, PRIM_END );
-   rmesa->vb.prim[0] = GL_POLYGON+1;
-}
-
-
-/* Fallback on difficult entrypoints:
- */
-#define PRE_LOOPBACK( FUNC )			\
-do {						\
-   if (R200_DEBUG & DEBUG_VFMT) 		\
-      fprintf(stderr, "%s\n", __FUNCTION__);	\
-   VFMT_FALLBACK( __FUNCTION__ );		\
-} while (0)
-#define TAG(x) r200_fallback_##x
-#include "vtxfmt_tmp.h"
-
-
-
-static GLboolean r200NotifyBegin( GLcontext *ctx, GLenum p )
-{
-   r200ContextPtr rmesa = R200_CONTEXT( ctx );
-   
-   if (R200_DEBUG & DEBUG_VFMT)
-      fprintf(stderr, "%s\n", __FUNCTION__);
-
-   assert(!rmesa->vb.installed);
-
-   if (ctx->NewState) 
-      _mesa_update_state( ctx );
-
-   if (rmesa->NewGLState)
-      r200ValidateState( ctx );
-
-   if (ctx->Driver.NeedFlush)
-      ctx->Driver.FlushVertices( ctx, ctx->Driver.NeedFlush );
-
-   if (rmesa->vb.recheck) 
-      r200VtxfmtValidate( ctx );
-
-   if (!rmesa->vb.installed) {
-      if (R200_DEBUG & DEBUG_VFMT)
-	 fprintf(stderr, "%s -- failed\n", __FUNCTION__);
-      return GL_FALSE;
-   }
-
-   r200_Begin( p );
-   return GL_TRUE;
-}
-
-static void r200VtxFmtFlushVertices( GLcontext *ctx, GLuint flags )
-{
-   r200ContextPtr rmesa = R200_CONTEXT( ctx );
-
-   if (R200_DEBUG & DEBUG_VFMT)
-      fprintf(stderr, "%s\n", __FUNCTION__);
-
-   assert(rmesa->vb.installed);
-
-   if (flags & FLUSH_UPDATE_CURRENT) {
-      r200_copy_to_current( ctx );
-      if (R200_DEBUG & DEBUG_VFMT)
-	 fprintf(stderr, "reinstall on update_current\n");
-      _mesa_install_exec_vtxfmt( ctx, &rmesa->vb.vtxfmt );
-      ctx->Driver.NeedFlush &= ~FLUSH_UPDATE_CURRENT;
-   }
-
-   if (flags & FLUSH_STORED_VERTICES) {
-      assert (rmesa->dma.flush == 0 ||
-	      rmesa->dma.flush == flush_prims);
-      if (rmesa->dma.flush == flush_prims)
-	 flush_prims( rmesa );
-      ctx->Driver.NeedFlush &= ~FLUSH_STORED_VERTICES;
-   }
-}
-
-
-
-/* At this point, don't expect very many versions of each function to
- * be generated, so not concerned about freeing them?
- */
-
-
-/**
- * Called once during context creation.
- */
-void r200VtxfmtInit( GLcontext *ctx, GLboolean useCodegen )
-{
-   r200ContextPtr rmesa = R200_CONTEXT( ctx );
-   GLvertexformat *vfmt = &(rmesa->vb.vtxfmt);
-
-   /* start by initializing to no-op functions */
-   _mesa_noop_vtxfmt_init(vfmt);
-
-   /* Hook in chooser functions for codegen, etc:
-    */
-   r200VtxfmtInitChoosers( vfmt );
-
-   /* Handled fully in supported states, but no codegen:
-    */
-   vfmt->Materialfv = r200_Materialfv;
-   vfmt->ArrayElement = _ae_loopback_array_elt;	        /* generic helper */
-   vfmt->Begin = r200_Begin;
-   vfmt->End = r200_End;
-
-   /* Fallback for performance reasons:  (Fix with cva/elt path here and
-    * dmatmp2.h style primitive-merging)
-    *
-    * These should call NotifyBegin(), as should _tnl_EvalMesh, to allow
-    * a driver-hook.
-    */
-   vfmt->DrawArrays = r200_fallback_DrawArrays;
-   vfmt->DrawElements = r200_fallback_DrawElements;
-   vfmt->DrawRangeElements = r200_fallback_DrawRangeElements; 
-
-   /* Active but unsupported -- fallback if we receive these:
-    */
-   vfmt->CallList = r200_fallback_CallList;
-   vfmt->CallLists = r200_fallback_CallLists;
-   vfmt->EvalCoord1f = r200_fallback_EvalCoord1f;
-   vfmt->EvalCoord1fv = r200_fallback_EvalCoord1fv;
-   vfmt->EvalCoord2f = r200_fallback_EvalCoord2f;
-   vfmt->EvalCoord2fv = r200_fallback_EvalCoord2fv;
-   vfmt->EvalMesh1 = r200_fallback_EvalMesh1;
-   vfmt->EvalMesh2 = r200_fallback_EvalMesh2;
-   vfmt->EvalPoint1 = r200_fallback_EvalPoint1;
-   vfmt->EvalPoint2 = r200_fallback_EvalPoint2;
-   vfmt->TexCoord4f = r200_fallback_TexCoord4f;
-   vfmt->TexCoord4fv = r200_fallback_TexCoord4fv;
-   vfmt->MultiTexCoord4fARB = r200_fallback_MultiTexCoord4fARB;
-   vfmt->MultiTexCoord4fvARB = r200_fallback_MultiTexCoord4fvARB;
-   vfmt->Vertex4f = r200_fallback_Vertex4f;
-   vfmt->Vertex4fv = r200_fallback_Vertex4fv;
-   vfmt->VertexAttrib1fNV  = r200_fallback_VertexAttrib1fNV;
-   vfmt->VertexAttrib1fvNV = r200_fallback_VertexAttrib1fvNV;
-   vfmt->VertexAttrib2fNV  = r200_fallback_VertexAttrib2fNV;
-   vfmt->VertexAttrib2fvNV = r200_fallback_VertexAttrib2fvNV;
-   vfmt->VertexAttrib3fNV  = r200_fallback_VertexAttrib3fNV;
-   vfmt->VertexAttrib3fvNV = r200_fallback_VertexAttrib3fvNV;
-   vfmt->VertexAttrib4fNV  = r200_fallback_VertexAttrib4fNV;
-   vfmt->VertexAttrib4fvNV = r200_fallback_VertexAttrib4fvNV;
-   vfmt->FogCoordfEXT = r200_fallback_FogCoordfEXT;
-   vfmt->FogCoordfvEXT = r200_fallback_FogCoordfvEXT;
-   
-   (void)r200_fallback_vtxfmt;
-
-   TNL_CONTEXT(ctx)->Driver.NotifyBegin = r200NotifyBegin;
-
-   rmesa->vb.enabled = 1;
-   rmesa->vb.prim = &ctx->Driver.CurrentExecPrimitive;
-   rmesa->vb.primflags = 0;
-
-   make_empty_list( &rmesa->vb.dfn_cache.Vertex2f );
-   make_empty_list( &rmesa->vb.dfn_cache.Vertex2fv );
-   make_empty_list( &rmesa->vb.dfn_cache.Vertex3f );
-   make_empty_list( &rmesa->vb.dfn_cache.Vertex3fv );
-   make_empty_list( &rmesa->vb.dfn_cache.Color4ub );
-   make_empty_list( &rmesa->vb.dfn_cache.Color4ubv );
-   make_empty_list( &rmesa->vb.dfn_cache.Color3ub );
-   make_empty_list( &rmesa->vb.dfn_cache.Color3ubv );
-   make_empty_list( &rmesa->vb.dfn_cache.Color4f );
-   make_empty_list( &rmesa->vb.dfn_cache.Color4fv );
-   make_empty_list( &rmesa->vb.dfn_cache.Color3f );
-   make_empty_list( &rmesa->vb.dfn_cache.Color3fv );
-   make_empty_list( &rmesa->vb.dfn_cache.SecondaryColor3fEXT );
-   make_empty_list( &rmesa->vb.dfn_cache.SecondaryColor3fvEXT );
-   make_empty_list( &rmesa->vb.dfn_cache.SecondaryColor3ubEXT );
-   make_empty_list( &rmesa->vb.dfn_cache.SecondaryColor3ubvEXT );
-   make_empty_list( &rmesa->vb.dfn_cache.Normal3f );
-   make_empty_list( &rmesa->vb.dfn_cache.Normal3fv );
-   make_empty_list( &rmesa->vb.dfn_cache.TexCoord3f );
-   make_empty_list( &rmesa->vb.dfn_cache.TexCoord3fv );
-   make_empty_list( &rmesa->vb.dfn_cache.TexCoord2f );
-   make_empty_list( &rmesa->vb.dfn_cache.TexCoord2fv );
-   make_empty_list( &rmesa->vb.dfn_cache.TexCoord1f );
-   make_empty_list( &rmesa->vb.dfn_cache.TexCoord1fv );
-   make_empty_list( &rmesa->vb.dfn_cache.MultiTexCoord3fARB );
-   make_empty_list( &rmesa->vb.dfn_cache.MultiTexCoord3fvARB );
-   make_empty_list( &rmesa->vb.dfn_cache.MultiTexCoord2fARB );
-   make_empty_list( &rmesa->vb.dfn_cache.MultiTexCoord2fvARB );
-   make_empty_list( &rmesa->vb.dfn_cache.MultiTexCoord1fARB );
-   make_empty_list( &rmesa->vb.dfn_cache.MultiTexCoord1fvARB );
-/*   make_empty_list( &rmesa->vb.dfn_cache.FogCoordfEXT );
-   make_empty_list( &rmesa->vb.dfn_cache.FogCoordfvEXT );*/
-
-   r200InitCodegen( &rmesa->vb.codegen, useCodegen );
-}
-
-static void free_funcs( struct dynfn *l )
-{
-   struct dynfn *f, *tmp;
-   foreach_s (f, tmp, l) {
-      remove_from_list( f );
-      _mesa_exec_free( f->code );
-      _mesa_free( f );
-   }
-}
-
-void r200VtxfmtUnbindContext( GLcontext *ctx )
-{
-}
-
-
-void r200VtxfmtMakeCurrent( GLcontext *ctx )
-{
-}
-
-
-void r200VtxfmtDestroy( GLcontext *ctx )
-{
-   r200ContextPtr rmesa = R200_CONTEXT( ctx );
-
-   count_funcs( rmesa );
-   free_funcs( &rmesa->vb.dfn_cache.Vertex2f );
-   free_funcs( &rmesa->vb.dfn_cache.Vertex2fv );
-   free_funcs( &rmesa->vb.dfn_cache.Vertex3f );
-   free_funcs( &rmesa->vb.dfn_cache.Vertex3fv );
-   free_funcs( &rmesa->vb.dfn_cache.Color4ub );
-   free_funcs( &rmesa->vb.dfn_cache.Color4ubv );
-   free_funcs( &rmesa->vb.dfn_cache.Color3ub );
-   free_funcs( &rmesa->vb.dfn_cache.Color3ubv );
-   free_funcs( &rmesa->vb.dfn_cache.Color4f );
-   free_funcs( &rmesa->vb.dfn_cache.Color4fv );
-   free_funcs( &rmesa->vb.dfn_cache.Color3f );
-   free_funcs( &rmesa->vb.dfn_cache.Color3fv );
-   free_funcs( &rmesa->vb.dfn_cache.SecondaryColor3ubEXT );
-   free_funcs( &rmesa->vb.dfn_cache.SecondaryColor3ubvEXT );
-   free_funcs( &rmesa->vb.dfn_cache.SecondaryColor3fEXT );
-   free_funcs( &rmesa->vb.dfn_cache.SecondaryColor3fvEXT );
-   free_funcs( &rmesa->vb.dfn_cache.Normal3f );
-   free_funcs( &rmesa->vb.dfn_cache.Normal3fv );
-   free_funcs( &rmesa->vb.dfn_cache.TexCoord3f );
-   free_funcs( &rmesa->vb.dfn_cache.TexCoord3fv );
-   free_funcs( &rmesa->vb.dfn_cache.TexCoord2f );
-   free_funcs( &rmesa->vb.dfn_cache.TexCoord2fv );
-   free_funcs( &rmesa->vb.dfn_cache.TexCoord1f );
-   free_funcs( &rmesa->vb.dfn_cache.TexCoord1fv );
-   free_funcs( &rmesa->vb.dfn_cache.MultiTexCoord3fARB );
-   free_funcs( &rmesa->vb.dfn_cache.MultiTexCoord3fvARB );
-   free_funcs( &rmesa->vb.dfn_cache.MultiTexCoord2fARB );
-   free_funcs( &rmesa->vb.dfn_cache.MultiTexCoord2fvARB );
-   free_funcs( &rmesa->vb.dfn_cache.MultiTexCoord1fARB );
-   free_funcs( &rmesa->vb.dfn_cache.MultiTexCoord1fvARB );
-/*   free_funcs( &rmesa->vb.dfn_cache.FogCoordfEXT );
-   free_funcs( &rmesa->vb.dfn_cache.FogCoordfvEXT );*/
-}
-
diff --git a/src/mesa/drivers/dri/r200/r200_vtxfmt.h b/src/mesa/drivers/dri/r200/r200_vtxfmt.h
deleted file mode 100644
index 46999191e04..00000000000
--- a/src/mesa/drivers/dri/r200/r200_vtxfmt.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/r200/r200_vtxfmt.h,v 1.1 2002/10/30 12:51:53 alanh Exp $ */
-/*
-Copyright (C) The Weather Channel, Inc.  2002.  All Rights Reserved.
-
-The Weather Channel (TM) funded Tungsten Graphics to develop the
-initial release of the Radeon 8500 driver under the XFree86 license.
-This notice must be preserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial
-portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-**************************************************************************/
-
-/*
- * Authors:
- *   Keith Whitwell <[email protected]>
- */
-
-#ifndef __R200_VTXFMT_H__
-#define __R200_VTXFMT_H__
-
-#include "r200_context.h"
-
-
-
-extern void r200VtxfmtUpdate( GLcontext *ctx );
-extern void r200VtxfmtInit( GLcontext *ctx, GLboolean useCodegen );
-extern void r200VtxfmtInvalidate( GLcontext *ctx );
-extern void r200VtxfmtDestroy( GLcontext *ctx );
-extern void r200VtxfmtInitChoosers( GLvertexformat *vfmt );
-
-extern void r200VtxfmtMakeCurrent( GLcontext *ctx );
-extern void r200VtxfmtUnbindContext( GLcontext *ctx );
-
-extern void r200_copy_to_current( GLcontext *ctx );
-extern void VFMT_FALLBACK( const char *caller );
-
-#define DFN( FUNC, CACHE)				\
-do {							\
-   char *start = (char *)&FUNC;				\
-   char *end = (char *)&FUNC##_end;			\
-   insert_at_head( &CACHE, dfn );			\
-   dfn->key[0] = key[0];				\
-   dfn->key[1] = key[1];				\
-   dfn->code = _mesa_exec_malloc( end - start );	\
-   _mesa_memcpy(dfn->code, start, end - start);		\
-}							\
-while ( 0 )
-
-#define FIXUP( CODE, OFFSET, CHECKVAL, NEWVAL )	\
-do {						\
-   int *icode = (int *)(CODE+OFFSET);		\
-   assert (*icode == CHECKVAL);			\
-   *icode = (int)NEWVAL;			\
-} while (0)
-
-
-/* Useful for figuring out the offsets:
- */
-#define FIXUP2( CODE, OFFSET, CHECKVAL, NEWVAL )		\
-do {								\
-   while (*(int *)(CODE+OFFSET) != CHECKVAL) OFFSET++;		\
-   /*fprintf(stderr, "%s/%d CVAL %x OFFSET %d VAL %x\n", __FUNCTION__,*/ \
-   /*	   __LINE__, CHECKVAL, OFFSET, (int)(NEWVAL));*/		\
-   *(int *)(CODE+OFFSET) = (int)(NEWVAL);				\
-   OFFSET += 4;							\
-} while (0)
-
-/* 
- */
-void r200InitCodegen( struct dfn_generators *gen, GLboolean useCodegen );
-void r200InitX86Codegen( struct dfn_generators *gen );
-void r200InitSSECodegen( struct dfn_generators *gen );
-
-
-
-/* Defined in r200_vtxfmt_x86.c
- */
-struct dynfn *r200_makeX86Vertex2f( GLcontext *, const int * );
-struct dynfn *r200_makeX86Vertex2fv( GLcontext *, const int * );
-struct dynfn *r200_makeX86Vertex3f( GLcontext *, const int * );
-struct dynfn *r200_makeX86Vertex3fv( GLcontext *, const int * );
-struct dynfn *r200_makeX86Color4ub( GLcontext *, const int * );
-struct dynfn *r200_makeX86Color4ubv( GLcontext *, const int * );
-struct dynfn *r200_makeX86Color3ub( GLcontext *, const int * );
-struct dynfn *r200_makeX86Color3ubv( GLcontext *, const int * );
-struct dynfn *r200_makeX86Color4f( GLcontext *, const int * );
-struct dynfn *r200_makeX86Color4fv( GLcontext *, const int * );
-struct dynfn *r200_makeX86Color3f( GLcontext *, const int * );
-struct dynfn *r200_makeX86Color3fv( GLcontext *, const int * );
-struct dynfn *r200_makeX86SecondaryColor3ubEXT( GLcontext *, const int * );
-struct dynfn *r200_makeX86SecondaryColor3ubvEXT( GLcontext *, const int * );
-struct dynfn *r200_makeX86SecondaryColor3fEXT( GLcontext *, const int * );
-struct dynfn *r200_makeX86SecondaryColor3fvEXT( GLcontext *, const int * );
-struct dynfn *r200_makeX86Normal3f( GLcontext *, const int * );
-struct dynfn *r200_makeX86Normal3fv( GLcontext *, const int * );
-struct dynfn *r200_makeX86TexCoord2f( GLcontext *, const int * );
-struct dynfn *r200_makeX86TexCoord2fv( GLcontext *, const int * );
-struct dynfn *r200_makeX86TexCoord1f( GLcontext *, const int * );
-struct dynfn *r200_makeX86TexCoord1fv( GLcontext *, const int * );
-struct dynfn *r200_makeX86MultiTexCoord2fARB( GLcontext *, const int * );
-struct dynfn *r200_makeX86MultiTexCoord2fvARB( GLcontext *, const int * );
-struct dynfn *r200_makeX86MultiTexCoord1fARB( GLcontext *, const int * );
-struct dynfn *r200_makeX86MultiTexCoord1fvARB( GLcontext *, const int * );
-
-#endif
diff --git a/src/mesa/drivers/dri/r200/r200_vtxfmt_c.c b/src/mesa/drivers/dri/r200/r200_vtxfmt_c.c
deleted file mode 100644
index 1db5950c8ff..00000000000
--- a/src/mesa/drivers/dri/r200/r200_vtxfmt_c.c
+++ /dev/null
@@ -1,1002 +0,0 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/r200/r200_vtxfmt_c.c,v 1.2 2002/12/16 16:18:56 dawes Exp $ */
-/*
-Copyright (C) The Weather Channel, Inc.  2002.  All Rights Reserved.
-
-The Weather Channel (TM) funded Tungsten Graphics to develop the
-initial release of the Radeon 8500 driver under the XFree86 license.
-This notice must be preserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial
-portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-**************************************************************************/
-
-/*
- * Authors:
- *   Keith Whitwell <[email protected]>
- */
-
-#include "glheader.h"
-#include "imports.h"
-#include "mtypes.h"
-#include "colormac.h"
-#include "simple_list.h"
-#include "api_noop.h"
-#include "vtxfmt.h"
-
-#include "r200_vtxfmt.h"
-#include "r200_tcl.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.
- */
-static void r200_Vertex3f( GLfloat x, GLfloat y, GLfloat z )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   int i;
-
-   *rmesa->vb.dmaptr++ = *(int *)&x;
-   *rmesa->vb.dmaptr++ = *(int *)&y;
-   *rmesa->vb.dmaptr++ = *(int *)&z;
-
-   for (i = 3; i < rmesa->vb.vertex_size; i++)
-      *rmesa->vb.dmaptr++ = rmesa->vb.vertex[i].i;
-   
-   if (--rmesa->vb.counter == 0)
-      rmesa->vb.notify();
-}
-
-
-static void r200_Vertex3fv( const GLfloat *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   int i;
-
-   *rmesa->vb.dmaptr++ = *(int *)&v[0];
-   *rmesa->vb.dmaptr++ = *(int *)&v[1];
-   *rmesa->vb.dmaptr++ = *(int *)&v[2];
-
-   for (i = 3; i < rmesa->vb.vertex_size; i++)
-      *rmesa->vb.dmaptr++ = rmesa->vb.vertex[i].i;
-   
-   if (--rmesa->vb.counter == 0)
-      rmesa->vb.notify();
-}
-
-
-static void r200_Vertex2f( GLfloat x, GLfloat y )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   int i;
-   
-   *rmesa->vb.dmaptr++ = *(int *)&x;
-   *rmesa->vb.dmaptr++ = *(int *)&y;
-   *rmesa->vb.dmaptr++ = 0;
-
-   for (i = 3; i < rmesa->vb.vertex_size; i++)
-      *rmesa->vb.dmaptr++ = rmesa->vb.vertex[i].i;
-
-   if (--rmesa->vb.counter == 0)
-      rmesa->vb.notify();
-}
-
-
-static void r200_Vertex2fv( const GLfloat *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   int i;
-
-   *rmesa->vb.dmaptr++ = *(int *)&v[0];
-   *rmesa->vb.dmaptr++ = *(int *)&v[1];
-   *rmesa->vb.dmaptr++ = 0;
-
-   for (i = 3; i < rmesa->vb.vertex_size; i++)
-      *rmesa->vb.dmaptr++ = rmesa->vb.vertex[i].i;
-   
-   if (--rmesa->vb.counter == 0)
-      rmesa->vb.notify();
-}
-
-
-
-/* Color for ubyte (packed) color formats:
- */
-#if 0
-static void r200_Color3ub_ub( GLubyte r, GLubyte g, GLubyte b )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   r200_color_t *dest = rmesa->vb.colorptr;
-   dest->red	= r;
-   dest->green	= g;
-   dest->blue	= b;
-   dest->alpha	= 0xff;
-}
-
-static void r200_Color3ubv_ub( const GLubyte *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   r200_color_t *dest = rmesa->vb.colorptr;
-   dest->red	= v[0];
-   dest->green	= v[1];
-   dest->blue	= v[2];
-   dest->alpha	= 0xff;
-}
-
-static void r200_Color4ub_ub( GLubyte r, GLubyte g, GLubyte b, GLubyte a )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   r200_color_t *dest = rmesa->vb.colorptr;
-   dest->red	= r;
-   dest->green	= g;
-   dest->blue	= b;
-   dest->alpha	= a;
-}
-
-static void r200_Color4ubv_ub( const GLubyte *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   *(GLuint *)rmesa->vb.colorptr = LE32_TO_CPU(*(GLuint *)v);
-}
-#endif /* 0 */
-
-static void r200_Color3f_ub( GLfloat r, GLfloat g, GLfloat b )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   r200_color_t *dest = rmesa->vb.colorptr;
-   UNCLAMPED_FLOAT_TO_UBYTE( dest->red,   r );
-   UNCLAMPED_FLOAT_TO_UBYTE( dest->green, g );
-   UNCLAMPED_FLOAT_TO_UBYTE( dest->blue,  b );
-   dest->alpha = 255;
-}
-
-static void r200_Color3fv_ub( const GLfloat *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   r200_color_t *dest = rmesa->vb.colorptr;
-   UNCLAMPED_FLOAT_TO_UBYTE( dest->red,   v[0] );
-   UNCLAMPED_FLOAT_TO_UBYTE( dest->green, v[1] );
-   UNCLAMPED_FLOAT_TO_UBYTE( dest->blue,  v[2] );
-   dest->alpha = 255;
-}
-
-static void r200_Color4f_ub( GLfloat r, GLfloat g, GLfloat b, GLfloat a )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   r200_color_t *dest = rmesa->vb.colorptr;
-   UNCLAMPED_FLOAT_TO_UBYTE( dest->red,   r );
-   UNCLAMPED_FLOAT_TO_UBYTE( dest->green, g );
-   UNCLAMPED_FLOAT_TO_UBYTE( dest->blue,  b );
-   UNCLAMPED_FLOAT_TO_UBYTE( dest->alpha, a );
-}
-
-static void r200_Color4fv_ub( const GLfloat *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   r200_color_t *dest = rmesa->vb.colorptr;
-   UNCLAMPED_FLOAT_TO_UBYTE( dest->red,	  v[0] );
-   UNCLAMPED_FLOAT_TO_UBYTE( dest->green, v[1] );
-   UNCLAMPED_FLOAT_TO_UBYTE( dest->blue,  v[2] );
-   UNCLAMPED_FLOAT_TO_UBYTE( dest->alpha, v[3] );
-}
-
-
-/* Color for float color+alpha formats:
- */
-#if 0
-static void r200_Color3ub_4f( GLubyte r, GLubyte g, GLubyte b )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   GLfloat *dest = rmesa->vb.floatcolorptr;
-   dest[0] = UBYTE_TO_FLOAT(r);
-   dest[1] = UBYTE_TO_FLOAT(g);
-   dest[2] = UBYTE_TO_FLOAT(b);
-   dest[3] = 1.0;
-}
-
-static void r200_Color3ubv_4f( const GLubyte *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   GLfloat *dest = rmesa->vb.floatcolorptr;
-   dest[0] = UBYTE_TO_FLOAT(v[0]);
-   dest[1] = UBYTE_TO_FLOAT(v[1]);
-   dest[2] = UBYTE_TO_FLOAT(v[2]);
-   dest[3] = 1.0;
-}
-
-static void r200_Color4ub_4f( GLubyte r, GLubyte g, GLubyte b, GLubyte a )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   GLfloat *dest = rmesa->vb.floatcolorptr;
-   dest[0] = UBYTE_TO_FLOAT(r);
-   dest[1] = UBYTE_TO_FLOAT(g);
-   dest[2] = UBYTE_TO_FLOAT(b);
-   dest[3] = UBYTE_TO_FLOAT(a);
-}
-
-static void r200_Color4ubv_4f( const GLubyte *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   GLfloat *dest = rmesa->vb.floatcolorptr;
-   dest[0] = UBYTE_TO_FLOAT(v[0]);
-   dest[1] = UBYTE_TO_FLOAT(v[1]);
-   dest[2] = UBYTE_TO_FLOAT(v[2]);
-   dest[3] = UBYTE_TO_FLOAT(v[3]);
-}
-#endif /* 0 */
-
-
-static void r200_Color3f_4f( GLfloat r, GLfloat g, GLfloat b )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   GLfloat *dest = rmesa->vb.floatcolorptr;
-   dest[0] = r;
-   dest[1] = g;
-   dest[2] = b;
-   dest[3] = 1.0;		
-}
-
-static void r200_Color3fv_4f( const GLfloat *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   GLfloat *dest = rmesa->vb.floatcolorptr;
-   dest[0] = v[0];
-   dest[1] = v[1];
-   dest[2] = v[2];
-   dest[3] = 1.0;
-}
-
-static void r200_Color4f_4f( GLfloat r, GLfloat g, GLfloat b, GLfloat a )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   GLfloat *dest = rmesa->vb.floatcolorptr;
-   dest[0] = r;
-   dest[1] = g;
-   dest[2] = b;
-   dest[3] = a;
-}
-
-static void r200_Color4fv_4f( const GLfloat *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   GLfloat *dest = rmesa->vb.floatcolorptr;
-   dest[0] = v[0];
-   dest[1] = v[1];
-   dest[2] = v[2];
-   dest[3] = v[3];
-}
-
-
-/* Color for float color formats:
- */
-#if 0
-static void r200_Color3ub_3f( GLubyte r, GLubyte g, GLubyte b )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   GLfloat *dest = rmesa->vb.floatcolorptr;
-   dest[0] = UBYTE_TO_FLOAT(r);
-   dest[1] = UBYTE_TO_FLOAT(g);
-   dest[2] = UBYTE_TO_FLOAT(b);
-}
-
-static void r200_Color3ubv_3f( const GLubyte *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   GLfloat *dest = rmesa->vb.floatcolorptr;
-   dest[0] = UBYTE_TO_FLOAT(v[0]);
-   dest[1] = UBYTE_TO_FLOAT(v[1]);
-   dest[2] = UBYTE_TO_FLOAT(v[2]);
-}
-
-static void r200_Color4ub_3f( GLubyte r, GLubyte g, GLubyte b, GLubyte a )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   GLfloat *dest = rmesa->vb.floatcolorptr;
-   dest[0] = UBYTE_TO_FLOAT(r);
-   dest[1] = UBYTE_TO_FLOAT(g);
-   dest[2] = UBYTE_TO_FLOAT(b);
-   ctx->Current.Attrib[VERT_ATTRIB_COLOR0][3] = UBYTE_TO_FLOAT(a);
-}
-
-static void r200_Color4ubv_3f( const GLubyte *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   GLfloat *dest = rmesa->vb.floatcolorptr;
-   dest[0] = UBYTE_TO_FLOAT(v[0]);
-   dest[1] = UBYTE_TO_FLOAT(v[1]);
-   dest[2] = UBYTE_TO_FLOAT(v[2]);
-   ctx->Current.Attrib[VERT_ATTRIB_COLOR0][3] = UBYTE_TO_FLOAT(v[3]);
-}
-#endif /* 0 */
-
-
-static void r200_Color3f_3f( GLfloat r, GLfloat g, GLfloat b )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   GLfloat *dest = rmesa->vb.floatcolorptr;
-   dest[0] = r;
-   dest[1] = g;
-   dest[2] = b;
-}
-
-static void r200_Color3fv_3f( const GLfloat *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   GLfloat *dest = rmesa->vb.floatcolorptr;
-   dest[0] = v[0];
-   dest[1] = v[1];
-   dest[2] = v[2];
-}
-
-static void r200_Color4f_3f( GLfloat r, GLfloat g, GLfloat b, GLfloat a )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   GLfloat *dest = rmesa->vb.floatcolorptr;
-   dest[0] = r;
-   dest[1] = g;
-   dest[2] = b;
-   ctx->Current.Attrib[VERT_ATTRIB_COLOR0][3] = a;
-}
-
-static void r200_Color4fv_3f( const GLfloat *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   GLfloat *dest = rmesa->vb.floatcolorptr;
-   dest[0] = v[0];
-   dest[1] = v[1];
-   dest[2] = v[2];
-   ctx->Current.Attrib[VERT_ATTRIB_COLOR0][3] = v[3]; 
-}
-
-
-/* Secondary Color:
- */
-#if 0
-static void r200_SecondaryColor3ubEXT_ub( GLubyte r, GLubyte g, GLubyte b )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   r200_color_t *dest = rmesa->vb.specptr;
-   dest->red	= r;
-   dest->green	= g;
-   dest->blue	= b;
-   dest->alpha	= 0xff;
-}
-
-static void r200_SecondaryColor3ubvEXT_ub( const GLubyte *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   r200_color_t *dest = rmesa->vb.specptr;
-   dest->red	= v[0];
-   dest->green	= v[1];
-   dest->blue	= v[2];
-   dest->alpha	= 0xff;
-}
-#endif /* 0 */
-
-static void r200_SecondaryColor3fEXT_ub( GLfloat r, GLfloat g, GLfloat b )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   r200_color_t *dest = rmesa->vb.specptr;
-   UNCLAMPED_FLOAT_TO_UBYTE( dest->red,	  r );
-   UNCLAMPED_FLOAT_TO_UBYTE( dest->green, g );
-   UNCLAMPED_FLOAT_TO_UBYTE( dest->blue,  b );
-   dest->alpha = 255;
-}
-
-static void r200_SecondaryColor3fvEXT_ub( const GLfloat *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   r200_color_t *dest = rmesa->vb.specptr;
-   UNCLAMPED_FLOAT_TO_UBYTE( dest->red,	  v[0] );
-   UNCLAMPED_FLOAT_TO_UBYTE( dest->green, v[1] );
-   UNCLAMPED_FLOAT_TO_UBYTE( dest->blue,  v[2] );
-   dest->alpha = 255;
-}
-
-#if 0
-static void r200_SecondaryColor3ubEXT_3f( GLubyte r, GLubyte g, GLubyte b )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   GLfloat *dest = rmesa->vb.floatspecptr;
-   dest[0] = UBYTE_TO_FLOAT(r);
-   dest[1] = UBYTE_TO_FLOAT(g);
-   dest[2] = UBYTE_TO_FLOAT(b);
-   dest[3] = 1.0;
-}
-
-static void r200_SecondaryColor3ubvEXT_3f( const GLubyte *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   GLfloat *dest = rmesa->vb.floatspecptr;
-   dest[0] = UBYTE_TO_FLOAT(v[0]);
-   dest[1] = UBYTE_TO_FLOAT(v[1]);
-   dest[2] = UBYTE_TO_FLOAT(v[2]);
-   dest[3] = 1.0;
-}
-#endif /* 0 */
-
-static void r200_SecondaryColor3fEXT_3f( GLfloat r, GLfloat g, GLfloat b )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   GLfloat *dest = rmesa->vb.floatspecptr;
-   dest[0] = r;
-   dest[1] = g;
-   dest[2] = b;
-   dest[3] = 1.0;
-}
-
-static void r200_SecondaryColor3fvEXT_3f( const GLfloat *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   GLfloat *dest = rmesa->vb.floatspecptr;
-   dest[0] = v[0];
-   dest[1] = v[1];
-   dest[2] = v[2];
-   dest[3] = 1.0;
-}
-
-
-
-/* Normal
- */
-static void r200_Normal3f( GLfloat n0, GLfloat n1, GLfloat n2 )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   GLfloat *dest = rmesa->vb.normalptr;
-   dest[0] = n0;
-   dest[1] = n1;
-   dest[2] = n2;
-}
-
-static void r200_Normal3fv( const GLfloat *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   GLfloat *dest = rmesa->vb.normalptr;
-   dest[0] = v[0];
-   dest[1] = v[1];
-   dest[2] = v[2];
-}
-
-
-/* FogCoord
- */
-static void r200_FogCoordfEXT( GLfloat f )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   GLfloat *dest = rmesa->vb.fogptr;
-   dest[0] = r200ComputeFogBlendFactor( ctx, f );
-/*   ctx->Current.Attrib[VERT_ATTRIB_FOG][0] = f;*/
-}
-
-static void r200_FogCoordfvEXT( const GLfloat *v )
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   GLfloat *dest = rmesa->vb.fogptr;
-   dest[0] = r200ComputeFogBlendFactor( ctx, v[0] );
-/*   ctx->Current.Attrib[VERT_ATTRIB_FOG][0] = v[0];*/
-}
-
-
-/* TexCoord
- */
-
-/* \todo maybe (target & 4 ? target & 5 : target & 3) is more save than (target & 7) */
-static void r200_MultiTexCoord1fARB(GLenum target, GLfloat s)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   GLint unit = (target & 7);
-   GLfloat * const dest = rmesa->vb.texcoordptr[unit];
-
-   switch( ctx->Texture.Unit[unit]._ReallyEnabled ) {
-   case TEXTURE_CUBE_BIT:
-   case TEXTURE_3D_BIT:
-      dest[2] = 0.0;
-      /* FALLTHROUGH */
-   case TEXTURE_2D_BIT:
-   case TEXTURE_RECT_BIT:
-      dest[1] = 0.0;
-      /* FALLTHROUGH */
-   case TEXTURE_1D_BIT:
-      dest[0] = s;
-   }
-}
-
-static void r200_MultiTexCoord2fARB(GLenum target, GLfloat s, GLfloat t)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   GLint unit = (target & 7);
-   GLfloat * const dest = rmesa->vb.texcoordptr[unit];
-
-   switch( ctx->Texture.Unit[unit]._ReallyEnabled ) {
-   case TEXTURE_CUBE_BIT:
-   case TEXTURE_3D_BIT:
-      dest[2] = 0.0;
-      /* FALLTHROUGH */
-   case TEXTURE_2D_BIT:
-   case TEXTURE_RECT_BIT:
-      dest[1] = t;
-      dest[0] = s;
-      break;
-   default:
-      VFMT_FALLBACK(__FUNCTION__);
-      CALL_MultiTexCoord2fARB(GET_DISPATCH(), (target, s, t));
-      return;	
-   }
-}
-
-static void r200_MultiTexCoord3fARB(GLenum target, GLfloat s, GLfloat t, GLfloat r)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   GLint unit = (target & 7);
-   GLfloat * const dest = rmesa->vb.texcoordptr[unit];
-
-   switch( ctx->Texture.Unit[unit]._ReallyEnabled ) {
-   case TEXTURE_CUBE_BIT:
-   case TEXTURE_3D_BIT:
-      dest[2] = r;
-      dest[1] = t;
-      dest[0] = s;
-      break;
-   default:
-      VFMT_FALLBACK(__FUNCTION__);
-      CALL_MultiTexCoord3fARB(GET_DISPATCH(), (target, s, t, r));
-      return;	
-   }
-}
-
-static void r200_TexCoord1f(GLfloat s)
-{
-   r200_MultiTexCoord1fARB(GL_TEXTURE0, s);
-}
-
-static void r200_TexCoord2f(GLfloat s, GLfloat t)
-{
-   r200_MultiTexCoord2fARB(GL_TEXTURE0, s, t);
-}
-
-static void r200_TexCoord3f(GLfloat s, GLfloat t, GLfloat r)
-{
-   r200_MultiTexCoord3fARB(GL_TEXTURE0, s, t, r);
-}
-
-static void r200_TexCoord1fv(const GLfloat *v)
-{
-   r200_MultiTexCoord1fARB(GL_TEXTURE0, v[0]);
-}
-
-static void r200_TexCoord2fv(const GLfloat *v)
-{
-   r200_MultiTexCoord2fARB(GL_TEXTURE0, v[0], v[1]);
-}
-
-static void r200_TexCoord3fv(const GLfloat *v)
-{
-   r200_MultiTexCoord3fARB(GL_TEXTURE0, v[0], v[1], v[2]);
-}
-
-static void r200_MultiTexCoord1fvARB(GLenum target, const GLfloat *v)
-{
-   r200_MultiTexCoord1fARB(target, v[0]);
-}
-
-static void r200_MultiTexCoord2fvARB(GLenum target, const GLfloat *v)
-{
-   r200_MultiTexCoord2fARB(target, v[0], v[1]);
-}
-
-static void r200_MultiTexCoord3fvARB(GLenum target, const GLfloat *v)
-{
-   r200_MultiTexCoord3fARB(target, v[0], v[1], v[2]);
-}
-
-
-static struct dynfn *lookup( struct dynfn *l, const int *key )
-{
-   struct dynfn *f;
-
-   foreach( f, l ) {
-      if (f->key[0] == key[0] && f->key[1] == key[1]) 
-	 return f;
-   }
-
-   return NULL;
-}
-
-/* Can't use the loopback template for this:
- */
-
-#define CHOOSE(FN, FNTYPE, MASK0, MASK1, ARGS1, ARGS2 )			\
-static void choose_##FN ARGS1						\
-{									\
-   GET_CURRENT_CONTEXT(ctx);						\
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);				\
-   int key[2];								\
-   struct dynfn *dfn;							\
-									\
-   key[0] = rmesa->vb.vtxfmt_0 & MASK0;					\
-   key[1] = rmesa->vb.vtxfmt_1 & MASK1;					\
-									\
-   dfn = lookup( &rmesa->vb.dfn_cache.FN, key );			\
-   if (dfn == 0)							\
-      dfn = rmesa->vb.codegen.FN( ctx, key );				\
-   else if (R200_DEBUG & DEBUG_CODEGEN)					\
-      fprintf(stderr, "%s -- cached codegen\n", __FUNCTION__ );		\
-									\
-   if (dfn)								\
-      SET_ ## FN (ctx->Exec, (FNTYPE)(dfn->code));			\
-   else {								\
-      if (R200_DEBUG & DEBUG_CODEGEN)					\
-	 fprintf(stderr, "%s -- generic version\n", __FUNCTION__ );	\
-      SET_ ## FN (ctx->Exec, r200_##FN);				\
-   }									\
-									\
-   ctx->Driver.NeedFlush |= FLUSH_UPDATE_CURRENT;			\
-   CALL_ ## FN (ctx->Exec, ARGS2);					\
-}
-
-
-
-/* For the _3f case, only allow one color function to be hooked in at
- * a time.  Eventually, use a similar mechanism to allow selecting the
- * color component of the vertex format based on client behaviour.  
- *
- * Note:  Perform these actions even if there is a codegen or cached 
- * codegen version of the chosen function.
- */
-#define CHOOSE_COLOR(FN, FNTYPE, NR, MASK0, MASK1, ARGS1, ARGS2 )	\
-static void choose_##FN ARGS1						\
-{									\
-   GET_CURRENT_CONTEXT(ctx);						\
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);			\
-   int key[2];								\
-   struct dynfn *dfn;							\
-									\
-   key[0] = rmesa->vb.vtxfmt_0 & MASK0;					\
-   key[1] = rmesa->vb.vtxfmt_1 & MASK1;					\
-									\
-   if (VTX_COLOR(rmesa->vb.vtxfmt_0,0) == R200_VTX_PK_RGBA) {		\
-      SET_ ## FN (ctx->Exec, r200_##FN##_ub);				\
-   }									\
-   else if (VTX_COLOR(rmesa->vb.vtxfmt_0,0) == R200_VTX_FP_RGB) {	\
-									\
-      if (rmesa->vb.installed_color_3f_sz != NR) {			\
-         rmesa->vb.installed_color_3f_sz = NR;				\
-         if (NR == 3) ctx->Current.Attrib[VERT_ATTRIB_COLOR0][3] = 1.0;	\
-         if (ctx->Driver.NeedFlush & FLUSH_UPDATE_CURRENT) {		\
-            r200_copy_to_current( ctx );				\
-            _mesa_install_exec_vtxfmt( ctx, &rmesa->vb.vtxfmt );	\
-            CALL_ ## FN (ctx->Exec, ARGS2);				\
-            return;							\
-         }								\
-      }									\
-									\
-      SET_ ## FN (ctx->Exec, r200_##FN##_3f);				\
-   }									\
-   else {								\
-      SET_ ## FN (ctx->Exec, r200_##FN##_4f);				\
-   }									\
-									\
-									\
-   dfn = lookup( &rmesa->vb.dfn_cache.FN, key );			\
-   if (!dfn) dfn = rmesa->vb.codegen.FN( ctx, key );			\
-									\
-   if (dfn) {								\
-      if (R200_DEBUG & DEBUG_CODEGEN)					\
-         fprintf(stderr, "%s -- codegen version\n", __FUNCTION__ );	\
-      SET_ ## FN (ctx->Exec, (FNTYPE)dfn->code);			\
-   }									\
-   else if (R200_DEBUG & DEBUG_CODEGEN)					\
-         fprintf(stderr, "%s -- 'c' version\n", __FUNCTION__ );		\
-									\
-   ctx->Driver.NeedFlush |= FLUSH_UPDATE_CURRENT;			\
-   CALL_ ## FN (ctx->Exec, ARGS2);					\
-}
-
-
-
-/* Right now there are both _ub and _3f versions of the secondary color
- * functions.  Currently, we only set-up the hardware to use the _ub versions.
- * The _3f versions are needed for the cases where secondary color isn't used
- * in the vertex format, but it still needs to be stored in the context
- * state vector.
- */
-#define CHOOSE_SECONDARY_COLOR(FN, FNTYPE, MASK0, MASK1, ARGS1, ARGS2 )	\
-static void choose_##FN ARGS1						\
-{									\
-   GET_CURRENT_CONTEXT(ctx);						\
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);			\
-   int key[2];								\
-   struct dynfn *dfn;							\
-									\
-   key[0] = rmesa->vb.vtxfmt_0 & MASK0;					\
-   key[1] = rmesa->vb.vtxfmt_1 & MASK1;					\
-									\
-   dfn = lookup( &rmesa->vb.dfn_cache.FN, key );			\
-   if (dfn == 0)							\
-      dfn = rmesa->vb.codegen.FN( ctx, key );			\
-   else  if (R200_DEBUG & DEBUG_CODEGEN)				\
-      fprintf(stderr, "%s -- cached version\n", __FUNCTION__ );		\
-									\
-   if (dfn)								\
-      SET_ ## FN (ctx->Exec, (FNTYPE)(dfn->code));			\
-   else {								\
-      if (R200_DEBUG & DEBUG_CODEGEN)					\
-         fprintf(stderr, "%s -- generic version\n", __FUNCTION__ );	\
-      SET_ ## FN (ctx->Exec, (VTX_COLOR(rmesa->vb.vtxfmt_0,1) == R200_VTX_PK_RGBA) \
-	  ? r200_##FN##_ub : r200_##FN##_3f);				\
-   }									\
-									\
-   ctx->Driver.NeedFlush |= FLUSH_UPDATE_CURRENT;		\
-   CALL_ ## FN (ctx->Exec, ARGS2);					\
-}
-
-
-
-
-
-
-
-/* VTXFMT_0
- */
-#define MASK_XYZW  (R200_VTX_W0|R200_VTX_Z0)
-#define MASK_NORM  (MASK_XYZW|R200_VTX_N0)
-#define MASK_FOG   (MASK_NORM |R200_VTX_DISCRETE_FOG)
-#define MASK_COLOR (MASK_FOG |(R200_VTX_COLOR_MASK<<R200_VTX_COLOR_0_SHIFT))
-#define MASK_SPEC  (MASK_COLOR|(R200_VTX_COLOR_MASK<<R200_VTX_COLOR_1_SHIFT))
-
-/* VTXFMT_1
- */
-#define MASK_ST0 (0x7 << R200_VTX_TEX0_COMP_CNT_SHIFT)
-/* FIXME: maybe something like in the radeon driver is needed here? */
-
-
-typedef void (*p4f)( GLfloat, GLfloat, GLfloat, GLfloat );
-typedef void (*p3f)( GLfloat, GLfloat, GLfloat );
-typedef void (*p2f)( GLfloat, GLfloat );
-typedef void (*p1f)( GLfloat );
-typedef void (*pe3f)( GLenum, GLfloat, GLfloat, GLfloat );
-typedef void (*pe2f)( GLenum, GLfloat, GLfloat );
-typedef void (*pe1f)( GLenum, GLfloat );
-typedef void (*p4ub)( GLubyte, GLubyte, GLubyte, GLubyte );
-typedef void (*p3ub)( GLubyte, GLubyte, GLubyte );
-typedef void (*pfv)( const GLfloat * );
-typedef void (*pefv)( GLenum, const GLfloat * );
-typedef void (*pubv)( const GLubyte * );
-
-
-CHOOSE(Normal3f, p3f, MASK_NORM, 0, 
-       (GLfloat a,GLfloat b,GLfloat c), (a,b,c))
-CHOOSE(Normal3fv, pfv, MASK_NORM, 0, 
-       (const GLfloat *v), (v))
-
-#if 0
-CHOOSE_COLOR(Color4ub, p4ub, 4, MASK_COLOR, 0,
-	(GLubyte a,GLubyte b, GLubyte c, GLubyte d), (a,b,c,d))
-CHOOSE_COLOR(Color4ubv, pubv, 4, MASK_COLOR, 0, 
-	(const GLubyte *v), (v))
-CHOOSE_COLOR(Color3ub, p3ub, 3, MASK_COLOR, 0, 
-	(GLubyte a,GLubyte b, GLubyte c), (a,b,c))
-CHOOSE_COLOR(Color3ubv, pubv, 3, MASK_COLOR, 0, 
-	(const GLubyte *v), (v))
-CHOOSE_SECONDARY_COLOR(SecondaryColor3ubEXT, p3ub, MASK_SPEC, 0, 
-	(GLubyte a,GLubyte b, GLubyte c), (a,b,c))
-CHOOSE_SECONDARY_COLOR(SecondaryColor3ubvEXT, pubv, MASK_SPEC, 0, 
-	(const GLubyte *v), (v))
-#endif
-
-CHOOSE_COLOR(Color4f, p4f, 4, MASK_COLOR, 0, 
-	(GLfloat a,GLfloat b, GLfloat c, GLfloat d), (a,b,c,d))
-CHOOSE_COLOR(Color4fv, pfv, 4, MASK_COLOR, 0, 
-	(const GLfloat *v), (v))
-CHOOSE_COLOR(Color3f, p3f, 3, MASK_COLOR, 0,
-	(GLfloat a,GLfloat b, GLfloat c), (a,b,c))
-CHOOSE_COLOR(Color3fv, pfv, 3, MASK_COLOR, 0,
-	(const GLfloat *v), (v))
-
-
-CHOOSE_SECONDARY_COLOR(SecondaryColor3fEXT, p3f, MASK_SPEC, 0,
-	(GLfloat a,GLfloat b, GLfloat c), (a,b,c))
-CHOOSE_SECONDARY_COLOR(SecondaryColor3fvEXT, pfv, MASK_SPEC, 0,
-	(const GLfloat *v), (v))
-
-CHOOSE(TexCoord3f, p3f, ~0, MASK_ST0, 
-       (GLfloat a,GLfloat b,GLfloat c), (a,b,c))
-CHOOSE(TexCoord3fv, pfv, ~0, MASK_ST0, 
-       (const GLfloat *v), (v))
-CHOOSE(TexCoord2f, p2f, ~0, MASK_ST0, 
-       (GLfloat a,GLfloat b), (a,b))
-CHOOSE(TexCoord2fv, pfv, ~0, MASK_ST0, 
-       (const GLfloat *v), (v))
-CHOOSE(TexCoord1f, p1f, ~0, MASK_ST0, 
-       (GLfloat a), (a))
-CHOOSE(TexCoord1fv, pfv, ~0, MASK_ST0, 
-       (const GLfloat *v), (v))
-
-CHOOSE(MultiTexCoord3fARB, pe3f, ~0, ~0,
-	 (GLenum u,GLfloat a,GLfloat b,GLfloat c), (u,a,b,c))
-CHOOSE(MultiTexCoord3fvARB, pefv, ~0, ~0,
-	(GLenum u,const GLfloat *v), (u,v))
-CHOOSE(MultiTexCoord2fARB, pe2f, ~0, ~0,
-	 (GLenum u,GLfloat a,GLfloat b), (u,a,b))
-CHOOSE(MultiTexCoord2fvARB, pefv, ~0, ~0,
-	(GLenum u,const GLfloat *v), (u,v))
-CHOOSE(MultiTexCoord1fARB, pe1f, ~0, ~0,
-	 (GLenum u,GLfloat a), (u,a))
-CHOOSE(MultiTexCoord1fvARB, pefv, ~0, ~0,
-	(GLenum u,const GLfloat *v), (u,v))
-
-CHOOSE(Vertex3f, p3f, ~0, ~0, 
-       (GLfloat a,GLfloat b,GLfloat c), (a,b,c))
-CHOOSE(Vertex3fv, pfv, ~0, ~0, 
-       (const GLfloat *v), (v))
-CHOOSE(Vertex2f, p2f, ~0, ~0, 
-       (GLfloat a,GLfloat b), (a,b))
-CHOOSE(Vertex2fv, pfv, ~0, ~0, 
-       (const GLfloat *v), (v))
-
-CHOOSE(FogCoordfEXT, p1f, MASK_FOG, ~0, 
-       (GLfloat f), (f))
-CHOOSE(FogCoordfvEXT, pfv, MASK_FOG, ~0, 
-       (const GLfloat *f), (f))
-
-
-
-
-void r200VtxfmtInitChoosers( GLvertexformat *vfmt )
-{
-   vfmt->Color3f = choose_Color3f;
-   vfmt->Color3fv = choose_Color3fv;
-   vfmt->Color4f = choose_Color4f;
-   vfmt->Color4fv = choose_Color4fv;
-   vfmt->SecondaryColor3fEXT = choose_SecondaryColor3fEXT;
-   vfmt->SecondaryColor3fvEXT = choose_SecondaryColor3fvEXT;
-   vfmt->MultiTexCoord1fARB = choose_MultiTexCoord1fARB;
-   vfmt->MultiTexCoord1fvARB = choose_MultiTexCoord1fvARB;
-   vfmt->MultiTexCoord2fARB = choose_MultiTexCoord2fARB;
-   vfmt->MultiTexCoord2fvARB = choose_MultiTexCoord2fvARB;
-   vfmt->MultiTexCoord3fARB = choose_MultiTexCoord3fARB;
-   vfmt->MultiTexCoord3fvARB = choose_MultiTexCoord3fvARB;
-   vfmt->Normal3f = choose_Normal3f;
-   vfmt->Normal3fv = choose_Normal3fv;
-   vfmt->TexCoord1f = choose_TexCoord1f;
-   vfmt->TexCoord1fv = choose_TexCoord1fv;
-   vfmt->TexCoord2f = choose_TexCoord2f;
-   vfmt->TexCoord2fv = choose_TexCoord2fv;
-   vfmt->TexCoord3f = choose_TexCoord3f;
-   vfmt->TexCoord3fv = choose_TexCoord3fv;
-   vfmt->Vertex2f = choose_Vertex2f;
-   vfmt->Vertex2fv = choose_Vertex2fv;
-   vfmt->Vertex3f = choose_Vertex3f;
-   vfmt->Vertex3fv = choose_Vertex3fv;
-/*   vfmt->FogCoordfEXT = choose_FogCoordfEXT;
-   vfmt->FogCoordfvEXT = choose_FogCoordfvEXT;*/
-
-   /* TODO: restore ubyte colors to vtxfmt.
-    */
-#if 0
-   vfmt->Color3ub = choose_Color3ub;
-   vfmt->Color3ubv = choose_Color3ubv;
-   vfmt->Color4ub = choose_Color4ub;
-   vfmt->Color4ubv = choose_Color4ubv;
-   vfmt->SecondaryColor3ubEXT = choose_SecondaryColor3ubEXT;
-   vfmt->SecondaryColor3ubvEXT = choose_SecondaryColor3ubvEXT;
-#endif
-}
-
-
-static struct dynfn *codegen_noop( GLcontext *ctx, const int *key )
-{
-   (void) ctx; (void) key;
-   return NULL;
-}
-
-void r200InitCodegen( struct dfn_generators *gen, GLboolean useCodegen )
-{
-   gen->Vertex3f = codegen_noop;
-   gen->Vertex3fv = codegen_noop;
-   gen->Color4ub = codegen_noop;
-   gen->Color4ubv = codegen_noop;
-   gen->Normal3f = codegen_noop;
-   gen->Normal3fv = codegen_noop;
-
-   gen->TexCoord3f = codegen_noop;
-   gen->TexCoord3fv = codegen_noop;
-   gen->TexCoord2f = codegen_noop;
-   gen->TexCoord2fv = codegen_noop;
-   gen->TexCoord1f = codegen_noop;
-   gen->TexCoord1fv = codegen_noop;
-
-   gen->MultiTexCoord3fARB = codegen_noop;
-   gen->MultiTexCoord3fvARB = codegen_noop;
-   gen->MultiTexCoord2fARB = codegen_noop;
-   gen->MultiTexCoord2fvARB = codegen_noop;
-   gen->MultiTexCoord1fARB = codegen_noop;
-   gen->MultiTexCoord1fvARB = codegen_noop;
-/*   gen->FogCoordfEXT = codegen_noop;
-   gen->FogCoordfvEXT = codegen_noop;*/
-
-   gen->Vertex2f = codegen_noop;
-   gen->Vertex2fv = codegen_noop;
-   gen->Color3ub = codegen_noop;
-   gen->Color3ubv = codegen_noop;
-   gen->Color4f = codegen_noop;
-   gen->Color4fv = codegen_noop;
-   gen->Color3f = codegen_noop;
-   gen->Color3fv = codegen_noop;
-   gen->SecondaryColor3fEXT = codegen_noop;
-   gen->SecondaryColor3fvEXT = codegen_noop;
-   gen->SecondaryColor3ubEXT = codegen_noop;
-   gen->SecondaryColor3ubvEXT = codegen_noop;
-
-   if (useCodegen) {
-#if defined(USE_X86_ASM)
-      r200InitX86Codegen( gen );
-#endif
-
-#if defined(USE_SSE_ASM)
-      r200InitSSECodegen( gen );
-#endif
-   }
-}
diff --git a/src/mesa/drivers/dri/r200/r200_vtxfmt_sse.c b/src/mesa/drivers/dri/r200/r200_vtxfmt_sse.c
deleted file mode 100644
index 5901730494a..00000000000
--- a/src/mesa/drivers/dri/r200/r200_vtxfmt_sse.c
+++ /dev/null
@@ -1,234 +0,0 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/r200/r200_vtxfmt_sse.c,v 1.1 2002/10/30 12:51:53 alanh Exp $ */
-/*
-Copyright (C) The Weather Channel, Inc.  2002.  All Rights Reserved.
-
-The Weather Channel (TM) funded Tungsten Graphics to develop the
-initial release of the Radeon 8500 driver under the XFree86 license.
-This notice must be preserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial
-portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-**************************************************************************/
-
-/*
- * Authors:
- *   Keith Whitwell <[email protected]>
- */
-
-#include "glheader.h"
-#include "imports.h"
-#include "simple_list.h" 
-#include "r200_vtxfmt.h"
-
-#if defined(USE_SSE_ASM)
-#include "x86/common_x86_asm.h"
-
-#define EXTERN( FUNC )		\
-extern const char *FUNC;	\
-extern const char *FUNC##_end
-
-EXTERN( _sse_Attribute2fv );
-EXTERN( _sse_Attribute2f );
-EXTERN( _sse_Attribute3fv );
-EXTERN( _sse_Attribute3f );
-EXTERN( _sse_MultiTexCoord2fv );
-EXTERN( _sse_MultiTexCoord2f );
-EXTERN( _sse_MultiTexCoord2fv_2 );
-EXTERN( _sse_MultiTexCoord2f_2 );
-
-/* Build specialized versions of the immediate calls on the fly for
- * the current state.
- */
-
-static struct dynfn *r200_makeSSEAttribute2fv( struct dynfn * cache, const int * key,
-					       const char * name, void * dest)
-{
-   struct dynfn *dfn = MALLOC_STRUCT( dynfn );
-
-   if (R200_DEBUG & DEBUG_CODEGEN)
-      fprintf(stderr, "%s 0x%08x\n", name, key[0] );
-
-   DFN ( _sse_Attribute2fv, (*cache) );
-   FIXUP(dfn->code, 10, 0x0, (int)dest);
-   return dfn;
-}
-
-static struct dynfn *r200_makeSSEAttribute2f( struct dynfn * cache, const int * key,
-					      const char * name, void * dest )
-{
-   struct dynfn *dfn = MALLOC_STRUCT( dynfn );
-
-   if (R200_DEBUG & DEBUG_CODEGEN)
-      fprintf(stderr, "%s 0x%08x\n", name, key[0] );
-
-   DFN ( _sse_Attribute2f, (*cache) );
-   FIXUP(dfn->code, 8, 0x0, (int)dest); 
-   return dfn;
-}
-
-static struct dynfn *r200_makeSSEAttribute3fv( struct dynfn * cache, const int * key,
-					       const char * name, void * dest)
-{
-   struct dynfn *dfn = MALLOC_STRUCT( dynfn );
-
-   if (R200_DEBUG & DEBUG_CODEGEN)
-      fprintf(stderr, "%s 0x%08x\n", name, key[0] );
-
-   DFN ( _sse_Attribute3fv, (*cache) );
-   FIXUP(dfn->code, 13, 0x0, (int)dest);
-   FIXUP(dfn->code, 18, 0x8, 8+(int)dest);
-   return dfn;
-}
-
-static struct dynfn *r200_makeSSEAttribute3f( struct dynfn * cache, const int * key,
-					      const char * name, void * dest )
-{
-   struct dynfn *dfn = MALLOC_STRUCT( dynfn );
-
-   if (R200_DEBUG & DEBUG_CODEGEN)
-      fprintf(stderr, "%s 0x%08x\n", name, key[0] );
-
-   DFN ( _sse_Attribute3f, (*cache) );
-   FIXUP(dfn->code, 12, 0x0, (int)dest); 
-   FIXUP(dfn->code, 17, 0x8, 8+(int)dest); 
-   return dfn;
-}
-
-static struct dynfn *r200_makeSSENormal3fv( GLcontext *ctx, const int *key )
-{
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-
-   return r200_makeSSEAttribute3fv( & rmesa->vb.dfn_cache.Normal3fv, key,
-				    __FUNCTION__, rmesa->vb.normalptr );
-}
-
-static struct dynfn *r200_makeSSENormal3f( GLcontext *ctx, const int * key )
-{
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-
-   return r200_makeSSEAttribute3f( & rmesa->vb.dfn_cache.Normal3f, key,
-				   __FUNCTION__, rmesa->vb.normalptr );
-}
-
-static struct dynfn *r200_makeSSEColor3fv( GLcontext *ctx, const int * key )
-{
-   if (VTX_COLOR(key[0],0) != R200_VTX_FP_RGB) 
-      return NULL;
-   else
-   {
-      r200ContextPtr rmesa = R200_CONTEXT(ctx);
-
-      return r200_makeSSEAttribute3fv( & rmesa->vb.dfn_cache.Color3fv, key,
-				       __FUNCTION__, rmesa->vb.floatcolorptr );
-   }
-}
-
-static struct dynfn *r200_makeSSEColor3f( GLcontext *ctx, const int * key )
-{
-   if (VTX_COLOR(key[0],0) != R200_VTX_FP_RGB) 
-      return NULL;
-   else
-   {
-      r200ContextPtr rmesa = R200_CONTEXT(ctx);
-
-      return r200_makeSSEAttribute3f( & rmesa->vb.dfn_cache.Color3f, key,
-				      __FUNCTION__, rmesa->vb.floatcolorptr );
-   }
-}
-
-#if 0 /* Temporarily disabled as it is broken w/the new cubemap code. - idr */
-static struct dynfn *r200_makeSSETexCoord2fv( GLcontext *ctx, const int * key )
-{
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-
-   return r200_makeSSEAttribute2fv( & rmesa->vb.dfn_cache.TexCoord2fv, key,
-				    __FUNCTION__, rmesa->vb.texcoordptr[0] );
-}
-
-static struct dynfn *r200_makeSSETexCoord2f( GLcontext *ctx, const int * key )
-{
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-
-   return r200_makeSSEAttribute2f( & rmesa->vb.dfn_cache.TexCoord2f, key,
-				   __FUNCTION__, rmesa->vb.texcoordptr[0] );
-}
-
-static struct dynfn *r200_makeSSEMultiTexCoord2fv( GLcontext *ctx, const int * key )
-{
-   struct dynfn *dfn = MALLOC_STRUCT( dynfn );
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-
-   if (R200_DEBUG & DEBUG_CODEGEN)
-      fprintf(stderr, "%s 0x%08x\n", __FUNCTION__, key[0] );
-
-   if (rmesa->vb.texcoordptr[1] == rmesa->vb.texcoordptr[0]+4) {
-      DFN ( _sse_MultiTexCoord2fv, rmesa->vb.dfn_cache.MultiTexCoord2fvARB );
-      FIXUP(dfn->code, 18, 0xdeadbeef, (int)rmesa->vb.texcoordptr[0]);	
-   } else {
-      DFN ( _sse_MultiTexCoord2fv_2, rmesa->vb.dfn_cache.MultiTexCoord2fvARB );
-      FIXUP(dfn->code, 14, 0x0, (int)rmesa->vb.texcoordptr);
-   }
-   return dfn;
-}
-
-static struct dynfn *r200_makeSSEMultiTexCoord2f( GLcontext *ctx, const int * key )
-{
-   struct dynfn *dfn = MALLOC_STRUCT( dynfn );
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-
-   if (R200_DEBUG & DEBUG_CODEGEN)
-      fprintf(stderr, "%s 0x%08x\n", __FUNCTION__, key[0] );
-
-   if (rmesa->vb.texcoordptr[1] == rmesa->vb.texcoordptr[0]+4) {
-      DFN ( _sse_MultiTexCoord2f, rmesa->vb.dfn_cache.MultiTexCoord2fARB );
-      FIXUP(dfn->code, 16, 0xdeadbeef, (int)rmesa->vb.texcoordptr[0]);	
-   } else {
-      DFN ( _sse_MultiTexCoord2f_2, rmesa->vb.dfn_cache.MultiTexCoord2fARB );
-      FIXUP(dfn->code, 15, 0x0, (int)rmesa->vb.texcoordptr);
-   }
-   return dfn;
-}
-#endif
-
-void r200InitSSECodegen( struct dfn_generators *gen )
-{
-   if ( cpu_has_xmm ) {
-      gen->Normal3fv = (void *) r200_makeSSENormal3fv;
-      gen->Normal3f = (void *) r200_makeSSENormal3f;
-      gen->Color3fv = (void *) r200_makeSSEColor3fv;
-      gen->Color3f = (void *) r200_makeSSEColor3f;
-#if 0 /* Temporarily disabled as it is broken w/the new cubemap code. - idr */
-      gen->TexCoord2fv = (void *) r200_makeSSETexCoord2fv;
-      gen->TexCoord2f = (void *) r200_makeSSETexCoord2f;
-      gen->MultiTexCoord2fvARB = (void *) r200_makeSSEMultiTexCoord2fv;
-      gen->MultiTexCoord2fARB = (void *) r200_makeSSEMultiTexCoord2f;
-#endif
-   }
-}
-
-#else 
-
-void r200InitSSECodegen( struct dfn_generators *gen )
-{
-   (void) gen;
-}
-
-#endif
diff --git a/src/mesa/drivers/dri/r200/r200_vtxfmt_x86.c b/src/mesa/drivers/dri/r200/r200_vtxfmt_x86.c
deleted file mode 100644
index b78a55c31f6..00000000000
--- a/src/mesa/drivers/dri/r200/r200_vtxfmt_x86.c
+++ /dev/null
@@ -1,440 +0,0 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/r200/r200_vtxfmt_x86.c,v 1.2 2002/12/16 16:18:56 dawes Exp $ */
-/*
-Copyright (C) The Weather Channel, Inc.  2002.  All Rights Reserved.
-
-The Weather Channel (TM) funded Tungsten Graphics to develop the
-initial release of the Radeon 8500 driver under the XFree86 license.
-This notice must be preserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial
-portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-**************************************************************************/
-
-/*
- * Authors:
- *   Keith Whitwell <[email protected]>
- */
-
-#include "glheader.h"
-#include "imports.h"
-#include "simple_list.h" 
-#include "r200_vtxfmt.h"
-
-#if defined(USE_X86_ASM)
-
-#define EXTERN( FUNC )		\
-extern const char *FUNC;	\
-extern const char *FUNC##_end
-
-EXTERN ( _x86_Attribute2fv );
-EXTERN ( _x86_Attribute2f );
-EXTERN ( _x86_Attribute3fv );
-EXTERN ( _x86_Attribute3f );
-EXTERN ( _x86_Vertex3fv_6 );
-EXTERN ( _x86_Vertex3fv_8 );
-EXTERN ( _x86_Vertex3fv );
-EXTERN ( _x86_Vertex3f_4 );
-EXTERN ( _x86_Vertex3f_6 );
-EXTERN ( _x86_Vertex3f );
-EXTERN ( _x86_Color4ubv_ub );
-EXTERN ( _x86_Color4ubv_4f );
-EXTERN ( _x86_Color4ub_ub );
-EXTERN ( _x86_MultiTexCoord2fv );
-EXTERN ( _x86_MultiTexCoord2fv_2 );
-EXTERN ( _x86_MultiTexCoord2f );
-EXTERN ( _x86_MultiTexCoord2f_2 );
-
-
-/* Build specialized versions of the immediate calls on the fly for
- * the current state.  Generic x86 versions.
- */
-
-struct dynfn *r200_makeX86Vertex3f( GLcontext *ctx, const int *key )
-{
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   struct dynfn *dfn = MALLOC_STRUCT( dynfn );
-
-   if (R200_DEBUG & DEBUG_CODEGEN)
-      fprintf(stderr, "%s 0x%08x 0x%08x %d\n", __FUNCTION__, 
-	      key[0], key[1], rmesa->vb.vertex_size );
-
-   switch (rmesa->vb.vertex_size) {
-   case 4: {
-
-      DFN ( _x86_Vertex3f_4, rmesa->vb.dfn_cache.Vertex3f );
-      FIXUP(dfn->code, 2, 0x0, (int)&rmesa->vb.dmaptr);
-      FIXUP(dfn->code, 25, 0x0, (int)&rmesa->vb.vertex[3]);
-      FIXUP(dfn->code, 36, 0x0, (int)&rmesa->vb.counter);
-      FIXUP(dfn->code, 46, 0x0, (int)&rmesa->vb.dmaptr);
-      FIXUP(dfn->code, 51, 0x0, (int)&rmesa->vb.counter);
-      FIXUP(dfn->code, 60, 0x0, (int)&rmesa->vb.notify);
-      break;
-   }
-   case 6: {
-
-      DFN ( _x86_Vertex3f_6, rmesa->vb.dfn_cache.Vertex3f );
-      FIXUP(dfn->code, 3, 0x0, (int)&rmesa->vb.dmaptr);
-      FIXUP(dfn->code, 28, 0x0, (int)&rmesa->vb.vertex[3]);
-      FIXUP(dfn->code, 34, 0x0, (int)&rmesa->vb.vertex[4]);
-      FIXUP(dfn->code, 40, 0x0, (int)&rmesa->vb.vertex[5]);
-      FIXUP(dfn->code, 57, 0x0, (int)&rmesa->vb.counter);
-      FIXUP(dfn->code, 63, 0x0, (int)&rmesa->vb.dmaptr);
-      FIXUP(dfn->code, 70, 0x0, (int)&rmesa->vb.counter);
-      FIXUP(dfn->code, 79, 0x0, (int)&rmesa->vb.notify);
-      break;
-   }
-   default: {
-
-      DFN ( _x86_Vertex3f, rmesa->vb.dfn_cache.Vertex3f );
-      FIXUP(dfn->code, 3, 0x0, (int)&rmesa->vb.vertex[3]);
-      FIXUP(dfn->code, 9, 0x0, (int)&rmesa->vb.dmaptr);
-      FIXUP(dfn->code, 37, 0x0, rmesa->vb.vertex_size-3);
-      FIXUP(dfn->code, 44, 0x0, (int)&rmesa->vb.counter);
-      FIXUP(dfn->code, 50, 0x0, (int)&rmesa->vb.dmaptr);
-      FIXUP(dfn->code, 56, 0x0, (int)&rmesa->vb.counter);
-      FIXUP(dfn->code, 67, 0x0, (int)&rmesa->vb.notify);
-   break;
-   }
-   }
-
-   return dfn;
-}
-
-
-
-struct dynfn *r200_makeX86Vertex3fv( GLcontext *ctx, const int *key )
-{
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-   struct dynfn *dfn = MALLOC_STRUCT( dynfn );
-
-   if (R200_DEBUG & DEBUG_CODEGEN)
-      fprintf(stderr, "%s 0x%08x 0x%08x %d\n", __FUNCTION__, 
-	      key[0], key[1], rmesa->vb.vertex_size );
-
-   switch (rmesa->vb.vertex_size) {
-   case 6: {
-
-      DFN ( _x86_Vertex3fv_6, rmesa->vb.dfn_cache.Vertex3fv );
-      FIXUP(dfn->code, 1, 0x00000000, (int)&rmesa->vb.dmaptr);
-      FIXUP(dfn->code, 27, 0x0000001c, (int)&rmesa->vb.vertex[3]);
-      FIXUP(dfn->code, 33, 0x00000020, (int)&rmesa->vb.vertex[4]);
-      FIXUP(dfn->code, 45, 0x00000024, (int)&rmesa->vb.vertex[5]);
-      FIXUP(dfn->code, 56, 0x00000000, (int)&rmesa->vb.dmaptr);
-      FIXUP(dfn->code, 61, 0x00000004, (int)&rmesa->vb.counter);
-      FIXUP(dfn->code, 67, 0x00000004, (int)&rmesa->vb.counter);
-      FIXUP(dfn->code, 76, 0x00000008, (int)&rmesa->vb.notify);
-      break;
-   }
-   
-
-   case 8: {
-
-      DFN ( _x86_Vertex3fv_8, rmesa->vb.dfn_cache.Vertex3fv );
-      FIXUP(dfn->code, 1, 0x00000000, (int)&rmesa->vb.dmaptr);
-      FIXUP(dfn->code, 27, 0x0000001c, (int)&rmesa->vb.vertex[3]);
-      FIXUP(dfn->code, 33, 0x00000020, (int)&rmesa->vb.vertex[4]);
-      FIXUP(dfn->code, 45, 0x0000001c, (int)&rmesa->vb.vertex[5]);
-      FIXUP(dfn->code, 51, 0x00000020, (int)&rmesa->vb.vertex[6]);
-      FIXUP(dfn->code, 63, 0x00000024, (int)&rmesa->vb.vertex[7]);
-      FIXUP(dfn->code, 74, 0x00000000, (int)&rmesa->vb.dmaptr);
-      FIXUP(dfn->code, 79, 0x00000004, (int)&rmesa->vb.counter);
-      FIXUP(dfn->code, 85, 0x00000004, (int)&rmesa->vb.counter);
-      FIXUP(dfn->code, 94, 0x00000008, (int)&rmesa->vb.notify);
-      break;
-   }
-   
-
-
-   default: {
-
-      DFN ( _x86_Vertex3fv, rmesa->vb.dfn_cache.Vertex3fv );
-      FIXUP(dfn->code, 8, 0x01010101, (int)&rmesa->vb.dmaptr);
-      FIXUP(dfn->code, 32, 0x00000006, rmesa->vb.vertex_size-3);
-      FIXUP(dfn->code, 37, 0x00000058, (int)&rmesa->vb.vertex[3]);
-      FIXUP(dfn->code, 45, 0x01010101, (int)&rmesa->vb.dmaptr);
-      FIXUP(dfn->code, 50, 0x02020202, (int)&rmesa->vb.counter);
-      FIXUP(dfn->code, 58, 0x02020202, (int)&rmesa->vb.counter);
-      FIXUP(dfn->code, 67, 0x0, (int)&rmesa->vb.notify);
-   break;
-   }
-   }
-
-   return dfn;
-}
-
-static struct dynfn *
-r200_makeX86Attribute2fv( struct dynfn * cache, const int *key,
-			  const char * name, void * dest )
-{
-   struct dynfn *dfn = MALLOC_STRUCT( dynfn );
-
-   if (R200_DEBUG & DEBUG_CODEGEN)
-      fprintf(stderr, "%s 0x%08x\n", name, key[0] );
-
-   DFN ( _x86_Attribute2fv, (*cache) );
-   FIXUP(dfn->code, 11, 0x0, (int)dest); 
-   FIXUP(dfn->code, 16, 0x4, 4+(int)dest); 
-
-   return dfn;
-}
-
-static struct dynfn *
-r200_makeX86Attribute2f( struct dynfn * cache, const int *key,
-			 const char * name, void * dest )
-{
-   struct dynfn *dfn = MALLOC_STRUCT( dynfn );
-
-   if (R200_DEBUG & DEBUG_CODEGEN)
-      fprintf(stderr, "%s 0x%08x\n", name, key[0] );
-
-   DFN ( _x86_Attribute2f, (*cache) );
-   FIXUP(dfn->code, 1, 0x0, (int)dest); 
-
-   return dfn;
-}
-
-
-static struct dynfn *
-r200_makeX86Attribute3fv( struct dynfn * cache, const int *key,
-			  const char * name, void * dest )
-{
-   struct dynfn *dfn = MALLOC_STRUCT( dynfn );
-
-   if (R200_DEBUG & DEBUG_CODEGEN)
-      fprintf(stderr, "%s 0x%08x\n", name, key[0] );
-
-   DFN ( _x86_Attribute3fv, (*cache) );
-   FIXUP(dfn->code, 14, 0x0, (int)dest); 
-   FIXUP(dfn->code, 20, 0x4, 4+(int)dest); 
-   FIXUP(dfn->code, 25, 0x8, 8+(int)dest);
-
-   return dfn;
-}
-
-static struct dynfn *
-r200_makeX86Attribute3f( struct dynfn * cache, const int *key,
-			 const char * name, void * dest )
-{
-   struct dynfn *dfn = MALLOC_STRUCT( dynfn );
-
-   if (R200_DEBUG & DEBUG_CODEGEN)
-      fprintf(stderr, "%s 0x%08x\n", name, key[0] );
-
-   DFN ( _x86_Attribute3f, (*cache) );
-   FIXUP(dfn->code, 14, 0x0, (int)dest); 
-   FIXUP(dfn->code, 20, 0x4, 4+(int)dest); 
-   FIXUP(dfn->code, 25, 0x8, 8+(int)dest);
-
-   return dfn;
-}
-
-struct dynfn *r200_makeX86Normal3fv( GLcontext *ctx, const int *key )
-{
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-
-   return r200_makeX86Attribute3fv( & rmesa->vb.dfn_cache.Normal3fv, key,
-				    __FUNCTION__, rmesa->vb.normalptr );
-}
-
-struct dynfn *r200_makeX86Normal3f( GLcontext *ctx, const int *key )
-{
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-
-   return r200_makeX86Attribute3f( & rmesa->vb.dfn_cache.Normal3f, key,
-				   __FUNCTION__, rmesa->vb.normalptr );
-}
-
-struct dynfn *r200_makeX86Color4ubv( GLcontext *ctx, const int *key )
-{
-   struct dynfn *dfn = MALLOC_STRUCT( dynfn );
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-
-
-   if (R200_DEBUG & DEBUG_CODEGEN)
-      fprintf(stderr, "%s 0x%08x\n", __FUNCTION__, key[0] );
-
-   if (VTX_COLOR(key[0],0) == R200_VTX_PK_RGBA) {
-      DFN ( _x86_Color4ubv_ub, rmesa->vb.dfn_cache.Color4ubv);
-      FIXUP(dfn->code, 5, 0x12345678, (int)rmesa->vb.colorptr); 
-      return dfn;
-   } 
-   else {
-
-      DFN ( _x86_Color4ubv_4f, rmesa->vb.dfn_cache.Color4ubv);
-      FIXUP(dfn->code, 2, 0x00000000, (int)_mesa_ubyte_to_float_color_tab); 
-      FIXUP(dfn->code, 27, 0xdeadbeaf, (int)rmesa->vb.floatcolorptr); 
-      FIXUP(dfn->code, 33, 0xdeadbeaf, (int)rmesa->vb.floatcolorptr+4); 
-      FIXUP(dfn->code, 55, 0xdeadbeaf, (int)rmesa->vb.floatcolorptr+8); 
-      FIXUP(dfn->code, 61, 0xdeadbeaf, (int)rmesa->vb.floatcolorptr+12); 
-      return dfn;
-   }
-}
-
-struct dynfn *r200_makeX86Color4ub( GLcontext *ctx, const int *key )
-{
-   if (R200_DEBUG & DEBUG_CODEGEN)
-      fprintf(stderr, "%s 0x%08x\n", __FUNCTION__, key[0] );
-
-   if (VTX_COLOR(key[0],0) == R200_VTX_PK_RGBA) {
-      struct dynfn *dfn = MALLOC_STRUCT( dynfn );
-      r200ContextPtr rmesa = R200_CONTEXT(ctx);
-
-      DFN ( _x86_Color4ub_ub, rmesa->vb.dfn_cache.Color4ub );
-      FIXUP(dfn->code, 18, 0x0, (int)rmesa->vb.colorptr); 
-      FIXUP(dfn->code, 24, 0x0, (int)rmesa->vb.colorptr+1); 
-      FIXUP(dfn->code, 30, 0x0, (int)rmesa->vb.colorptr+2); 
-      FIXUP(dfn->code, 36, 0x0, (int)rmesa->vb.colorptr+3); 
-      return dfn;
-   }
-   else
-      return NULL;
-}
-
-
-struct dynfn *r200_makeX86Color3fv( GLcontext *ctx, const int *key )
-{
-   if (VTX_COLOR(key[0],0) != R200_VTX_FP_RGB) 
-      return NULL;
-   else
-   {
-      r200ContextPtr rmesa = R200_CONTEXT(ctx);
-
-      return r200_makeX86Attribute3fv( & rmesa->vb.dfn_cache.Color3fv, key,
-				       __FUNCTION__, rmesa->vb.floatcolorptr );
-   }
-}
-
-struct dynfn *r200_makeX86Color3f( GLcontext *ctx, const int *key )
-{
-   if (VTX_COLOR(key[0],0) != R200_VTX_FP_RGB) 
-      return NULL;
-   else
-   {
-      r200ContextPtr rmesa = R200_CONTEXT(ctx);
-
-      return r200_makeX86Attribute3f( & rmesa->vb.dfn_cache.Color3f, key,
-				      __FUNCTION__, rmesa->vb.floatcolorptr );
-   }
-}
-
-
-
-#if 0 /* Temporarily disabled as it is broken w/the new cubemap code. - idr */
-struct dynfn *r200_makeX86TexCoord2fv( GLcontext *ctx, const int *key )
-{
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-
-   return r200_makeX86Attribute2fv( & rmesa->vb.dfn_cache.TexCoord2fv, key,
-				    __FUNCTION__, rmesa->vb.texcoordptr[0] );
-}
-
-struct dynfn *r200_makeX86TexCoord2f( GLcontext *ctx, const int *key )
-{
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-
-   return r200_makeX86Attribute2f( & rmesa->vb.dfn_cache.TexCoord2f, key,
-				   __FUNCTION__, rmesa->vb.texcoordptr[0] );
-}
-
-struct dynfn *r200_makeX86MultiTexCoord2fvARB( GLcontext *ctx, const int *key )
-{
-   struct dynfn *dfn = MALLOC_STRUCT( dynfn );
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-
-   if (R200_DEBUG & DEBUG_CODEGEN)
-      fprintf(stderr, "%s 0x%08x 0x%08x\n", __FUNCTION__, key[0], key[1] );
-
-   if (rmesa->vb.texcoordptr[1] == rmesa->vb.texcoordptr[0]+4) {
-      DFN ( _x86_MultiTexCoord2fv, rmesa->vb.dfn_cache.MultiTexCoord2fvARB );
-      FIXUP(dfn->code, 21, 0xdeadbeef, (int)rmesa->vb.texcoordptr[0]);	
-      FIXUP(dfn->code, 27, 0xdeadbeef, (int)rmesa->vb.texcoordptr[0]+4);
-   } else {
-      DFN ( _x86_MultiTexCoord2fv_2, rmesa->vb.dfn_cache.MultiTexCoord2fvARB );
-      FIXUP(dfn->code, 14, 0x0, (int)rmesa->vb.texcoordptr);
-   }
-   return dfn;
-}
-
-struct dynfn *r200_makeX86MultiTexCoord2fARB( GLcontext *ctx, 
-					      const int *key )
-{
-   struct dynfn *dfn = MALLOC_STRUCT( dynfn );
-   r200ContextPtr rmesa = R200_CONTEXT(ctx);
-
-   if (R200_DEBUG & DEBUG_CODEGEN)
-      fprintf(stderr, "%s 0x%08x 0x%08x\n", __FUNCTION__, key[0], key[1] );
-
-   if (rmesa->vb.texcoordptr[1] == rmesa->vb.texcoordptr[0]+4) {
-      DFN ( _x86_MultiTexCoord2f, rmesa->vb.dfn_cache.MultiTexCoord2fARB );
-      FIXUP(dfn->code, 20, 0xdeadbeef, (int)rmesa->vb.texcoordptr[0]); 
-      FIXUP(dfn->code, 26, 0xdeadbeef, (int)rmesa->vb.texcoordptr[0]+4); 
-   }
-   else {
-      /* Note: this might get generated multiple times, even though the
-       * actual emitted code is the same.
-       */
-      DFN ( _x86_MultiTexCoord2f_2, rmesa->vb.dfn_cache.MultiTexCoord2fARB );
-      FIXUP(dfn->code, 18, 0x0, (int)rmesa->vb.texcoordptr); 
-   }      
-   return dfn;
-}
-#endif
-
-void r200InitX86Codegen( struct dfn_generators *gen )
-{
-   gen->Vertex3f = r200_makeX86Vertex3f;
-   gen->Vertex3fv = r200_makeX86Vertex3fv;
-   gen->Color4ub = r200_makeX86Color4ub; /* PKCOLOR only */
-   gen->Color4ubv = r200_makeX86Color4ubv; /* PKCOLOR only */
-   gen->Normal3f = r200_makeX86Normal3f;
-   gen->Normal3fv = r200_makeX86Normal3fv;
-#if 0 /* Temporarily disabled as it is broken w/the new cubemap code. - idr */
-   gen->TexCoord2f = r200_makeX86TexCoord2f;
-   gen->TexCoord2fv = r200_makeX86TexCoord2fv;
-   gen->MultiTexCoord2fARB = r200_makeX86MultiTexCoord2fARB;
-   gen->MultiTexCoord2fvARB = r200_makeX86MultiTexCoord2fvARB;
-#endif
-   gen->Color3f = r200_makeX86Color3f;
-   gen->Color3fv = r200_makeX86Color3fv;
-
-   /* Not done:
-    */
-/*     gen->Vertex2f = r200_makeX86Vertex2f; */
-/*     gen->Vertex2fv = r200_makeX86Vertex2fv; */
-/*     gen->Color3ub = r200_makeX86Color3ub; */
-/*     gen->Color3ubv = r200_makeX86Color3ubv; */
-/*     gen->Color4f = r200_makeX86Color4f; */
-/*     gen->Color4fv = r200_makeX86Color4fv; */
-/*     gen->TexCoord1f = r200_makeX86TexCoord1f; */
-/*     gen->TexCoord1fv = r200_makeX86TexCoord1fv; */
-/*     gen->MultiTexCoord1fARB = r200_makeX86MultiTexCoord1fARB; */
-/*     gen->MultiTexCoord1fvARB = r200_makeX86MultiTexCoord1fvARB; */
-}
-
-
-#else 
-
-void r200InitX86Codegen( struct dfn_generators *gen )
-{
-   (void) gen;
-}
-
-#endif
diff --git a/src/mesa/drivers/dri/r200/r200_vtxtmp_x86.S b/src/mesa/drivers/dri/r200/r200_vtxtmp_x86.S
deleted file mode 100644
index 5e33c7bdeea..00000000000
--- a/src/mesa/drivers/dri/r200/r200_vtxtmp_x86.S
+++ /dev/null
@@ -1,499 +0,0 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/r200/r200_vtxtmp_x86.S,v 1.2 2002/11/07 18:31:59 tsi Exp $ */
-/**************************************************************************
-
-Copyright 2002 Tungsten Graphics Inc., Cedar Park, Texas.
-
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-on the rights to use, copy, modify, merge, publish, distribute, sub
-license, and/or sell copies of the Software, and to permit persons to whom
-the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-ATI, TUNGSTEN GRAPHICS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-**************************************************************************/
-
-#define GLOBL( x )	\
-.globl x;		\
-x:
-
-.data
-.align 4
-
-/*
-	vertex 3f vertex size 4
-*/
-	
-GLOBL ( _x86_Vertex3f_4 )
-	movl	(0), %ecx
-	movl	4(%esp), %eax
-	movl	8(%esp), %edx
-	movl	%eax, (%ecx)
-	movl	%edx, 4(%ecx)
-	movl	12(%esp), %eax
-	movl	(0), %edx
-	movl	%eax, 8(%ecx)
-	movl	%edx, 12(%ecx)
-	movl	(0), %eax
-	addl	$16, %ecx
-	dec 	%eax
-	movl	%ecx, (0)
-	movl	%eax, (0)
-	je	.1 
-	ret
-.1:	jmp	*0
-	
-GLOBL ( _x86_Vertex3f_4_end )
-
-/*
-	vertex 3f vertex size 6
-*/
-GLOBL ( _x86_Vertex3f_6 )
-	push	%edi
-	movl	(0), %edi
-	movl	8(%esp), %eax
-	movl	12(%esp), %edx
-	movl	16(%esp), %ecx
-	movl	%eax, (%edi)
-	movl	%edx, 4(%edi)
-	movl	%ecx, 8(%edi)
-	movl	(0), %eax
-	movl	(0), %edx
-	movl	(0), %ecx
-	movl	%eax, 12(%edi)
-	movl	%edx, 16(%edi)
-	movl	%ecx, 20(%edi)
-	addl	$24, %edi
-	movl	(0), %eax
-	movl	%edi, (0)
-	dec 	%eax
-	pop 	%edi
-	movl	%eax, (0)
-	je	.2
-	ret
-.2:	jmp	*0
-GLOBL ( _x86_Vertex3f_6_end )
-/*
-	vertex 3f generic size
-*/
-GLOBL ( _x86_Vertex3f )
-	push	%edi
-	push	%esi
-	movl	$0, %esi
-	movl	(0), %edi
-	movl	12(%esp), %eax
-	movl	16(%esp), %edx
-	movl	20(%esp), %ecx
-	movl	%eax, (%edi)
-	movl	%edx, 4(%edi)
-	movl	%ecx, 8(%edi)
-	addl	$12, %edi
-	movl	$0, %ecx
-	repz
-	movsl %ds:(%esi), %es:(%edi)
-	movl	(0), %eax
-	movl	%edi, (0)
-	dec 	%eax
-	movl	%eax, (0)
-	pop 	%esi
-	pop 	%edi
-	je  	.3
-	ret
-.3:	jmp	*0
-
-GLOBL ( _x86_Vertex3f_end )
-
-/*
-	Vertex 3fv vertex size 6
-*/
-GLOBL ( _x86_Vertex3fv_6 )
-	movl	(0), %eax
-	movl	4(%esp), %ecx
-	movl	(%ecx), %edx
-	movl	%edx, (%eax)
-	movl	4(%ecx), %edx
-	movl	8(%ecx), %ecx
-	movl	%edx, 4(%eax)
-	movl	%ecx, 8(%eax)
-	movl	(28), %edx
-	movl	(32), %ecx
-	movl	%edx, 12(%eax)
-	movl	%ecx, 16(%eax)
-	movl	(36), %edx
-	movl	%edx, 20(%eax)
-	addl	$24, %eax
-	movl	%eax, 0
-	movl	4, %eax
-	dec 	%eax
-	movl	%eax, 4
-	je	.4
-	ret
-.4:	jmp    *8
-	
-GLOBL ( _x86_Vertex3fv_6_end )
-
-/*
-	Vertex 3fv vertex size 8
-*/
-GLOBL ( _x86_Vertex3fv_8 )
-	movl	(0), %eax
-	movl	4(%esp), %ecx
-	movl	(%ecx), %edx
-	movl	%edx ,(%eax)
-	movl	4(%ecx) ,%edx
-	movl	8(%ecx) ,%ecx
-	movl	%edx, 4(%eax)
-	movl	%ecx, 8(%eax)
-	movl	(28), %edx
-	movl	(32), %ecx
-	movl	%edx, 12(%eax)
-	movl	%ecx, 16(%eax)
-	movl	(28), %edx
-	movl	(32), %ecx
-	movl	%edx, 20(%eax)
-	movl	%ecx, 24(%eax)
-	movl	(36), %edx
-	movl	%edx, 28(%eax)
-	addl	$32, %eax
-	movl	%eax, (0)
-	movl	4, %eax
-	dec	%eax
-	movl    %eax, (4)
-	je	.5
-	ret
-.5:	jmp    *8
-	
-GLOBL ( _x86_Vertex3fv_8_end )
-
-/*
-	Vertex 3fv generic vertex size
-*/
-GLOBL ( _x86_Vertex3fv )
-	movl	4(%esp), %edx
-	push	%edi
-	push	%esi
-	movl	(0x1010101), %edi
-	movl	(%edx), %eax
-	movl	4(%edx), %ecx
-	movl	8(%edx), %esi
-	movl	%eax, (%edi)
-	movl	%ecx, 4(%edi)
-	movl	%esi, 8(%edi)
-	addl	$12, %edi
-	movl	$6, %ecx
-	movl	$0x58, %esi
-	repz
-	movsl %ds:(%esi), %es:(%edi)
-	movl	%edi, (0x1010101)
-	movl	(0x2020202), %eax
-	pop	%esi
-	pop	%edi
-	dec	%eax
-	movl	%eax, (0x2020202)
-	je	.6
-	ret
-.6:	jmp    *0
-GLOBL ( _x86_Vertex3fv_end )
-
-
-/**
- * Generic handler for 2 float format data.  This can be used for
- * TexCoord2f and possibly other functions.
- */
-
-GLOBL ( _x86_Attribute2f )
-	movl	$0x0, %edx
-	movl	4(%esp), %eax
-	movl	8(%esp), %ecx
-	movl	%eax, (%edx)
-	movl	%ecx, 4(%edx)
-	ret
-GLOBL ( _x86_Attribute2f_end )
-
-
-/**
- * Generic handler for 2 float vector format data.  This can be used for
- * TexCoord2fv and possibly other functions.
- */
-
-GLOBL( _x86_Attribute2fv)
-	movl 4(%esp), %eax      /* load 'v' off stack */
-	movl (%eax), %ecx       /* load v[0] */
-	movl 4(%eax), %eax      /* load v[1] */
-	movl %ecx, 0      	/* store v[0] to current vertex */
-	movl %eax, 4      	/* store v[1] to current vertex */
-	ret
-GLOBL ( _x86_Attribute2fv_end )
-
-
-/**
- * Generic handler for 3 float format data.  This can be used for
- * Normal3f, Color3f (when the color target is also float), or
- * TexCoord3f.
- */
-
-GLOBL ( _x86_Attribute3f )
-	movl	4(%esp), %ecx
-	movl	8(%esp), %edx
-	movl	12(%esp), %eax
-	movl	%ecx, 0
-	movl	%edx, 4
-	movl	%eax, 8
-	ret
-GLOBL ( _x86_Attribute3f_end )
-
-/**
- * Generic handler for 3 float vector format data.  This can be used for
- * Normal3f, Color3f (when the color target is also float), or
- * TexCoord3f.
- */
-
-GLOBL( _x86_Attribute3fv)
-	movl 4(%esp), %eax      /* load 'v' off stack */
-	movl (%eax), %ecx       /* load v[0] */
-	movl 4(%eax), %edx      /* load v[1] */
-	movl 8(%eax), %eax      /* load v[2] */
-	movl %ecx, 0      	/* store v[0] to current vertex */
-	movl %edx, 4      	/* store v[1] to current vertex */
-	movl %eax, 8      	/* store v[2] to current vertex */
-	ret
-GLOBL ( _x86_Attribute3fv_end )
-
-
-/*
-	Color 4ubv_ub
-*/
-GLOBL ( _x86_Color4ubv_ub )
-	movl 4(%esp), %eax
-	movl $0x12345678, %edx
-	movl (%eax), %eax
-	movl %eax, (%edx)
-	ret
-GLOBL ( _x86_Color4ubv_ub_end )
-
-/*
-	Color 4ubv 4f
-*/
-GLOBL ( _x86_Color4ubv_4f )
-	push	%ebx
-	movl	$0, %edx
-	xor	%eax, %eax
-	xor	%ecx, %ecx
-	movl	8(%esp), %ebx
-	movl	(%ebx), %ebx
-	mov	%bl, %al
-	mov	%bh, %cl
-	movl	(%edx,%eax,4),%eax
-	movl	(%edx,%ecx,4),%ecx
-	movl	%eax, (0xdeadbeaf)
-	movl	%ecx, (0xdeadbeaf)
-	xor	%eax, %eax
-	xor	%ecx, %ecx
-	shr	$16, %ebx
-	mov	%bl, %al
-	mov	%bh, %cl
-	movl	(%edx,%eax,4), %eax
-	movl	(%edx,%ecx,4), %ecx
-	movl	%eax, (0xdeadbeaf)
-	movl	%ecx, (0xdeadbeaf)
-	pop	%ebx
-	ret
-GLOBL ( _x86_Color4ubv_4f_end )
-
-/*
-
-	Color4ub_ub
-*/
-GLOBL( _x86_Color4ub_ub )
-	push	%ebx
-	movl	8(%esp), %eax
-	movl	12(%esp), %edx
-	movl	16(%esp), %ecx
-	movl	20(%esp), %ebx
-	mov	%al, (0)
-	mov	%dl, (0)
-	mov	%cl, (0)
-	mov	%bl, (0)
-	pop	%ebx
-	ret
-GLOBL( _x86_Color4ub_ub_end )
-
-
-/* \todo: change the "and $7, %eax" to something like "target & 4 ? target & 5 : target & 3)" */
-/*
-	MultiTexCoord2fv st0/st1
-*/
-GLOBL( _x86_MultiTexCoord2fv )
-	movl	4(%esp), %eax
-	movl	8(%esp), %ecx
-	and	$7, %eax
-	movl	(%ecx), %edx
-	shl	$3, %eax
-	movl	4(%ecx), %ecx
-	movl	%edx, 0xdeadbeef(%eax)
-	movl	%ecx, 0xdeadbeef(%eax)
-	ret
-GLOBL( _x86_MultiTexCoord2fv_end )
-
-/*
-	MultiTexCoord2fv
-*/
-
-GLOBL( _x86_MultiTexCoord2fv_2 )
-	movl	4(%esp,1), %eax
-	movl	8(%esp,1), %ecx
-	and	$0x7, %eax
-	movl	0(,%eax,4), %edx
-	movl	(%ecx), %eax
-	movl	%eax, (%edx)
-	movl	4(%ecx), %eax
-	movl	%eax, 4(%edx)
-	ret
-GLOBL( _x86_MultiTexCoord2fv_2_end )
-
-/*
-	MultiTexCoord2f st0/st1
-*/
-GLOBL( _x86_MultiTexCoord2f )
-	movl	4(%esp), %eax
-	movl	8(%esp), %edx
-	movl	12(%esp), %ecx
-	and	$7, %eax
-	shl	$3, %eax
-	movl	%edx, 0xdeadbeef(%eax)
-	movl	%ecx, 0xdeadbeef(%eax)
-	ret
-GLOBL( _x86_MultiTexCoord2f_end )
-
-/*
-	MultiTexCoord2f
-*/
-GLOBL( _x86_MultiTexCoord2f_2 )
-	movl	4(%esp), %eax
-	movl	8(%esp), %edx
-	movl	12(%esp,1), %ecx
-	and	$7,%eax
-	movl	0(,%eax,4), %eax
-	movl	%edx, (%eax)
-	movl	%ecx, 4(%eax)
-	ret
-GLOBL( _x86_MultiTexCoord2f_2_end )
-
-#if defined(USE_SSE_ASM)
-/**
- * This can be used as a template for either Color3fv (when the color
- * target is also a 3f) or Normal3fv.
- */
-
-GLOBL( _sse_Attribute3fv )
-	movl	4(%esp), %eax
-	movlps	(%eax), %xmm0
-	movl	8(%eax), %eax
-	movlps	%xmm0, 0
-	movl	%eax, 8
-	ret
-GLOBL( _sse_Attribute3fv_end )
-
-/**
- * This can be used as a template for either Color3f (when the color
- * target is also a 3f) or Normal3f.
- */
-
-GLOBL( _sse_Attribute3f )
-	movlps	4(%esp), %xmm0
-	movl	12(%esp), %eax
-	movlps	%xmm0, 0
-	movl	%eax, 8
-	ret
-GLOBL( _sse_Attribute3f_end )
-
-
-/**
- * Generic handler for 2 float vector format data.  This can be used for
- * TexCoord2fv and possibly other functions.
- */
-
-GLOBL( _sse_Attribute2fv )
-	movl	4(%esp), %eax
-	movlps	(%eax), %xmm0
-	movlps	%xmm0, 0
-	ret
-GLOBL( _sse_Attribute2fv_end )
-
-
-/**
- * Generic handler for 2 float format data.  This can be used for
- * TexCoord2f and possibly other functions.
- */
-
-GLOBL( _sse_Attribute2f )
-	movlps	4(%esp), %xmm0
-	movlps	%xmm0, 0
-	ret
-GLOBL( _sse_Attribute2f_end )
-
-/*
-	MultiTexCoord2fv st0/st1
-*/
-GLOBL( _sse_MultiTexCoord2fv )
-	movl	4(%esp), %eax
-	movl	8(%esp), %ecx
-	and	$7, %eax
-	movlps	(%ecx), %xmm0
-	movlps	%xmm0, 0xdeadbeef(,%eax,8)
-	ret
-GLOBL( _sse_MultiTexCoord2fv_end )
-
-/*
-	MultiTexCoord2fv
-*/
-GLOBL( _sse_MultiTexCoord2fv_2 )
-	movl	4(%esp), %eax
-	movl	8(%esp), %ecx
-	and	$0x7, %eax
-	movl	0(,%eax,4), %edx
-	movlps	(%ecx), %xmm0
-	movlps	%xmm0, (%edx)
-	ret
-GLOBL( _sse_MultiTexCoord2fv_2_end )
-
-/*
-	MultiTexCoord2f st0/st1
-*/
-GLOBL( _sse_MultiTexCoord2f )
-	movl	4(%esp), %eax
-	and	$7, %eax
-	movlps	8(%esp), %xmm0
-	movlps	%xmm0, 0xdeadbeef(,%eax,8)
-	ret
-GLOBL( _sse_MultiTexCoord2f_end )
-
-/*
-	MultiTexCoord2f
-*/
-GLOBL( _sse_MultiTexCoord2f_2 )
-	movl	4(%esp), %eax
-	movlps	8(%esp), %xmm0
-	and	$7,%eax
-	movl	0(,%eax,4), %eax
-	movlps	%xmm0, (%eax)
-	ret
-GLOBL( _sse_MultiTexCoord2f_2_end )
-#endif
-
-#if defined (__ELF__) && defined (__linux__)
-	.section .note.GNU-stack,"",%progbits
-#endif