mkfontscale pixman xserver xtrans libX11 libXdmcp libxcb libXmu mesa git update 5 oct 2011

2 files changed, 621 insertions, 623 deletions

diff --git a/mesalib/src/mesa/tnl/t_vb_program.c b/mesalib/src/mesa/tnl/t_vb_program.c
index 4b1a212fd..cc5e85634 100644
--- a/mesalib/src/mesa/tnl/t_vb_program.c
+++ b/mesalib/src/mesa/tnl/t_vb_program.c
@@ -1,574 +1,572 @@
-/*

- * Mesa 3-D graphics library

- * Version:  7.6

- *

- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

- * Copyright (C) 2009  VMware, Inc.  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

- * 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 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

- * BRIAN PAUL 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.

- */

-

-

-/**

- * \file tnl/t_vb_program.c

- * \brief Pipeline stage for executing vertex programs.

- * \author Brian Paul,  Keith Whitwell

- */

-

-

-#include "main/glheader.h"

-#include "main/colormac.h"

-#include "main/macros.h"

-#include "main/imports.h"

-#include "math/m_xform.h"

-#include "program/prog_instruction.h"

-#include "program/prog_statevars.h"

-#include "program/prog_execute.h"

-#include "swrast/s_context.h"

-

-#include "tnl/tnl.h"

-#include "tnl/t_context.h"

-#include "tnl/t_pipeline.h"

-

-

-#ifdef NAN_CHECK

-/** Check for NaNs and very large values */

-static INLINE void

-check_float(float x)

-{

-   assert(!IS_INF_OR_NAN(x));

-   assert(1.0e-15 <= x && x <= 1.0e15);

-}

-#endif

-

-

-/*!

- * Private storage for the vertex program pipeline stage.

- */

-struct vp_stage_data {

-   /** The results of running the vertex program go into these arrays. */

-   GLvector4f results[VERT_RESULT_MAX];

-

-   GLvector4f ndcCoords;              /**< normalized device coords */

-   GLubyte *clipmask;                 /**< clip flags */

-   GLubyte ormask, andmask;           /**< for clipping */

-

-   struct gl_program_machine machine;

-};

-

-

-#define VP_STAGE_DATA(stage) ((struct vp_stage_data *)(stage->privatePtr))

-

-

-static void

-userclip( struct gl_context *ctx,

-          GLvector4f *clip,

-          GLubyte *clipmask,

-          GLubyte *clipormask,

-          GLubyte *clipandmask )

-{

-   GLuint p;

-

-   for (p = 0; p < ctx->Const.MaxClipPlanes; p++) {

-      if (ctx->Transform.ClipPlanesEnabled & (1 << p)) {

-	 GLuint nr, i;

-	 const GLfloat a = ctx->Transform._ClipUserPlane[p][0];

-	 const GLfloat b = ctx->Transform._ClipUserPlane[p][1];

-	 const GLfloat c = ctx->Transform._ClipUserPlane[p][2];

-	 const GLfloat d = ctx->Transform._ClipUserPlane[p][3];

-         GLfloat *coord = (GLfloat *)clip->data;

-         GLuint stride = clip->stride;

-         GLuint count = clip->count;

-

-	 for (nr = 0, i = 0 ; i < count ; i++) {

-	    GLfloat dp = (coord[0] * a + 

-			  coord[1] * b +

-			  coord[2] * c +

-			  coord[3] * d);

-

-	    if (dp < 0) {

-	       nr++;

-	       clipmask[i] |= CLIP_USER_BIT;

-	    }

-

-	    STRIDE_F(coord, stride);

-	 }

-

-	 if (nr > 0) {

-	    *clipormask |= CLIP_USER_BIT;

-	    if (nr == count) {

-	       *clipandmask |= CLIP_USER_BIT;

-	       return;

-	    }

-	 }

-      }

-   }

-}

-

-

-static GLboolean

-do_ndc_cliptest(struct gl_context *ctx, struct vp_stage_data *store)

-{

-   TNLcontext *tnl = TNL_CONTEXT(ctx);

-   struct vertex_buffer *VB = &tnl->vb;

-   /* Cliptest and perspective divide.  Clip functions must clear

-    * the clipmask.

-    */

-   store->ormask = 0;

-   store->andmask = CLIP_FRUSTUM_BITS;

-

-   tnl_clip_prepare(ctx);

-

-   if (tnl->NeedNdcCoords) {

-      VB->NdcPtr =

-         _mesa_clip_tab[VB->ClipPtr->size]( VB->ClipPtr,

-                                            &store->ndcCoords,

-                                            store->clipmask,

-                                            &store->ormask,

-                                            &store->andmask,

-					    !ctx->Transform.DepthClamp );

-   }

-   else {

-      VB->NdcPtr = NULL;

-      _mesa_clip_np_tab[VB->ClipPtr->size]( VB->ClipPtr,

-                                            NULL,

-                                            store->clipmask,

-                                            &store->ormask,

-                                            &store->andmask,

-					    !ctx->Transform.DepthClamp );

-   }

-

-   if (store->andmask) {

-      /* All vertices are outside the frustum */

-      return GL_FALSE;

-   }

-

-   /* Test userclip planes.  This contributes to VB->ClipMask.

-    */

-   /** XXX NEW_SLANG _Enabled ??? */

-   if (ctx->Transform.ClipPlanesEnabled && (!ctx->VertexProgram._Enabled ||

-      ctx->VertexProgram.Current->IsPositionInvariant)) {

-      userclip( ctx,

-		VB->ClipPtr,

-		store->clipmask,

-		&store->ormask,

-		&store->andmask );

-

-      if (store->andmask) {

-	 return GL_FALSE;

-      }

-   }

-

-   VB->ClipAndMask = store->andmask;

-   VB->ClipOrMask = store->ormask;

-   VB->ClipMask = store->clipmask;

-

-   return GL_TRUE;

-}

-

-

-/**

- * XXX the texture sampling code in this module is a bit of a hack.

- * The texture sampling code is in swrast, though it doesn't have any

- * real dependencies on the rest of swrast.  It should probably be

- * moved into main/ someday.

- */

-static void

-vp_fetch_texel(struct gl_context *ctx, const GLfloat texcoord[4], GLfloat lambda,

-               GLuint unit, GLfloat color[4])

-{

-   SWcontext *swrast = SWRAST_CONTEXT(ctx);

-

-   /* XXX use a float-valued TextureSample routine here!!! */

-   swrast->TextureSample[unit](ctx, ctx->Texture.Unit[unit]._Current,

-                               1, (const GLfloat (*)[4]) texcoord,

-                               &lambda,  (GLfloat (*)[4]) color);

-}

-

-

-/**

- * Called via ctx->Driver.ProgramStringNotify() after a new vertex program

- * string has been parsed.

- */

-GLboolean

-_tnl_program_string(struct gl_context *ctx, GLenum target, struct gl_program *program)

-{

-   /* No-op.

-    * If we had derived anything from the program that was private to this

-    * stage we'd recompute/validate it here.

-    */

-   return GL_TRUE;

-}

-

-

-/**

- * Initialize virtual machine state prior to executing vertex program.

- */

-static void

-init_machine(struct gl_context *ctx, struct gl_program_machine *machine,

-             GLuint instID)

-{

-   /* Input registers get initialized from the current vertex attribs */

-   memcpy(machine->VertAttribs, ctx->Current.Attrib,

-          MAX_VERTEX_GENERIC_ATTRIBS * 4 * sizeof(GLfloat));

-

-   if (ctx->VertexProgram._Current->IsNVProgram) {

-      GLuint i;

-      /* Output/result regs are initialized to [0,0,0,1] */

-      for (i = 0; i < MAX_NV_VERTEX_PROGRAM_OUTPUTS; i++) {

-         ASSIGN_4V(machine->Outputs[i], 0.0F, 0.0F, 0.0F, 1.0F);

-      }

-      /* Temp regs are initialized to [0,0,0,0] */

-      for (i = 0; i < MAX_NV_VERTEX_PROGRAM_TEMPS; i++) {

-         ASSIGN_4V(machine->Temporaries[i], 0.0F, 0.0F, 0.0F, 0.0F);

-      }

-      for (i = 0; i < MAX_VERTEX_PROGRAM_ADDRESS_REGS; i++) {

-         ASSIGN_4V(machine->AddressReg[i], 0, 0, 0, 0);

-      }

-   }

-

-   machine->NumDeriv = 0;

-

-   /* init condition codes */

-   machine->CondCodes[0] = COND_EQ;

-   machine->CondCodes[1] = COND_EQ;

-   machine->CondCodes[2] = COND_EQ;

-   machine->CondCodes[3] = COND_EQ;

-

-   /* init call stack */

-   machine->StackDepth = 0;

-

-   machine->FetchTexelLod = vp_fetch_texel;

-   machine->FetchTexelDeriv = NULL; /* not used by vertex programs */

-

-   machine->Samplers = ctx->VertexProgram._Current->Base.SamplerUnits;

-

-   machine->SystemValues[SYSTEM_VALUE_INSTANCE_ID][0] = (GLfloat) instID;

-}

-

-

-/**

- * Map the texture images which the vertex program will access (if any).

- */

-static void

-map_textures(struct gl_context *ctx, const struct gl_vertex_program *vp)

-{

-   GLuint u;

-

-   if (!ctx->Driver.MapTexture)

-      return;

-

-   for (u = 0; u < ctx->Const.MaxVertexTextureImageUnits; u++) {

-      if (vp->Base.TexturesUsed[u]) {

-         /* Note: _Current *should* correspond to the target indicated

-          * in TexturesUsed[u].

-          */

-         ctx->Driver.MapTexture(ctx, ctx->Texture.Unit[u]._Current);

-      }

-   }

-}

-

-

-/**

- * Unmap the texture images which were used by the vertex program (if any).

- */

-static void

-unmap_textures(struct gl_context *ctx, const struct gl_vertex_program *vp)

-{

-   GLuint u;

-

-   if (!ctx->Driver.MapTexture)

-      return;

-

-   for (u = 0; u < ctx->Const.MaxVertexTextureImageUnits; u++) {

-      if (vp->Base.TexturesUsed[u]) {

-         /* Note: _Current *should* correspond to the target indicated

-          * in TexturesUsed[u].

-          */

-         ctx->Driver.UnmapTexture(ctx, ctx->Texture.Unit[u]._Current);

-      }

-   }

-}

-

-

-/**

- * This function executes vertex programs

- */

-static GLboolean

-run_vp( struct gl_context *ctx, struct tnl_pipeline_stage *stage )

-{

-   TNLcontext *tnl = TNL_CONTEXT(ctx);

-   struct vp_stage_data *store = VP_STAGE_DATA(stage);

-   struct vertex_buffer *VB = &tnl->vb;

-   struct gl_vertex_program *program = ctx->VertexProgram._Current;

-   struct gl_program_machine *machine = &store->machine;

-   GLuint outputs[VERT_RESULT_MAX], numOutputs;

-   GLuint i, j;

-

-   if (!program)

-      return GL_TRUE;

-

-   if (program->IsNVProgram) {

-      _mesa_load_tracked_matrices(ctx);

-   }

-   else {

-      /* ARB program or vertex shader */

-      _mesa_load_state_parameters(ctx, program->Base.Parameters);

-   }

-

-   /* make list of outputs to save some time below */

-   numOutputs = 0;

-   for (i = 0; i < VERT_RESULT_MAX; i++) {

-      if (program->Base.OutputsWritten & BITFIELD64_BIT(i)) {

-         outputs[numOutputs++] = i;

-      }

-   }

-

-   map_textures(ctx, program);

-

-   for (i = 0; i < VB->Count; i++) {

-      GLuint attr;

-

-      init_machine(ctx, machine, tnl->CurInstance);

-

-#if 0

-      printf("Input  %d: %f, %f, %f, %f\n", i,

-             VB->AttribPtr[0]->data[i][0],

-             VB->AttribPtr[0]->data[i][1],

-             VB->AttribPtr[0]->data[i][2],

-             VB->AttribPtr[0]->data[i][3]);

-      printf("   color: %f, %f, %f, %f\n",

-             VB->AttribPtr[3]->data[i][0],

-             VB->AttribPtr[3]->data[i][1],

-             VB->AttribPtr[3]->data[i][2],

-             VB->AttribPtr[3]->data[i][3]);

-      printf("  normal: %f, %f, %f, %f\n",

-             VB->AttribPtr[2]->data[i][0],

-             VB->AttribPtr[2]->data[i][1],

-             VB->AttribPtr[2]->data[i][2],

-             VB->AttribPtr[2]->data[i][3]);

-#endif

-

-      /* the vertex array case */

-      for (attr = 0; attr < VERT_ATTRIB_MAX; attr++) {

-	 if (program->Base.InputsRead & (1 << attr)) {

-	    const GLubyte *ptr = (const GLubyte*) VB->AttribPtr[attr]->data;

-	    const GLuint size = VB->AttribPtr[attr]->size;

-	    const GLuint stride = VB->AttribPtr[attr]->stride;

-	    const GLfloat *data = (GLfloat *) (ptr + stride * i);

-#ifdef NAN_CHECK

-            check_float(data[0]);

-            check_float(data[1]);

-            check_float(data[2]);

-            check_float(data[3]);

-#endif

-	    COPY_CLEAN_4V(machine->VertAttribs[attr], size, data);

-	 }

-      }

-

-      /* execute the program */

-      _mesa_execute_program(ctx, &program->Base, machine);

-

-      /* copy the output registers into the VB->attribs arrays */

-      for (j = 0; j < numOutputs; j++) {

-         const GLuint attr = outputs[j];

-#ifdef NAN_CHECK

-         check_float(machine->Outputs[attr][0]);

-         check_float(machine->Outputs[attr][1]);

-         check_float(machine->Outputs[attr][2]);

-         check_float(machine->Outputs[attr][3]);

-#endif

-         COPY_4V(store->results[attr].data[i], machine->Outputs[attr]);

-      }

-

-      /* FOGC is a special case.  Fragment shader expects (f,0,0,1) */

-      if (program->Base.OutputsWritten & BITFIELD64_BIT(VERT_RESULT_FOGC)) {

-         store->results[VERT_RESULT_FOGC].data[i][1] = 0.0;

-         store->results[VERT_RESULT_FOGC].data[i][2] = 0.0;

-         store->results[VERT_RESULT_FOGC].data[i][3] = 1.0;

-      }

-#ifdef NAN_CHECK

-      ASSERT(machine->Outputs[0][3] != 0.0F);

-#endif

-#if 0

-      printf("HPOS: %f %f %f %f\n",

-             machine->Outputs[0][0], 

-             machine->Outputs[0][1], 

-             machine->Outputs[0][2], 

-             machine->Outputs[0][3]);

-#endif

-   }

-

-   unmap_textures(ctx, program);

-

-   /* Fixup fog and point size results if needed */

-   if (program->IsNVProgram) {

-      if (ctx->Fog.Enabled &&

-          (program->Base.OutputsWritten & BITFIELD64_BIT(VERT_RESULT_FOGC)) == 0) {

-         for (i = 0; i < VB->Count; i++) {

-            store->results[VERT_RESULT_FOGC].data[i][0] = 1.0;

-         }

-      }

-

-      if (ctx->VertexProgram.PointSizeEnabled &&

-          (program->Base.OutputsWritten & BITFIELD64_BIT(VERT_RESULT_PSIZ)) == 0) {

-         for (i = 0; i < VB->Count; i++) {

-            store->results[VERT_RESULT_PSIZ].data[i][0] = ctx->Point.Size;

-         }

-      }

-   }

-

-   if (program->IsPositionInvariant) {

-      /* We need the exact same transform as in the fixed function path here

-       * to guarantee invariance, depending on compiler optimization flags

-       * results could be different otherwise.

-       */

-      VB->ClipPtr = TransformRaw( &store->results[0],

-				  &ctx->_ModelProjectMatrix,

-				  VB->AttribPtr[0] );

-

-      /* Drivers expect this to be clean to element 4...

-       */

-      switch (VB->ClipPtr->size) {

-      case 1:

-	 /* impossible */

-      case 2:

-	 _mesa_vector4f_clean_elem( VB->ClipPtr, VB->Count, 2 );

-	 /* fall-through */

-      case 3:

-	 _mesa_vector4f_clean_elem( VB->ClipPtr, VB->Count, 3 );

-	 /* fall-through */

-      case 4:

-	 break;

-      }

-   }

-   else {

-      /* Setup the VB pointers so that the next pipeline stages get

-       * their data from the right place (the program output arrays).

-       */

-      VB->ClipPtr = &store->results[VERT_RESULT_HPOS];

-      VB->ClipPtr->size = 4;

-      VB->ClipPtr->count = VB->Count;

-   }

-

-   VB->AttribPtr[VERT_ATTRIB_COLOR0] = &store->results[VERT_RESULT_COL0];

-   VB->AttribPtr[VERT_ATTRIB_COLOR1] = &store->results[VERT_RESULT_COL1];

-   VB->AttribPtr[VERT_ATTRIB_FOG] = &store->results[VERT_RESULT_FOGC];

-   VB->AttribPtr[_TNL_ATTRIB_POINTSIZE] = &store->results[VERT_RESULT_PSIZ];

-   VB->BackfaceColorPtr = &store->results[VERT_RESULT_BFC0];

-   VB->BackfaceSecondaryColorPtr = &store->results[VERT_RESULT_BFC1];

-

-   for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++) {

-      VB->AttribPtr[_TNL_ATTRIB_TEX0 + i]

-         = &store->results[VERT_RESULT_TEX0 + i];

-   }

-

-   for (i = 0; i < ctx->Const.MaxVarying; i++) {

-      if (program->Base.OutputsWritten & BITFIELD64_BIT(VERT_RESULT_VAR0 + i)) {

-         /* Note: varying results get put into the generic attributes */

-	 VB->AttribPtr[VERT_ATTRIB_GENERIC0+i]

-            = &store->results[VERT_RESULT_VAR0 + i];

-      }

-   }

-

-

-   /* Perform NDC and cliptest operations:

-    */

-   return do_ndc_cliptest(ctx, store);

-}

-

-

-/**

- * Called the first time stage->run is called.  In effect, don't

- * allocate data until the first time the stage is run.

- */

-static GLboolean

-init_vp(struct gl_context *ctx, struct tnl_pipeline_stage *stage)

-{

-   TNLcontext *tnl = TNL_CONTEXT(ctx);

-   struct vertex_buffer *VB = &(tnl->vb);

-   struct vp_stage_data *store;

-   const GLuint size = VB->Size;

-   GLuint i;

-

-   stage->privatePtr = CALLOC(sizeof(*store));

-   store = VP_STAGE_DATA(stage);

-   if (!store)

-      return GL_FALSE;

-

-   /* Allocate arrays of vertex output values */

-   for (i = 0; i < VERT_RESULT_MAX; i++) {

-      _mesa_vector4f_alloc( &store->results[i], 0, size, 32 );

-      store->results[i].size = 4;

-   }

-

-   /* a few other misc allocations */

-   _mesa_vector4f_alloc( &store->ndcCoords, 0, size, 32 );

-   store->clipmask = (GLubyte *) _mesa_align_malloc(sizeof(GLubyte)*size, 32 );

-

-   return GL_TRUE;

-}

-

-

-/**

- * Destructor for this pipeline stage.

- */

-static void

-dtr(struct tnl_pipeline_stage *stage)

-{

-   struct vp_stage_data *store = VP_STAGE_DATA(stage);

-

-   if (store) {

-      GLuint i;

-

-      /* free the vertex program result arrays */

-      for (i = 0; i < VERT_RESULT_MAX; i++)

-         _mesa_vector4f_free( &store->results[i] );

-

-      /* free misc arrays */

-      _mesa_vector4f_free( &store->ndcCoords );

-      _mesa_align_free( store->clipmask );

-

-      FREE( store );

-      stage->privatePtr = NULL;

-   }

-}

-

-

-static void

-validate_vp_stage(struct gl_context *ctx, struct tnl_pipeline_stage *stage)

-{

-   if (ctx->VertexProgram._Current) {

-      _swrast_update_texture_samplers(ctx);

-   }

-}

-

-

-

-/**

- * Public description of this pipeline stage.

- */

-const struct tnl_pipeline_stage _tnl_vertex_program_stage =

-{

-   "vertex-program",

-   NULL,			/* private_data */

-   init_vp,			/* create */

-   dtr,				/* destroy */

-   validate_vp_stage, 		/* validate */

-   run_vp			/* run -- initially set to ctr */

-};

+/*
+ * Mesa 3-D graphics library
+ * Version:  7.6
+ *
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009  VMware, Inc.  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
+ * 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 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
+ * BRIAN PAUL 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.
+ */
+
+
+/**
+ * \file tnl/t_vb_program.c
+ * \brief Pipeline stage for executing vertex programs.
+ * \author Brian Paul,  Keith Whitwell
+ */
+
+
+#include "main/glheader.h"
+#include "main/colormac.h"
+#include "main/macros.h"
+#include "main/imports.h"
+#include "math/m_xform.h"
+#include "program/prog_instruction.h"
+#include "program/prog_statevars.h"
+#include "program/prog_execute.h"
+#include "swrast/s_context.h"
+
+#include "tnl/tnl.h"
+#include "tnl/t_context.h"
+#include "tnl/t_pipeline.h"
+
+
+#ifdef NAN_CHECK
+/** Check for NaNs and very large values */
+static inline void
+check_float(float x)
+{
+   assert(!IS_INF_OR_NAN(x));
+   assert(1.0e-15 <= x && x <= 1.0e15);
+}
+#endif
+
+
+/*!
+ * Private storage for the vertex program pipeline stage.
+ */
+struct vp_stage_data {
+   /** The results of running the vertex program go into these arrays. */
+   GLvector4f results[VERT_RESULT_MAX];
+
+   GLvector4f ndcCoords;              /**< normalized device coords */
+   GLubyte *clipmask;                 /**< clip flags */
+   GLubyte ormask, andmask;           /**< for clipping */
+
+   struct gl_program_machine machine;
+};
+
+
+#define VP_STAGE_DATA(stage) ((struct vp_stage_data *)(stage->privatePtr))
+
+
+static void
+userclip( struct gl_context *ctx,
+          GLvector4f *clip,
+          GLubyte *clipmask,
+          GLubyte *clipormask,
+          GLubyte *clipandmask )
+{
+   GLuint p;
+
+   for (p = 0; p < ctx->Const.MaxClipPlanes; p++) {
+      if (ctx->Transform.ClipPlanesEnabled & (1 << p)) {
+	 GLuint nr, i;
+	 const GLfloat a = ctx->Transform._ClipUserPlane[p][0];
+	 const GLfloat b = ctx->Transform._ClipUserPlane[p][1];
+	 const GLfloat c = ctx->Transform._ClipUserPlane[p][2];
+	 const GLfloat d = ctx->Transform._ClipUserPlane[p][3];
+         GLfloat *coord = (GLfloat *)clip->data;
+         GLuint stride = clip->stride;
+         GLuint count = clip->count;
+
+	 for (nr = 0, i = 0 ; i < count ; i++) {
+	    GLfloat dp = (coord[0] * a + 
+			  coord[1] * b +
+			  coord[2] * c +
+			  coord[3] * d);
+
+	    if (dp < 0) {
+	       nr++;
+	       clipmask[i] |= CLIP_USER_BIT;
+	    }
+
+	    STRIDE_F(coord, stride);
+	 }
+
+	 if (nr > 0) {
+	    *clipormask |= CLIP_USER_BIT;
+	    if (nr == count) {
+	       *clipandmask |= CLIP_USER_BIT;
+	       return;
+	    }
+	 }
+      }
+   }
+}
+
+
+static GLboolean
+do_ndc_cliptest(struct gl_context *ctx, struct vp_stage_data *store)
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   struct vertex_buffer *VB = &tnl->vb;
+   /* Cliptest and perspective divide.  Clip functions must clear
+    * the clipmask.
+    */
+   store->ormask = 0;
+   store->andmask = CLIP_FRUSTUM_BITS;
+
+   tnl_clip_prepare(ctx);
+
+   if (tnl->NeedNdcCoords) {
+      VB->NdcPtr =
+         _mesa_clip_tab[VB->ClipPtr->size]( VB->ClipPtr,
+                                            &store->ndcCoords,
+                                            store->clipmask,
+                                            &store->ormask,
+                                            &store->andmask,
+					    !ctx->Transform.DepthClamp );
+   }
+   else {
+      VB->NdcPtr = NULL;
+      _mesa_clip_np_tab[VB->ClipPtr->size]( VB->ClipPtr,
+                                            NULL,
+                                            store->clipmask,
+                                            &store->ormask,
+                                            &store->andmask,
+					    !ctx->Transform.DepthClamp );
+   }
+
+   if (store->andmask) {
+      /* All vertices are outside the frustum */
+      return GL_FALSE;
+   }
+
+   /* Test userclip planes.  This contributes to VB->ClipMask.
+    */
+   /** XXX NEW_SLANG _Enabled ??? */
+   if (ctx->Transform.ClipPlanesEnabled && (!ctx->VertexProgram._Enabled ||
+      ctx->VertexProgram.Current->IsPositionInvariant)) {
+      userclip( ctx,
+		VB->ClipPtr,
+		store->clipmask,
+		&store->ormask,
+		&store->andmask );
+
+      if (store->andmask) {
+	 return GL_FALSE;
+      }
+   }
+
+   VB->ClipAndMask = store->andmask;
+   VB->ClipOrMask = store->ormask;
+   VB->ClipMask = store->clipmask;
+
+   return GL_TRUE;
+}
+
+
+/**
+ * XXX the texture sampling code in this module is a bit of a hack.
+ * The texture sampling code is in swrast, though it doesn't have any
+ * real dependencies on the rest of swrast.  It should probably be
+ * moved into main/ someday.
+ */
+static void
+vp_fetch_texel(struct gl_context *ctx, const GLfloat texcoord[4], GLfloat lambda,
+               GLuint unit, GLfloat color[4])
+{
+   SWcontext *swrast = SWRAST_CONTEXT(ctx);
+
+   /* XXX use a float-valued TextureSample routine here!!! */
+   swrast->TextureSample[unit](ctx, ctx->Texture.Unit[unit]._Current,
+                               1, (const GLfloat (*)[4]) texcoord,
+                               &lambda,  (GLfloat (*)[4]) color);
+}
+
+
+/**
+ * Called via ctx->Driver.ProgramStringNotify() after a new vertex program
+ * string has been parsed.
+ */
+GLboolean
+_tnl_program_string(struct gl_context *ctx, GLenum target, struct gl_program *program)
+{
+   /* No-op.
+    * If we had derived anything from the program that was private to this
+    * stage we'd recompute/validate it here.
+    */
+   return GL_TRUE;
+}
+
+
+/**
+ * Initialize virtual machine state prior to executing vertex program.
+ */
+static void
+init_machine(struct gl_context *ctx, struct gl_program_machine *machine,
+             GLuint instID)
+{
+   /* Input registers get initialized from the current vertex attribs */
+   memcpy(machine->VertAttribs, ctx->Current.Attrib,
+          MAX_VERTEX_GENERIC_ATTRIBS * 4 * sizeof(GLfloat));
+
+   if (ctx->VertexProgram._Current->IsNVProgram) {
+      GLuint i;
+      /* Output/result regs are initialized to [0,0,0,1] */
+      for (i = 0; i < MAX_NV_VERTEX_PROGRAM_OUTPUTS; i++) {
+         ASSIGN_4V(machine->Outputs[i], 0.0F, 0.0F, 0.0F, 1.0F);
+      }
+      /* Temp regs are initialized to [0,0,0,0] */
+      for (i = 0; i < MAX_NV_VERTEX_PROGRAM_TEMPS; i++) {
+         ASSIGN_4V(machine->Temporaries[i], 0.0F, 0.0F, 0.0F, 0.0F);
+      }
+      for (i = 0; i < MAX_VERTEX_PROGRAM_ADDRESS_REGS; i++) {
+         ASSIGN_4V(machine->AddressReg[i], 0, 0, 0, 0);
+      }
+   }
+
+   machine->NumDeriv = 0;
+
+   /* init condition codes */
+   machine->CondCodes[0] = COND_EQ;
+   machine->CondCodes[1] = COND_EQ;
+   machine->CondCodes[2] = COND_EQ;
+   machine->CondCodes[3] = COND_EQ;
+
+   /* init call stack */
+   machine->StackDepth = 0;
+
+   machine->FetchTexelLod = vp_fetch_texel;
+   machine->FetchTexelDeriv = NULL; /* not used by vertex programs */
+
+   machine->Samplers = ctx->VertexProgram._Current->Base.SamplerUnits;
+
+   machine->SystemValues[SYSTEM_VALUE_INSTANCE_ID][0] = (GLfloat) instID;
+}
+
+
+/**
+ * Map the texture images which the vertex program will access (if any).
+ */
+static void
+map_textures(struct gl_context *ctx, const struct gl_vertex_program *vp)
+{
+   GLuint u;
+
+   if (!ctx->Driver.MapTexture)
+      return;
+
+   for (u = 0; u < ctx->Const.MaxVertexTextureImageUnits; u++) {
+      if (vp->Base.TexturesUsed[u]) {
+         /* Note: _Current *should* correspond to the target indicated
+          * in TexturesUsed[u].
+          */
+         ctx->Driver.MapTexture(ctx, ctx->Texture.Unit[u]._Current);
+      }
+   }
+}
+
+
+/**
+ * Unmap the texture images which were used by the vertex program (if any).
+ */
+static void
+unmap_textures(struct gl_context *ctx, const struct gl_vertex_program *vp)
+{
+   GLuint u;
+
+   if (!ctx->Driver.MapTexture)
+      return;
+
+   for (u = 0; u < ctx->Const.MaxVertexTextureImageUnits; u++) {
+      if (vp->Base.TexturesUsed[u]) {
+         /* Note: _Current *should* correspond to the target indicated
+          * in TexturesUsed[u].
+          */
+         ctx->Driver.UnmapTexture(ctx, ctx->Texture.Unit[u]._Current);
+      }
+   }
+}
+
+
+/**
+ * This function executes vertex programs
+ */
+static GLboolean
+run_vp( struct gl_context *ctx, struct tnl_pipeline_stage *stage )
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   struct vp_stage_data *store = VP_STAGE_DATA(stage);
+   struct vertex_buffer *VB = &tnl->vb;
+   struct gl_vertex_program *program = ctx->VertexProgram._Current;
+   struct gl_program_machine *machine = &store->machine;
+   GLuint outputs[VERT_RESULT_MAX], numOutputs;
+   GLuint i, j;
+
+   if (!program)
+      return GL_TRUE;
+
+   if (program->IsNVProgram) {
+      _mesa_load_tracked_matrices(ctx);
+   }
+   else {
+      /* ARB program or vertex shader */
+      _mesa_load_state_parameters(ctx, program->Base.Parameters);
+   }
+
+   /* make list of outputs to save some time below */
+   numOutputs = 0;
+   for (i = 0; i < VERT_RESULT_MAX; i++) {
+      if (program->Base.OutputsWritten & BITFIELD64_BIT(i)) {
+         outputs[numOutputs++] = i;
+
+	 if (!store->results[i].data) {
+	    _mesa_vector4f_alloc( &store->results[i], 0, VB->Size, 32 );
+	    store->results[i].size = 4;
+	 }
+      }
+   }
+
+   map_textures(ctx, program);
+
+   for (i = 0; i < VB->Count; i++) {
+      GLuint attr;
+
+      init_machine(ctx, machine, tnl->CurInstance);
+
+#if 0
+      printf("Input  %d: %f, %f, %f, %f\n", i,
+             VB->AttribPtr[0]->data[i][0],
+             VB->AttribPtr[0]->data[i][1],
+             VB->AttribPtr[0]->data[i][2],
+             VB->AttribPtr[0]->data[i][3]);
+      printf("   color: %f, %f, %f, %f\n",
+             VB->AttribPtr[3]->data[i][0],
+             VB->AttribPtr[3]->data[i][1],
+             VB->AttribPtr[3]->data[i][2],
+             VB->AttribPtr[3]->data[i][3]);
+      printf("  normal: %f, %f, %f, %f\n",
+             VB->AttribPtr[2]->data[i][0],
+             VB->AttribPtr[2]->data[i][1],
+             VB->AttribPtr[2]->data[i][2],
+             VB->AttribPtr[2]->data[i][3]);
+#endif
+
+      /* the vertex array case */
+      for (attr = 0; attr < VERT_ATTRIB_MAX; attr++) {
+	 if (program->Base.InputsRead & (1 << attr)) {
+	    const GLubyte *ptr = (const GLubyte*) VB->AttribPtr[attr]->data;
+	    const GLuint size = VB->AttribPtr[attr]->size;
+	    const GLuint stride = VB->AttribPtr[attr]->stride;
+	    const GLfloat *data = (GLfloat *) (ptr + stride * i);
+#ifdef NAN_CHECK
+            check_float(data[0]);
+            check_float(data[1]);
+            check_float(data[2]);
+            check_float(data[3]);
+#endif
+	    COPY_CLEAN_4V(machine->VertAttribs[attr], size, data);
+	 }
+      }
+
+      /* execute the program */
+      _mesa_execute_program(ctx, &program->Base, machine);
+
+      /* copy the output registers into the VB->attribs arrays */
+      for (j = 0; j < numOutputs; j++) {
+         const GLuint attr = outputs[j];
+#ifdef NAN_CHECK
+         check_float(machine->Outputs[attr][0]);
+         check_float(machine->Outputs[attr][1]);
+         check_float(machine->Outputs[attr][2]);
+         check_float(machine->Outputs[attr][3]);
+#endif
+         COPY_4V(store->results[attr].data[i], machine->Outputs[attr]);
+      }
+
+      /* FOGC is a special case.  Fragment shader expects (f,0,0,1) */
+      if (program->Base.OutputsWritten & BITFIELD64_BIT(VERT_RESULT_FOGC)) {
+         store->results[VERT_RESULT_FOGC].data[i][1] = 0.0;
+         store->results[VERT_RESULT_FOGC].data[i][2] = 0.0;
+         store->results[VERT_RESULT_FOGC].data[i][3] = 1.0;
+      }
+#ifdef NAN_CHECK
+      ASSERT(machine->Outputs[0][3] != 0.0F);
+#endif
+#if 0
+      printf("HPOS: %f %f %f %f\n",
+             machine->Outputs[0][0], 
+             machine->Outputs[0][1], 
+             machine->Outputs[0][2], 
+             machine->Outputs[0][3]);
+#endif
+   }
+
+   unmap_textures(ctx, program);
+
+   /* Fixup fog and point size results if needed */
+   if (program->IsNVProgram) {
+      if (ctx->Fog.Enabled &&
+          (program->Base.OutputsWritten & BITFIELD64_BIT(VERT_RESULT_FOGC)) == 0) {
+         for (i = 0; i < VB->Count; i++) {
+            store->results[VERT_RESULT_FOGC].data[i][0] = 1.0;
+         }
+      }
+
+      if (ctx->VertexProgram.PointSizeEnabled &&
+          (program->Base.OutputsWritten & BITFIELD64_BIT(VERT_RESULT_PSIZ)) == 0) {
+         for (i = 0; i < VB->Count; i++) {
+            store->results[VERT_RESULT_PSIZ].data[i][0] = ctx->Point.Size;
+         }
+      }
+   }
+
+   if (program->IsPositionInvariant) {
+      /* We need the exact same transform as in the fixed function path here
+       * to guarantee invariance, depending on compiler optimization flags
+       * results could be different otherwise.
+       */
+      VB->ClipPtr = TransformRaw( &store->results[0],
+				  &ctx->_ModelProjectMatrix,
+				  VB->AttribPtr[0] );
+
+      /* Drivers expect this to be clean to element 4...
+       */
+      switch (VB->ClipPtr->size) {
+      case 1:
+	 /* impossible */
+      case 2:
+	 _mesa_vector4f_clean_elem( VB->ClipPtr, VB->Count, 2 );
+	 /* fall-through */
+      case 3:
+	 _mesa_vector4f_clean_elem( VB->ClipPtr, VB->Count, 3 );
+	 /* fall-through */
+      case 4:
+	 break;
+      }
+   }
+   else {
+      /* Setup the VB pointers so that the next pipeline stages get
+       * their data from the right place (the program output arrays).
+       */
+      VB->ClipPtr = &store->results[VERT_RESULT_HPOS];
+      VB->ClipPtr->size = 4;
+      VB->ClipPtr->count = VB->Count;
+   }
+
+   VB->AttribPtr[VERT_ATTRIB_COLOR0] = &store->results[VERT_RESULT_COL0];
+   VB->AttribPtr[VERT_ATTRIB_COLOR1] = &store->results[VERT_RESULT_COL1];
+   VB->AttribPtr[VERT_ATTRIB_FOG] = &store->results[VERT_RESULT_FOGC];
+   VB->AttribPtr[_TNL_ATTRIB_POINTSIZE] = &store->results[VERT_RESULT_PSIZ];
+   VB->BackfaceColorPtr = &store->results[VERT_RESULT_BFC0];
+   VB->BackfaceSecondaryColorPtr = &store->results[VERT_RESULT_BFC1];
+
+   for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++) {
+      VB->AttribPtr[_TNL_ATTRIB_TEX0 + i]
+         = &store->results[VERT_RESULT_TEX0 + i];
+   }
+
+   for (i = 0; i < ctx->Const.MaxVarying; i++) {
+      if (program->Base.OutputsWritten & BITFIELD64_BIT(VERT_RESULT_VAR0 + i)) {
+         /* Note: varying results get put into the generic attributes */
+	 VB->AttribPtr[VERT_ATTRIB_GENERIC0+i]
+            = &store->results[VERT_RESULT_VAR0 + i];
+      }
+   }
+
+
+   /* Perform NDC and cliptest operations:
+    */
+   return do_ndc_cliptest(ctx, store);
+}
+
+
+/**
+ * Called the first time stage->run is called.  In effect, don't
+ * allocate data until the first time the stage is run.
+ */
+static GLboolean
+init_vp(struct gl_context *ctx, struct tnl_pipeline_stage *stage)
+{
+   TNLcontext *tnl = TNL_CONTEXT(ctx);
+   struct vertex_buffer *VB = &(tnl->vb);
+   struct vp_stage_data *store;
+   const GLuint size = VB->Size;
+
+   stage->privatePtr = CALLOC(sizeof(*store));
+   store = VP_STAGE_DATA(stage);
+   if (!store)
+      return GL_FALSE;
+
+   /* a few other misc allocations */
+   _mesa_vector4f_alloc( &store->ndcCoords, 0, size, 32 );
+   store->clipmask = (GLubyte *) _mesa_align_malloc(sizeof(GLubyte)*size, 32 );
+
+   return GL_TRUE;
+}
+
+
+/**
+ * Destructor for this pipeline stage.
+ */
+static void
+dtr(struct tnl_pipeline_stage *stage)
+{
+   struct vp_stage_data *store = VP_STAGE_DATA(stage);
+
+   if (store) {
+      GLuint i;
+
+      /* free the vertex program result arrays */
+      for (i = 0; i < VERT_RESULT_MAX; i++)
+         _mesa_vector4f_free( &store->results[i] );
+
+      /* free misc arrays */
+      _mesa_vector4f_free( &store->ndcCoords );
+      _mesa_align_free( store->clipmask );
+
+      FREE( store );
+      stage->privatePtr = NULL;
+   }
+}
+
+
+static void
+validate_vp_stage(struct gl_context *ctx, struct tnl_pipeline_stage *stage)
+{
+   if (ctx->VertexProgram._Current) {
+      _swrast_update_texture_samplers(ctx);
+   }
+}
+
+
+
+/**
+ * Public description of this pipeline stage.
+ */
+const struct tnl_pipeline_stage _tnl_vertex_program_stage =
+{
+   "vertex-program",
+   NULL,			/* private_data */
+   init_vp,			/* create */
+   dtr,				/* destroy */
+   validate_vp_stage, 		/* validate */
+   run_vp			/* run -- initially set to ctr */
+};
diff --git a/mesalib/src/mesa/tnl/t_vertex_generic.c b/mesalib/src/mesa/tnl/t_vertex_generic.c
index 9dcecdd57..7b7f511ce 100644
--- a/mesalib/src/mesa/tnl/t_vertex_generic.c
+++ b/mesalib/src/mesa/tnl/t_vertex_generic.c
@@ -47,7 +47,7 @@
  * NDC->Viewport mapping and store the results at 'v'.
  */
 
-static INLINE void insert_4f_viewport_4( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_4f_viewport_4( const struct tnl_clipspace_attr *a, GLubyte *v,
                       const GLfloat *in )
 {
    GLfloat *out = (GLfloat *)v;
@@ -59,7 +59,7 @@ static INLINE void insert_4f_viewport_4( const struct tnl_clipspace_attr *a, GLu
    out[3] = in[3];
 }
 
-static INLINE void insert_4f_viewport_3( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_4f_viewport_3( const struct tnl_clipspace_attr *a, GLubyte *v,
 				const GLfloat *in )
 {
    GLfloat *out = (GLfloat *)v;
@@ -71,7 +71,7 @@ static INLINE void insert_4f_viewport_3( const struct tnl_clipspace_attr *a, GLu
    out[3] = 1;
 }
 
-static INLINE void insert_4f_viewport_2( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_4f_viewport_2( const struct tnl_clipspace_attr *a, GLubyte *v,
 				const GLfloat *in )
 {
    GLfloat *out = (GLfloat *)v;
@@ -83,7 +83,7 @@ static INLINE void insert_4f_viewport_2( const struct tnl_clipspace_attr *a, GLu
    out[3] = 1;
 }
 
-static INLINE void insert_4f_viewport_1( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_4f_viewport_1( const struct tnl_clipspace_attr *a, GLubyte *v,
 				const GLfloat *in )
 {
    GLfloat *out = (GLfloat *)v;
@@ -95,7 +95,7 @@ static INLINE void insert_4f_viewport_1( const struct tnl_clipspace_attr *a, GLu
    out[3] = 1;
 }
 
-static INLINE void insert_3f_viewport_3( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_3f_viewport_3( const struct tnl_clipspace_attr *a, GLubyte *v,
 				const GLfloat *in )
 {
    GLfloat *out = (GLfloat *)v;
@@ -106,7 +106,7 @@ static INLINE void insert_3f_viewport_3( const struct tnl_clipspace_attr *a, GLu
    out[2] = vp[10] * in[2] + vp[14];
 }
 
-static INLINE void insert_3f_viewport_2( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_3f_viewport_2( const struct tnl_clipspace_attr *a, GLubyte *v,
 				const GLfloat *in )
 {
    GLfloat *out = (GLfloat *)v;
@@ -117,7 +117,7 @@ static INLINE void insert_3f_viewport_2( const struct tnl_clipspace_attr *a, GLu
    out[2] = vp[14];
 }
 
-static INLINE void insert_3f_viewport_1( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_3f_viewport_1( const struct tnl_clipspace_attr *a, GLubyte *v,
 				const GLfloat *in )
 {
    GLfloat *out = (GLfloat *)v;
@@ -128,7 +128,7 @@ static INLINE void insert_3f_viewport_1( const struct tnl_clipspace_attr *a, GLu
    out[2] = vp[14];
 }
 
-static INLINE void insert_2f_viewport_2( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_2f_viewport_2( const struct tnl_clipspace_attr *a, GLubyte *v,
 				const GLfloat *in )
 {
    GLfloat *out = (GLfloat *)v;
@@ -138,7 +138,7 @@ static INLINE void insert_2f_viewport_2( const struct tnl_clipspace_attr *a, GLu
    out[1] = vp[5] * in[1] + vp[13];
 }
 
-static INLINE void insert_2f_viewport_1( const struct tnl_clipspace_attr *a, GLubyte *v,
+static inline void insert_2f_viewport_1( const struct tnl_clipspace_attr *a, GLubyte *v,
 				const GLfloat *in )
 {
    GLfloat *out = (GLfloat *)v;
@@ -153,7 +153,7 @@ static INLINE void insert_2f_viewport_1( const struct tnl_clipspace_attr *a, GLu
  * These functions do the same as above, except for the viewport mapping.
  */
 
-static INLINE void insert_4f_4( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
+static inline void insert_4f_4( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
 {
    GLfloat *out = (GLfloat *)(v);
    (void) a;
@@ -164,7 +164,7 @@ static INLINE void insert_4f_4( const struct tnl_clipspace_attr *a, GLubyte *v,
    out[3] = in[3];
 }
 
-static INLINE void insert_4f_3( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
+static inline void insert_4f_3( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
 {
    GLfloat *out = (GLfloat *)(v);
    (void) a;
@@ -175,7 +175,7 @@ static INLINE void insert_4f_3( const struct tnl_clipspace_attr *a, GLubyte *v,
    out[3] = 1;
 }
 
-static INLINE void insert_4f_2( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
+static inline void insert_4f_2( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
 {
    GLfloat *out = (GLfloat *)(v);
    (void) a;
@@ -186,7 +186,7 @@ static INLINE void insert_4f_2( const struct tnl_clipspace_attr *a, GLubyte *v,
    out[3] = 1;
 }
 
-static INLINE void insert_4f_1( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
+static inline void insert_4f_1( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
 {
    GLfloat *out = (GLfloat *)(v);
    (void) a;
@@ -197,7 +197,7 @@ static INLINE void insert_4f_1( const struct tnl_clipspace_attr *a, GLubyte *v,
    out[3] = 1;
 }
 
-static INLINE void insert_3f_xyw_4( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
+static inline void insert_3f_xyw_4( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
 {
    GLfloat *out = (GLfloat *)(v);
    (void) a;
@@ -207,14 +207,14 @@ static INLINE void insert_3f_xyw_4( const struct tnl_clipspace_attr *a, GLubyte
    out[2] = in[3];
 }
 
-static INLINE void insert_3f_xyw_err( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
+static inline void insert_3f_xyw_err( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
 {
    (void) a; (void) v; (void) in;
    DEBUG_INSERT;
    exit(1);
 }
 
-static INLINE void insert_3f_3( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
+static inline void insert_3f_3( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
 {
    GLfloat *out = (GLfloat *)(v);
    (void) a;
@@ -224,7 +224,7 @@ static INLINE void insert_3f_3( const struct tnl_clipspace_attr *a, GLubyte *v,
    out[2] = in[2];
 }
 
-static INLINE void insert_3f_2( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
+static inline void insert_3f_2( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
 {
    GLfloat *out = (GLfloat *)(v);
    (void) a;
@@ -234,7 +234,7 @@ static INLINE void insert_3f_2( const struct tnl_clipspace_attr *a, GLubyte *v,
    out[2] = 0;
 }
 
-static INLINE void insert_3f_1( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
+static inline void insert_3f_1( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
 {
    GLfloat *out = (GLfloat *)(v);
    (void) a;
@@ -245,7 +245,7 @@ static INLINE void insert_3f_1( const struct tnl_clipspace_attr *a, GLubyte *v,
 }
 
 
-static INLINE void insert_2f_2( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
+static inline void insert_2f_2( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
 {
    GLfloat *out = (GLfloat *)(v);
    (void) a;
@@ -254,7 +254,7 @@ static INLINE void insert_2f_2( const struct tnl_clipspace_attr *a, GLubyte *v,
    out[1] = in[1];
 }
 
-static INLINE void insert_2f_1( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
+static inline void insert_2f_1( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
 {
    GLfloat *out = (GLfloat *)(v);
    (void) a;
@@ -263,7 +263,7 @@ static INLINE void insert_2f_1( const struct tnl_clipspace_attr *a, GLubyte *v,
    out[1] = 0;
 }
 
-static INLINE void insert_1f_1( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
+static inline void insert_1f_1( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
 {
    GLfloat *out = (GLfloat *)(v);
    (void) a;
@@ -271,13 +271,13 @@ static INLINE void insert_1f_1( const struct tnl_clipspace_attr *a, GLubyte *v,
    out[0] = in[0];
 }
 
-static INLINE void insert_null( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
+static inline void insert_null( const struct tnl_clipspace_attr *a, GLubyte *v, const GLfloat *in )
 {
    DEBUG_INSERT;
    (void) a; (void) v; (void) in;
 }
 
-static INLINE void insert_4chan_4f_rgba_4( const struct tnl_clipspace_attr *a, GLubyte *v, 
+static inline void insert_4chan_4f_rgba_4( const struct tnl_clipspace_attr *a, GLubyte *v, 
 				  const GLfloat *in )
 {
    GLchan *c = (GLchan *)v;
@@ -289,7 +289,7 @@ static INLINE void insert_4chan_4f_rgba_4( const struct tnl_clipspace_attr *a, G
    UNCLAMPED_FLOAT_TO_CHAN(c[3], in[3]);
 }
 
-static INLINE void insert_4chan_4f_rgba_3( const struct tnl_clipspace_attr *a, GLubyte *v, 
+static inline void insert_4chan_4f_rgba_3( const struct tnl_clipspace_attr *a, GLubyte *v, 
 				  const GLfloat *in )
 {
    GLchan *c = (GLchan *)v;
@@ -301,7 +301,7 @@ static INLINE void insert_4chan_4f_rgba_3( const struct tnl_clipspace_attr *a, G
    c[3] = CHAN_MAX;
 }
 
-static INLINE void insert_4chan_4f_rgba_2( const struct tnl_clipspace_attr *a, GLubyte *v, 
+static inline void insert_4chan_4f_rgba_2( const struct tnl_clipspace_attr *a, GLubyte *v, 
 				  const GLfloat *in )
 {
    GLchan *c = (GLchan *)v;
@@ -313,7 +313,7 @@ static INLINE void insert_4chan_4f_rgba_2( const struct tnl_clipspace_attr *a, G
    c[3] = CHAN_MAX;
 }
 
-static INLINE void insert_4chan_4f_rgba_1( const struct tnl_clipspace_attr *a, GLubyte *v, 
+static inline void insert_4chan_4f_rgba_1( const struct tnl_clipspace_attr *a, GLubyte *v, 
 				  const GLfloat *in )
 {
    GLchan *c = (GLchan *)v;
@@ -325,7 +325,7 @@ static INLINE void insert_4chan_4f_rgba_1( const struct tnl_clipspace_attr *a, G
    c[3] = CHAN_MAX;
 }
 
-static INLINE void insert_4ub_4f_rgba_4( const struct tnl_clipspace_attr *a, GLubyte *v, 
+static inline void insert_4ub_4f_rgba_4( const struct tnl_clipspace_attr *a, GLubyte *v, 
 				const GLfloat *in )
 {
    DEBUG_INSERT;
@@ -336,7 +336,7 @@ static INLINE void insert_4ub_4f_rgba_4( const struct tnl_clipspace_attr *a, GLu
    UNCLAMPED_FLOAT_TO_UBYTE(v[3], in[3]);
 }
 
-static INLINE void insert_4ub_4f_rgba_3( const struct tnl_clipspace_attr *a, GLubyte *v, 
+static inline void insert_4ub_4f_rgba_3( const struct tnl_clipspace_attr *a, GLubyte *v, 
 				const GLfloat *in )
 {
    DEBUG_INSERT;
@@ -347,7 +347,7 @@ static INLINE void insert_4ub_4f_rgba_3( const struct tnl_clipspace_attr *a, GLu
    v[3] = 0xff;
 }
 
-static INLINE void insert_4ub_4f_rgba_2( const struct tnl_clipspace_attr *a, GLubyte *v, 
+static inline void insert_4ub_4f_rgba_2( const struct tnl_clipspace_attr *a, GLubyte *v, 
 				const GLfloat *in )
 {
    DEBUG_INSERT;
@@ -358,7 +358,7 @@ static INLINE void insert_4ub_4f_rgba_2( const struct tnl_clipspace_attr *a, GLu
    v[3] = 0xff;
 }
 
-static INLINE void insert_4ub_4f_rgba_1( const struct tnl_clipspace_attr *a, GLubyte *v, 
+static inline void insert_4ub_4f_rgba_1( const struct tnl_clipspace_attr *a, GLubyte *v, 
 				const GLfloat *in )
 {
    DEBUG_INSERT;
@@ -369,7 +369,7 @@ static INLINE void insert_4ub_4f_rgba_1( const struct tnl_clipspace_attr *a, GLu
    v[3] = 0xff;
 }
 
-static INLINE void insert_4ub_4f_bgra_4( const struct tnl_clipspace_attr *a, GLubyte *v, 
+static inline void insert_4ub_4f_bgra_4( const struct tnl_clipspace_attr *a, GLubyte *v, 
 				const GLfloat *in )
 {
    DEBUG_INSERT;
@@ -380,7 +380,7 @@ static INLINE void insert_4ub_4f_bgra_4( const struct tnl_clipspace_attr *a, GLu
    UNCLAMPED_FLOAT_TO_UBYTE(v[3], in[3]);
 }
 
-static INLINE void insert_4ub_4f_bgra_3( const struct tnl_clipspace_attr *a, GLubyte *v, 
+static inline void insert_4ub_4f_bgra_3( const struct tnl_clipspace_attr *a, GLubyte *v, 
 				const GLfloat *in )
 {
    DEBUG_INSERT;
@@ -391,7 +391,7 @@ static INLINE void insert_4ub_4f_bgra_3( const struct tnl_clipspace_attr *a, GLu
    v[3] = 0xff;
 }
 
-static INLINE void insert_4ub_4f_bgra_2( const struct tnl_clipspace_attr *a, GLubyte *v, 
+static inline void insert_4ub_4f_bgra_2( const struct tnl_clipspace_attr *a, GLubyte *v, 
 				const GLfloat *in )
 {
    DEBUG_INSERT;
@@ -402,7 +402,7 @@ static INLINE void insert_4ub_4f_bgra_2( const struct tnl_clipspace_attr *a, GLu
    v[3] = 0xff;
 }
 
-static INLINE void insert_4ub_4f_bgra_1( const struct tnl_clipspace_attr *a, GLubyte *v, 
+static inline void insert_4ub_4f_bgra_1( const struct tnl_clipspace_attr *a, GLubyte *v, 
 				const GLfloat *in )
 {
    DEBUG_INSERT;
@@ -413,7 +413,7 @@ static INLINE void insert_4ub_4f_bgra_1( const struct tnl_clipspace_attr *a, GLu
    v[3] = 0xff;
 }
 
-static INLINE void insert_4ub_4f_argb_4( const struct tnl_clipspace_attr *a, GLubyte *v, 
+static inline void insert_4ub_4f_argb_4( const struct tnl_clipspace_attr *a, GLubyte *v, 
 				const GLfloat *in )
 {
    DEBUG_INSERT;
@@ -424,7 +424,7 @@ static INLINE void insert_4ub_4f_argb_4( const struct tnl_clipspace_attr *a, GLu
    UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[3]);
 }
 
-static INLINE void insert_4ub_4f_argb_3( const struct tnl_clipspace_attr *a, GLubyte *v, 
+static inline void insert_4ub_4f_argb_3( const struct tnl_clipspace_attr *a, GLubyte *v, 
 				const GLfloat *in )
 {
    DEBUG_INSERT;
@@ -435,7 +435,7 @@ static INLINE void insert_4ub_4f_argb_3( const struct tnl_clipspace_attr *a, GLu
    v[0] = 0xff;
 }
 
-static INLINE void insert_4ub_4f_argb_2( const struct tnl_clipspace_attr *a, GLubyte *v, 
+static inline void insert_4ub_4f_argb_2( const struct tnl_clipspace_attr *a, GLubyte *v, 
 				const GLfloat *in )
 {
    DEBUG_INSERT;
@@ -446,7 +446,7 @@ static INLINE void insert_4ub_4f_argb_2( const struct tnl_clipspace_attr *a, GLu
    v[0] = 0xff;
 }
 
-static INLINE void insert_4ub_4f_argb_1( const struct tnl_clipspace_attr *a, GLubyte *v, 
+static inline void insert_4ub_4f_argb_1( const struct tnl_clipspace_attr *a, GLubyte *v, 
 				const GLfloat *in )
 {
    DEBUG_INSERT;
@@ -457,7 +457,7 @@ static INLINE void insert_4ub_4f_argb_1( const struct tnl_clipspace_attr *a, GLu
    v[0] = 0xff;
 }
 
-static INLINE void insert_4ub_4f_abgr_4( const struct tnl_clipspace_attr *a, GLubyte *v, 
+static inline void insert_4ub_4f_abgr_4( const struct tnl_clipspace_attr *a, GLubyte *v, 
 				const GLfloat *in )
 {
    DEBUG_INSERT;
@@ -468,7 +468,7 @@ static INLINE void insert_4ub_4f_abgr_4( const struct tnl_clipspace_attr *a, GLu
    UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[3]);
 }
 
-static INLINE void insert_4ub_4f_abgr_3( const struct tnl_clipspace_attr *a, GLubyte *v, 
+static inline void insert_4ub_4f_abgr_3( const struct tnl_clipspace_attr *a, GLubyte *v, 
 				const GLfloat *in )
 {
    DEBUG_INSERT;
@@ -479,7 +479,7 @@ static INLINE void insert_4ub_4f_abgr_3( const struct tnl_clipspace_attr *a, GLu
    v[0] = 0xff;
 }
 
-static INLINE void insert_4ub_4f_abgr_2( const struct tnl_clipspace_attr *a, GLubyte *v, 
+static inline void insert_4ub_4f_abgr_2( const struct tnl_clipspace_attr *a, GLubyte *v, 
 				const GLfloat *in )
 {
    DEBUG_INSERT;
@@ -490,7 +490,7 @@ static INLINE void insert_4ub_4f_abgr_2( const struct tnl_clipspace_attr *a, GLu
    v[0] = 0xff;
 }
 
-static INLINE void insert_4ub_4f_abgr_1( const struct tnl_clipspace_attr *a, GLubyte *v, 
+static inline void insert_4ub_4f_abgr_1( const struct tnl_clipspace_attr *a, GLubyte *v, 
 				const GLfloat *in )
 {
    DEBUG_INSERT;
@@ -501,7 +501,7 @@ static INLINE void insert_4ub_4f_abgr_1( const struct tnl_clipspace_attr *a, GLu
    v[0] = 0xff;
 }
 
-static INLINE void insert_3ub_3f_rgb_3( const struct tnl_clipspace_attr *a, GLubyte *v, 
+static inline void insert_3ub_3f_rgb_3( const struct tnl_clipspace_attr *a, GLubyte *v, 
 			       const GLfloat *in )
 {
    DEBUG_INSERT;
@@ -511,7 +511,7 @@ static INLINE void insert_3ub_3f_rgb_3( const struct tnl_clipspace_attr *a, GLub
    UNCLAMPED_FLOAT_TO_UBYTE(v[2], in[2]);
 }
 
-static INLINE void insert_3ub_3f_rgb_2( const struct tnl_clipspace_attr *a, GLubyte *v, 
+static inline void insert_3ub_3f_rgb_2( const struct tnl_clipspace_attr *a, GLubyte *v, 
 			       const GLfloat *in )
 {
    DEBUG_INSERT;
@@ -521,7 +521,7 @@ static INLINE void insert_3ub_3f_rgb_2( const struct tnl_clipspace_attr *a, GLub
    v[2] = 0;
 }
 
-static INLINE void insert_3ub_3f_rgb_1( const struct tnl_clipspace_attr *a, GLubyte *v, 
+static inline void insert_3ub_3f_rgb_1( const struct tnl_clipspace_attr *a, GLubyte *v, 
 			       const GLfloat *in )
 {
    DEBUG_INSERT;
@@ -531,7 +531,7 @@ static INLINE void insert_3ub_3f_rgb_1( const struct tnl_clipspace_attr *a, GLub
    v[2] = 0;
 }
 
-static INLINE void insert_3ub_3f_bgr_3( const struct tnl_clipspace_attr *a, GLubyte *v, 
+static inline void insert_3ub_3f_bgr_3( const struct tnl_clipspace_attr *a, GLubyte *v, 
 				 const GLfloat *in )
 {
    DEBUG_INSERT;
@@ -541,7 +541,7 @@ static INLINE void insert_3ub_3f_bgr_3( const struct tnl_clipspace_attr *a, GLub
    UNCLAMPED_FLOAT_TO_UBYTE(v[0], in[2]);
 }
 
-static INLINE void insert_3ub_3f_bgr_2( const struct tnl_clipspace_attr *a, GLubyte *v, 
+static inline void insert_3ub_3f_bgr_2( const struct tnl_clipspace_attr *a, GLubyte *v, 
 				 const GLfloat *in )
 {
    DEBUG_INSERT;
@@ -551,7 +551,7 @@ static INLINE void insert_3ub_3f_bgr_2( const struct tnl_clipspace_attr *a, GLub
    v[0] = 0;
 }
 
-static INLINE void insert_3ub_3f_bgr_1( const struct tnl_clipspace_attr *a, GLubyte *v, 
+static inline void insert_3ub_3f_bgr_1( const struct tnl_clipspace_attr *a, GLubyte *v, 
 				 const GLfloat *in )
 {
    DEBUG_INSERT;
@@ -562,7 +562,7 @@ static INLINE void insert_3ub_3f_bgr_1( const struct tnl_clipspace_attr *a, GLub
 }
 
 
-static INLINE void insert_1ub_1f_1( const struct tnl_clipspace_attr *a, GLubyte *v, 
+static inline void insert_1ub_1f_1( const struct tnl_clipspace_attr *a, GLubyte *v, 
 			   const GLfloat *in )
 {
    DEBUG_INSERT;