Renamed s_nvfragprog.[ch] to s_fragprog.[ch], program_instruction.h to prog_instruction.h

3 files changed, 0 insertions, 2093 deletions

diff --git a/src/mesa/shader/program_instruction.h b/src/mesa/shader/program_instruction.h
deleted file mode 100644
index 2fcdfaa2be..0000000000
--- a/src/mesa/shader/program_instruction.h
+++ /dev/null
@@ -1,364 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5
- *
- * Copyright (C) 1999-2005  Brian Paul   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 prog_instruction.h
- *
- * Private vertex program types and constants only used by files
- * related to vertex programs.
- *
- * \author Brian Paul
- * \author Keith Whitwell
- * \author Ian Romanick <idr@us.ibm.com>
- */
-
-
-#ifndef PROG_INSTRUCTION_H
-#define PROG_INSTRUCTION_H
-
-/**
- * Condition codes for GL_NV_fragment_program
- */
-/*@{*/
-#define COND_GT  1  /* greater than zero */
-#define COND_EQ  2  /* equal to zero */
-#define COND_LT  3  /* less than zero */
-#define COND_UN  4  /* unordered (NaN) */
-#define COND_GE  5  /* greater then or equal to zero */
-#define COND_LE  6  /* less then or equal to zero */
-#define COND_NE  7  /* not equal to zero */
-#define COND_TR  8  /* always true */
-#define COND_FL  9  /* always false */
-/*@}*/
-
-
-/**
- * Instruction precision for GL_NV_fragment_program
- */
-/*@{*/
-#define FLOAT32  0x1
-#define FLOAT16  0x2
-#define FIXED12  0x4
-/*@}*/
-
-
-/**
- * Saturation modes when storing values.
- */
-/*@{*/
-#define SATURATE_OFF            0
-#define SATURATE_ZERO_ONE       1
-#define SATURATE_PLUS_MINUS_ONE 2
-/*@}*/
-
-
-/**
- * Per-component negation masks
- */
-/*@{*/
-#define NEGATE_X    0x1
-#define NEGATE_Y    0x2
-#define NEGATE_Z    0x4
-#define NEGATE_W    0x8
-#define NEGATE_XYZW 0xf
-#define NEGATE_NONE 0x0
-/*@}*/
-
-
-/**
- * Program instruction opcodes, for both vertex and fragment programs.
- * \note changes to this opcode list must be reflected in t_vb_arbprogram.c
- */
-typedef enum prog_opcode {
-                     /* ARB_vp   ARB_fp   NV_vp   NV_fp */
-                     /*---------------------------------*/
-   OPCODE_NOP = 0,
-   OPCODE_ABS,       /*   X        X       1.1          */
-   OPCODE_ADD,       /*   X        X       X       X    */
-   OPCODE_ARA,       /*                    2            */
-   OPCODE_ARL,       /*   X                X            */
-   OPCODE_ARL_NV,    /*                    2            */
-   OPCODE_ARR,       /*                    2            */
-   OPCODE_BRA,       /*                    2            */
-   OPCODE_CAL,       /*                    2       2    */
-   OPCODE_CMP,       /*            X                    */
-   OPCODE_COS,       /*            X       2       X    */
-   OPCODE_DDX,       /*                            X    */
-   OPCODE_DDY,       /*                            X    */
-   OPCODE_DP3,       /*   X        X       X       X    */
-   OPCODE_DP4,       /*   X        X       X       X    */
-   OPCODE_DPH,       /*   X        X       1.1          */
-   OPCODE_DST,       /*   X        X       X       X    */
-   OPCODE_END,       /*   X        X       X       X    */
-   OPCODE_EX2,       /*   X        X       2       X    */
-   OPCODE_EXP,       /*   X                X            */
-   OPCODE_FLR,       /*   X        X       2       X    */
-   OPCODE_FRC,       /*   X        X       2       X    */
-   OPCODE_KIL,       /*            X                    */
-   OPCODE_KIL_NV,    /*                            X    */
-   OPCODE_LG2,       /*   X        X       2       X    */
-   OPCODE_LIT,       /*   X        X       X       X    */
-   OPCODE_LOG,       /*   X                X            */
-   OPCODE_LRP,       /*            X               X    */
-   OPCODE_MAD,       /*   X        X       X       X    */
-   OPCODE_MAX,       /*   X        X       X       X    */
-   OPCODE_MIN,       /*   X        X       X       X    */
-   OPCODE_MOV,       /*   X        X       X       X    */
-   OPCODE_MUL,       /*   X        X       X       X    */
-   OPCODE_PK2H,      /*                            X    */
-   OPCODE_PK2US,     /*                            X    */
-   OPCODE_PK4B,      /*                            X    */
-   OPCODE_PK4UB,     /*                            X    */
-   OPCODE_POW,       /*   X        X               X    */
-   OPCODE_POPA,      /*                    3            */
-   OPCODE_PRINT,     /*                    X       X    */
-   OPCODE_PUSHA,     /*                    3            */
-   OPCODE_RCC,       /*                    1.1          */
-   OPCODE_RCP,       /*   X        X       X       X    */
-   OPCODE_RET,       /*                    2       2    */
-   OPCODE_RFL,       /*            X               X    */
-   OPCODE_RSQ,       /*   X        X       X       X    */
-   OPCODE_SCS,       /*            X                    */
-   OPCODE_SEQ,       /*                    2       X    */
-   OPCODE_SFL,       /*                    2       X    */
-   OPCODE_SGE,       /*   X        X       X       X    */
-   OPCODE_SGT,       /*                    2       X    */
-   OPCODE_SIN,       /*            X       2       X    */
-   OPCODE_SLE,       /*                    2       X    */
-   OPCODE_SLT,       /*   X        X       X       X    */
-   OPCODE_SNE,       /*                    2       X    */
-   OPCODE_SSG,       /*                    2            */
-   OPCODE_STR,       /*                    2       X    */
-   OPCODE_SUB,       /*   X        X       1.1     X    */
-   OPCODE_SWZ,       /*   X        X                    */
-   OPCODE_TEX,       /*            X       3       X    */
-   OPCODE_TXB,       /*            X       3            */
-   OPCODE_TXD,       /*                            X    */
-   OPCODE_TXL,       /*                    3       2    */
-   OPCODE_TXP,       /*            X                    */
-   OPCODE_TXP_NV,    /*                    3       X    */
-   OPCODE_UP2H,      /*                            X    */
-   OPCODE_UP2US,     /*                            X    */
-   OPCODE_UP4B,      /*                            X    */
-   OPCODE_UP4UB,     /*                            X    */
-   OPCODE_X2D,       /*                            X    */
-   OPCODE_XPD,       /*   X        X                    */
-   MAX_OPCODE
-} gl_inst_opcode;
-
-
-/**
- * Instruction source register.
- */
-struct prog_src_register
-{
-   GLuint File:4;	/**< One of the PROGRAM_* register file values. */
-   GLint Index:9;	/**< May be negative for relative addressing. */
-   GLuint Swizzle:12;
-   GLuint RelAddr:1;
-
-   /**
-    * \name Source register "sign" control.
-    *
-    * The ARB and NV extensions allow varrying degrees of control over the
-    * sign of the source vector components.  These values allow enough control
-    * for all flavors of the extensions.
-    */
-   /*@{*/
-   /**
-    * Per-component negation for the SWZ instruction.  For non-SWZ
-    * instructions the only possible values are NEGATE_XYZW and NEGATE_NONE.
-    *
-    * \since
-    * ARB_vertex_program, ARB_fragment_program
-    */
-   GLuint NegateBase:4;
-
-   /**
-    * Take the component-wise absolute value.
-    *
-    * \since
-    * NV_fragment_program, NV_fragment_program_option, NV_vertex_program2,
-    * NV_vertex_program2_option.
-    */
-   GLuint Abs:1;
-
-   /**
-    * Post-absolute value negation (all components).
-    */
-   GLuint NegateAbs:1;
-   /*@}*/
-};
-
-
-/**
- * Instruction destination register.
- */
-struct prog_dst_register
-{
-   /**
-    * One of the PROGRAM_* register file values.
-    */
-   GLuint File:4;
-
-   GLuint Index:8;
-   GLuint WriteMask:4;
-
-   /**
-    * \name Conditional destination update control.
-    *
-    * \since
-    * NV_fragment_program, NV_fragment_program_option, NV_vertex_program2,
-    * NV_vertex_program2_option.
-    */
-   /*@{*/
-   /**
-    * Takes one of the 9 possible condition values (EQ, FL, GT, GE, LE, LT,
-    * NE, TR, or UN).  Destination update is enabled if the matching
-    * (swizzled) condition code value passes.  When a conditional update mask
-    * is not specified, this will be \c COND_TR.
-    */
-   GLuint CondMask:4;
-
-   /**
-    * Condition code swizzle value.
-    */
-   GLuint CondSwizzle:12;
-   
-   /**
-    * Selects the condition code register to use for conditional destination
-    * update masking.  In NV_fragmnet_program or NV_vertex_program2 mode, only
-    * condition code register 0 is available.  In NV_vertex_program3 mode, 
-    * condition code registers 0 and 1 are available.
-    */
-   GLuint CondSrc:1;
-   /*@}*/
-
-   GLuint pad:31;
-};
-
-
-/**
- * Vertex/fragment program instruction.
- */
-struct prog_instruction
-{
-   gl_inst_opcode Opcode;
-#if FEATURE_MESA_program_debug
-   GLshort StringPos;
-#endif
-   /**
-    * Arbitrary data.  Used for the PRINT, CAL, and BRA instructions.
-    */
-   void *Data;
-
-   struct prog_src_register SrcReg[3];
-   struct prog_dst_register DstReg;
-
-   /**
-    * Indicates that the instruction should update the condition code
-    * register.
-    *
-    * \since
-    * NV_fragment_program, NV_fragment_program_option, NV_vertex_program2,
-    * NV_vertex_program2_option.
-    */
-   GLuint CondUpdate:1;
-
-   /**
-    * If prog_instruction::CondUpdate is \c GL_TRUE, this value selects the
-    * condition code register that is to be updated.
-    *
-    * In GL_NV_fragment_program or GL_NV_vertex_program2 mode, only condition
-    * code register 0 is available.  In GL_NV_vertex_program3 mode, condition
-    * code registers 0 and 1 are available.
-    *
-    * \since
-    * NV_fragment_program, NV_fragment_program_option, NV_vertex_program2,
-    * NV_vertex_program2_option.
-    */
-   GLuint CondDst:1;
-
-   /**
-    * Saturate each value of the vectored result to the range [0,1] or the
-    * range [-1,1].  \c SSAT mode (i.e., saturation to the range [-1,1]) is
-    * only available in NV_fragment_program2 mode.
-    * Value is one of the SATURATE_* tokens.
-    *
-    * \since
-    * NV_fragment_program, NV_fragment_program_option, NV_vertex_program3.
-    */
-   GLuint SaturateMode:2;
-   
-   /**
-    * Per-instruction selectable precision.
-    *
-    * \since
-    * NV_fragment_program, NV_fragment_program_option.
-    */
-   GLuint Precision:3;
-
-   /**
-    * \name Texture source controls.
-    * 
-    * The texture source controls are only used with the \c TEX, \c TXD,
-    * \c TXL, and \c TXP instructions.
-    *
-    * \since
-    * ARB_fragment_program, NV_fragment_program, NV_vertex_program3.
-    */
-   /*@{*/
-   /**
-    * Source texture unit.  OpenGL supports a maximum of 32 texture
-    * units.
-    */
-   GLuint TexSrcUnit:5;
-   
-   /**
-    * Source texture target, one of TEXTURE_{1D,2D,3D,CUBE,RECT}_INDEX.
-    */
-   GLuint TexSrcTarget:3;
-   /*@}*/
-
-   /**
-    * For BRA and CAL instructions, the location to jump to.
-    */
-   GLuint BranchTarget;
-
-   const char *Comment;
-};
-
-
-extern void
-_mesa_init_instructions(struct prog_instruction *inst, GLuint count);
-
-extern GLuint
-_mesa_num_inst_src_regs(gl_inst_opcode opcode);
-
-extern const char *
-_mesa_opcode_string(gl_inst_opcode opcode);
-
-
-#endif /* PROG_INSTRUCTION_H */
diff --git a/src/mesa/swrast/s_nvfragprog.c b/src/mesa/swrast/s_nvfragprog.c
deleted file mode 100644
index ac2f5d93b6..0000000000
--- a/src/mesa/swrast/s_nvfragprog.c
+++ /dev/null
@@ -1,1692 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.2
- *
- * Copyright (C) 1999-2006  Brian Paul   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.
- */
-
-/*
- * Regarding GL_NV_fragment_program:
- *
- * Portions of this software may use or implement intellectual
- * property owned and licensed by NVIDIA Corporation. NVIDIA disclaims
- * any and all warranties with respect to such intellectual property,
- * including any use thereof or modifications thereto.
- */
-
-#include "glheader.h"
-#include "colormac.h"
-#include "context.h"
-#include "prog_instruction.h"
-#include "prog_parameter.h"
-#include "prog_print.h"
-#include "program.h"
-
-#include "s_nvfragprog.h"
-#include "s_span.h"
-
-
-/* See comments below for info about this */
-#define LAMBDA_ZERO 1
-
-/* debug predicate */
-#define DEBUG_FRAG 0
-
-
-/**
- * Virtual machine state used during execution of a fragment programs.
- */
-struct fp_machine
-{
-   GLfloat Temporaries[MAX_PROGRAM_TEMPS][4];
-   GLfloat Inputs[FRAG_ATTRIB_MAX][4];
-   GLfloat Outputs[FRAG_RESULT_MAX][4];
-   GLuint CondCodes[4];  /**< COND_* value for x/y/z/w */
-
-   GLuint CallStack[MAX_PROGRAM_CALL_DEPTH]; /**< For CAL/RET instructions */
-   GLuint StackDepth; /**< Index/ptr to top of CallStack[] */
-};
-
-
-#if FEATURE_MESA_program_debug
-static struct fp_machine *CurrentMachine = NULL;
-
-/**
- * For GL_MESA_program_debug.
- * Return current value (4*GLfloat) of a fragment program register.
- * Called via ctx->Driver.GetFragmentProgramRegister().
- */
-void
-_swrast_get_program_register(GLcontext *ctx, enum register_file file,
-                             GLuint index, GLfloat val[4])
-{
-   if (CurrentMachine) {
-      switch (file) {
-      case PROGRAM_INPUT:
-         COPY_4V(val, CurrentMachine->Inputs[index]);
-         break;
-      case PROGRAM_OUTPUT:
-         COPY_4V(val, CurrentMachine->Outputs[index]);
-         break;
-      case PROGRAM_TEMPORARY:
-         COPY_4V(val, CurrentMachine->Temporaries[index]);
-         break;
-      default:
-         _mesa_problem(NULL,
-                       "bad register file in _swrast_get_program_register");
-      }
-   }
-}
-#endif /* FEATURE_MESA_program_debug */
-
-
-/**
- * Fetch a texel.
- */
-static void
-fetch_texel( GLcontext *ctx, const GLfloat texcoord[4], GLfloat lambda,
-             GLuint unit, GLfloat color[4] )
-{
-   GLchan rgba[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, &rgba);
-   color[0] = CHAN_TO_FLOAT(rgba[0]);
-   color[1] = CHAN_TO_FLOAT(rgba[1]);
-   color[2] = CHAN_TO_FLOAT(rgba[2]);
-   color[3] = CHAN_TO_FLOAT(rgba[3]);
-}
-
-
-/**
- * Fetch a texel with the given partial derivatives to compute a level
- * of detail in the mipmap.
- */
-static void
-fetch_texel_deriv( GLcontext *ctx, const GLfloat texcoord[4],
-                   const GLfloat texdx[4], const GLfloat texdy[4],
-                   GLuint unit, GLfloat color[4] )
-{
-   SWcontext *swrast = SWRAST_CONTEXT(ctx);
-   const struct gl_texture_object *texObj = ctx->Texture.Unit[unit]._Current;
-   const struct gl_texture_image *texImg = texObj->Image[0][texObj->BaseLevel];
-   const GLfloat texW = (GLfloat) texImg->WidthScale;
-   const GLfloat texH = (GLfloat) texImg->HeightScale;
-   GLchan rgba[4];
-
-   GLfloat lambda = _swrast_compute_lambda(texdx[0], texdy[0], /* ds/dx, ds/dy */
-                                         texdx[1], texdy[1], /* dt/dx, dt/dy */
-                                         texdx[3], texdy[2], /* dq/dx, dq/dy */
-                                         texW, texH,
-                                         texcoord[0], texcoord[1], texcoord[3],
-                                         1.0F / texcoord[3]);
-
-   swrast->TextureSample[unit](ctx, ctx->Texture.Unit[unit]._Current,
-                               1, (const GLfloat (*)[4]) texcoord,
-                               &lambda, &rgba);
-   color[0] = CHAN_TO_FLOAT(rgba[0]);
-   color[1] = CHAN_TO_FLOAT(rgba[1]);
-   color[2] = CHAN_TO_FLOAT(rgba[2]);
-   color[3] = CHAN_TO_FLOAT(rgba[3]);
-}
-
-
-/**
- * Return a pointer to the 4-element float vector specified by the given
- * source register.
- */
-static INLINE const GLfloat *
-get_register_pointer( GLcontext *ctx,
-                      const struct prog_src_register *source,
-                      const struct fp_machine *machine,
-                      const struct gl_fragment_program *program )
-{
-   switch (source->File) {
-   case PROGRAM_TEMPORARY:
-      ASSERT(source->Index < MAX_PROGRAM_TEMPS);
-      return machine->Temporaries[source->Index];
-   case PROGRAM_INPUT:
-      ASSERT(source->Index < FRAG_ATTRIB_MAX);
-      return machine->Inputs[source->Index];
-   case PROGRAM_OUTPUT:
-      /* This is only for PRINT */
-      ASSERT(source->Index < FRAG_RESULT_MAX);
-      return machine->Outputs[source->Index];
-   case PROGRAM_LOCAL_PARAM:
-      ASSERT(source->Index < MAX_PROGRAM_LOCAL_PARAMS);
-      return program->Base.LocalParams[source->Index];
-   case PROGRAM_ENV_PARAM:
-      ASSERT(source->Index < MAX_NV_FRAGMENT_PROGRAM_PARAMS);
-      return ctx->FragmentProgram.Parameters[source->Index];
-   case PROGRAM_STATE_VAR:
-      /* Fallthrough */
-   case PROGRAM_CONSTANT:
-      /* Fallthrough */
-   case PROGRAM_UNIFORM:
-      /* Fallthrough */
-   case PROGRAM_NAMED_PARAM:
-      ASSERT(source->Index < (GLint) program->Base.Parameters->NumParameters);
-      return program->Base.Parameters->ParameterValues[source->Index];
-   default:
-      _mesa_problem(ctx, "Invalid input register file %d in fp "
-                    "get_register_pointer", source->File);
-      return NULL;
-   }
-}
-
-
-/**
- * Fetch a 4-element float vector from the given source register.
- * Apply swizzling and negating as needed.
- */
-static void
-fetch_vector4( GLcontext *ctx,
-               const struct prog_src_register *source,
-               const struct fp_machine *machine,
-               const struct gl_fragment_program *program,
-               GLfloat result[4] )
-{
-   const GLfloat *src = get_register_pointer(ctx, source, machine, program);
-   ASSERT(src);
-
-   if (source->Swizzle == MAKE_SWIZZLE4(SWIZZLE_X, SWIZZLE_Y,
-                                        SWIZZLE_Z, SWIZZLE_W)) {
-      /* no swizzling */
-      COPY_4V(result, src);
-   }
-   else {
-      result[0] = src[GET_SWZ(source->Swizzle, 0)];
-      result[1] = src[GET_SWZ(source->Swizzle, 1)];
-      result[2] = src[GET_SWZ(source->Swizzle, 2)];
-      result[3] = src[GET_SWZ(source->Swizzle, 3)];
-   }
-
-   if (source->NegateBase) {
-      result[0] = -result[0];
-      result[1] = -result[1];
-      result[2] = -result[2];
-      result[3] = -result[3];
-   }
-   if (source->Abs) {
-      result[0] = FABSF(result[0]);
-      result[1] = FABSF(result[1]);
-      result[2] = FABSF(result[2]);
-      result[3] = FABSF(result[3]);
-   }
-   if (source->NegateAbs) {
-      result[0] = -result[0];
-      result[1] = -result[1];
-      result[2] = -result[2];
-      result[3] = -result[3];
-   }
-}
-
-
-/**
- * Fetch the derivative with respect to X for the given register.
- * \return GL_TRUE if it was easily computed or GL_FALSE if we
- * need to execute another instance of the program (ugh)!
- */
-static GLboolean
-fetch_vector4_deriv( GLcontext *ctx,
-                     const struct prog_src_register *source,
-                     const SWspan *span,
-                     char xOrY, GLint column, GLfloat result[4] )
-{
-   GLfloat src[4];
-
-   ASSERT(xOrY == 'X' || xOrY == 'Y');
-
-   switch (source->Index) {
-   case FRAG_ATTRIB_WPOS:
-      if (xOrY == 'X') {
-         src[0] = 1.0;
-         src[1] = 0.0;
-         src[2] = span->dzdx / ctx->DrawBuffer->_DepthMaxF;
-         src[3] = span->dwdx;
-      }
-      else {
-         src[0] = 0.0;
-         src[1] = 1.0;
-         src[2] = span->dzdy / ctx->DrawBuffer->_DepthMaxF;
-         src[3] = span->dwdy;
-      }
-      break;
-   case FRAG_ATTRIB_COL0:
-      if (xOrY == 'X') {
-         src[0] = span->drdx * (1.0F / CHAN_MAXF);
-         src[1] = span->dgdx * (1.0F / CHAN_MAXF);
-         src[2] = span->dbdx * (1.0F / CHAN_MAXF);
-         src[3] = span->dadx * (1.0F / CHAN_MAXF);
-      }
-      else {
-         src[0] = span->drdy * (1.0F / CHAN_MAXF);
-         src[1] = span->dgdy * (1.0F / CHAN_MAXF);
-         src[2] = span->dbdy * (1.0F / CHAN_MAXF);
-         src[3] = span->dady * (1.0F / CHAN_MAXF);
-      }
-      break;
-   case FRAG_ATTRIB_COL1:
-      if (xOrY == 'X') {
-         src[0] = span->dsrdx * (1.0F / CHAN_MAXF);
-         src[1] = span->dsgdx * (1.0F / CHAN_MAXF);
-         src[2] = span->dsbdx * (1.0F / CHAN_MAXF);
-         src[3] = 0.0; /* XXX need this */
-      }
-      else {
-         src[0] = span->dsrdy * (1.0F / CHAN_MAXF);
-         src[1] = span->dsgdy * (1.0F / CHAN_MAXF);
-         src[2] = span->dsbdy * (1.0F / CHAN_MAXF);
-         src[3] = 0.0; /* XXX need this */
-      }
-      break;
-   case FRAG_ATTRIB_FOGC:
-      if (xOrY == 'X') {
-         src[0] = span->dfogdx;
-         src[1] = 0.0;
-         src[2] = 0.0;
-         src[3] = 0.0;
-      }
-      else {
-         src[0] = span->dfogdy;
-         src[1] = 0.0;
-         src[2] = 0.0;
-         src[3] = 0.0;
-      }
-      break;
-   case FRAG_ATTRIB_TEX0:
-   case FRAG_ATTRIB_TEX1:
-   case FRAG_ATTRIB_TEX2:
-   case FRAG_ATTRIB_TEX3:
-   case FRAG_ATTRIB_TEX4:
-   case FRAG_ATTRIB_TEX5:
-   case FRAG_ATTRIB_TEX6:
-   case FRAG_ATTRIB_TEX7:
-      if (xOrY == 'X') {
-         const GLuint u = source->Index - FRAG_ATTRIB_TEX0;
-         /* this is a little tricky - I think I've got it right */
-         const GLfloat invQ = 1.0f / (span->tex[u][3]
-                                      + span->texStepX[u][3] * column);
-         src[0] = span->texStepX[u][0] * invQ;
-         src[1] = span->texStepX[u][1] * invQ;
-         src[2] = span->texStepX[u][2] * invQ;
-         src[3] = span->texStepX[u][3] * invQ;
-      }
-      else {
-         const GLuint u = source->Index - FRAG_ATTRIB_TEX0;
-         /* Tricky, as above, but in Y direction */
-         const GLfloat invQ = 1.0f / (span->tex[u][3] + span->texStepY[u][3]);
-         src[0] = span->texStepY[u][0] * invQ;
-         src[1] = span->texStepY[u][1] * invQ;
-         src[2] = span->texStepY[u][2] * invQ;
-         src[3] = span->texStepY[u][3] * invQ;
-      }
-      break;
-   default:
-      return GL_FALSE;
-   }
-
-   result[0] = src[GET_SWZ(source->Swizzle, 0)];
-   result[1] = src[GET_SWZ(source->Swizzle, 1)];
-   result[2] = src[GET_SWZ(source->Swizzle, 2)];
-   result[3] = src[GET_SWZ(source->Swizzle, 3)];
-
-   if (source->NegateBase) {
-      result[0] = -result[0];
-      result[1] = -result[1];
-      result[2] = -result[2];
-      result[3] = -result[3];
-   }
-   if (source->Abs) {
-      result[0] = FABSF(result[0]);
-      result[1] = FABSF(result[1]);
-      result[2] = FABSF(result[2]);
-      result[3] = FABSF(result[3]);
-   }
-   if (source->NegateAbs) {
-      result[0] = -result[0];
-      result[1] = -result[1];
-      result[2] = -result[2];
-      result[3] = -result[3];
-   }
-   return GL_TRUE;
-}
-
-
-/**
- * As above, but only return result[0] element.
- */
-static void
-fetch_vector1( GLcontext *ctx,
-               const struct prog_src_register *source,
-               const struct fp_machine *machine,
-               const struct gl_fragment_program *program,
-               GLfloat result[4] )
-{
-   const GLfloat *src = get_register_pointer(ctx, source, machine, program);
-   ASSERT(src);
-
-   result[0] = src[GET_SWZ(source->Swizzle, 0)];
-
-   if (source->NegateBase) {
-      result[0] = -result[0];
-   }
-   if (source->Abs) {
-      result[0] = FABSF(result[0]);
-   }
-   if (source->NegateAbs) {
-      result[0] = -result[0];
-   }
-}
-
-
-/**
- * Test value against zero and return GT, LT, EQ or UN if NaN.
- */
-static INLINE GLuint
-generate_cc( float value )
-{
-   if (value != value)
-      return COND_UN;  /* NaN */
-   if (value > 0.0F)
-      return COND_GT;
-   if (value < 0.0F)
-      return COND_LT;
-   return COND_EQ;
-}
-
-
-/**
- * Test if the ccMaskRule is satisfied by the given condition code.
- * Used to mask destination writes according to the current condition code.
- */
-static INLINE GLboolean
-test_cc(GLuint condCode, GLuint ccMaskRule)
-{
-   switch (ccMaskRule) {
-   case COND_EQ: return (condCode == COND_EQ);
-   case COND_NE: return (condCode != COND_EQ);
-   case COND_LT: return (condCode == COND_LT);
-   case COND_GE: return (condCode == COND_GT || condCode == COND_EQ);
-   case COND_LE: return (condCode == COND_LT || condCode == COND_EQ);
-   case COND_GT: return (condCode == COND_GT);
-   case COND_TR: return GL_TRUE;
-   case COND_FL: return GL_FALSE;
-   default:      return GL_TRUE;
-   }
-}
-
-
-/**
- * Store 4 floats into a register.  Observe the instructions saturate and
- * set-condition-code flags.
- */
-static void
-store_vector4( const struct prog_instruction *inst,
-               struct fp_machine *machine,
-               const GLfloat value[4] )
-{
-   const struct prog_dst_register *dest = &(inst->DstReg);
-   const GLboolean clamp = inst->SaturateMode == SATURATE_ZERO_ONE;
-   GLfloat *dstReg;
-   GLfloat dummyReg[4];
-   GLfloat clampedValue[4];
-   GLuint writeMask = dest->WriteMask;
-
-   switch (dest->File) {
-      case PROGRAM_OUTPUT:
-         dstReg = machine->Outputs[dest->Index];
-         break;
-      case PROGRAM_TEMPORARY:
-         dstReg = machine->Temporaries[dest->Index];
-         break;
-      case PROGRAM_WRITE_ONLY:
-         dstReg = dummyReg;
-         return;
-      default:
-         _mesa_problem(NULL, "bad register file in store_vector4(fp)");
-         return;
-   }
-
-#if 0
-   if (value[0] > 1.0e10 ||
-       IS_INF_OR_NAN(value[0]) ||
-       IS_INF_OR_NAN(value[1]) ||
-       IS_INF_OR_NAN(value[2]) ||
-       IS_INF_OR_NAN(value[3])  )
-      printf("store %g %g %g %g\n", value[0], value[1], value[2], value[3]);
-#endif
-
-   if (clamp) {
-      clampedValue[0] = CLAMP(value[0], 0.0F, 1.0F);
-      clampedValue[1] = CLAMP(value[1], 0.0F, 1.0F);
-      clampedValue[2] = CLAMP(value[2], 0.0F, 1.0F);
-      clampedValue[3] = CLAMP(value[3], 0.0F, 1.0F);
-      value = clampedValue;
-   }
-
-   if (dest->CondMask != COND_TR) {
-      /* condition codes may turn off some writes */
-      if (writeMask & WRITEMASK_X) {
-         if (!test_cc(machine->CondCodes[GET_SWZ(dest->CondSwizzle, 0)],
-                      dest->CondMask))
-            writeMask &= ~WRITEMASK_X;
-      }
-      if (writeMask & WRITEMASK_Y) {
-         if (!test_cc(machine->CondCodes[GET_SWZ(dest->CondSwizzle, 1)],
-                      dest->CondMask))
-            writeMask &= ~WRITEMASK_Y;
-      }
-      if (writeMask & WRITEMASK_Z) {
-         if (!test_cc(machine->CondCodes[GET_SWZ(dest->CondSwizzle, 2)],
-                      dest->CondMask))
-            writeMask &= ~WRITEMASK_Z;
-      }
-      if (writeMask & WRITEMASK_W) {
-         if (!test_cc(machine->CondCodes[GET_SWZ(dest->CondSwizzle, 3)],
-                      dest->CondMask))
-            writeMask &= ~WRITEMASK_W;
-      }
-   }
-
-   if (writeMask & WRITEMASK_X)
-      dstReg[0] = value[0];
-   if (writeMask & WRITEMASK_Y)
-      dstReg[1] = value[1];
-   if (writeMask & WRITEMASK_Z)
-      dstReg[2] = value[2];
-   if (writeMask & WRITEMASK_W)
-      dstReg[3] = value[3];
-
-   if (inst->CondUpdate) {
-      if (writeMask & WRITEMASK_X)
-         machine->CondCodes[0] = generate_cc(value[0]);
-      if (writeMask & WRITEMASK_Y)
-         machine->CondCodes[1] = generate_cc(value[1]);
-      if (writeMask & WRITEMASK_Z)
-         machine->CondCodes[2] = generate_cc(value[2]);
-      if (writeMask & WRITEMASK_W)
-         machine->CondCodes[3] = generate_cc(value[3]);
-   }
-}
-
-
-/**
- * Initialize a new machine state instance from an existing one, adding
- * the partial derivatives onto the input registers.
- * Used to implement DDX and DDY instructions in non-trivial cases.
- */
-static void
-init_machine_deriv( GLcontext *ctx,
-                    const struct fp_machine *machine,
-                    const struct gl_fragment_program *program,
-                    const SWspan *span, char xOrY,
-                    struct fp_machine *dMachine )
-{
-   GLuint u, v;
-
-   ASSERT(xOrY == 'X' || xOrY == 'Y');
-
-   /* copy existing machine */
-   _mesa_memcpy(dMachine, machine, sizeof(struct fp_machine));
-
-   if (program->Base.Target == GL_FRAGMENT_PROGRAM_NV) {
-      /* Clear temporary registers (undefined for ARB_f_p) */
-      _mesa_bzero( (void*) machine->Temporaries,
-                   MAX_NV_FRAGMENT_PROGRAM_TEMPS * 4 * sizeof(GLfloat));
-   }
-
-   /* Add derivatives */
-   if (program->Base.InputsRead & (1 << FRAG_ATTRIB_WPOS)) {
-      GLfloat *wpos = (GLfloat*) machine->Inputs[FRAG_ATTRIB_WPOS];
-      if (xOrY == 'X') {
-         wpos[0] += 1.0F;
-         wpos[1] += 0.0F;
-         wpos[2] += span->dzdx;
-         wpos[3] += span->dwdx;
-      }
-      else {
-         wpos[0] += 0.0F;
-         wpos[1] += 1.0F;
-         wpos[2] += span->dzdy;
-         wpos[3] += span->dwdy;
-      }
-   }
-   if (program->Base.InputsRead & (1 << FRAG_ATTRIB_COL0)) {
-      GLfloat *col0 = (GLfloat*) machine->Inputs[FRAG_ATTRIB_COL0];
-      if (xOrY == 'X') {
-         col0[0] += span->drdx * (1.0F / CHAN_MAXF);
-         col0[1] += span->dgdx * (1.0F / CHAN_MAXF);
-         col0[2] += span->dbdx * (1.0F / CHAN_MAXF);
-         col0[3] += span->dadx * (1.0F / CHAN_MAXF);
-      }
-      else {
-         col0[0] += span->drdy * (1.0F / CHAN_MAXF);
-         col0[1] += span->dgdy * (1.0F / CHAN_MAXF);
-         col0[2] += span->dbdy * (1.0F / CHAN_MAXF);
-         col0[3] += span->dady * (1.0F / CHAN_MAXF);
-      }
-   }
-   if (program->Base.InputsRead & (1 << FRAG_ATTRIB_COL1)) {
-      GLfloat *col1 = (GLfloat*) machine->Inputs[FRAG_ATTRIB_COL1];
-      if (xOrY == 'X') {
-         col1[0] += span->dsrdx * (1.0F / CHAN_MAXF);
-         col1[1] += span->dsgdx * (1.0F / CHAN_MAXF);
-         col1[2] += span->dsbdx * (1.0F / CHAN_MAXF);
-         col1[3] += 0.0; /*XXX fix */
-      }
-      else {
-         col1[0] += span->dsrdy * (1.0F / CHAN_MAXF);
-         col1[1] += span->dsgdy * (1.0F / CHAN_MAXF);
-         col1[2] += span->dsbdy * (1.0F / CHAN_MAXF);
-         col1[3] += 0.0; /*XXX fix */
-      }
-   }
-   if (program->Base.InputsRead & (1 << FRAG_ATTRIB_FOGC)) {
-      GLfloat *fogc = (GLfloat*) machine->Inputs[FRAG_ATTRIB_FOGC];
-      if (xOrY == 'X') {
-         fogc[0] += span->dfogdx;
-      }
-      else {
-         fogc[0] += span->dfogdy;
-      }
-   }
-   for (u = 0; u < ctx->Const.MaxTextureCoordUnits; u++) {
-      if (program->Base.InputsRead & (1 << (FRAG_ATTRIB_TEX0 + u))) {
-         GLfloat *tex = (GLfloat*) machine->Inputs[FRAG_ATTRIB_TEX0 + u];
-         /* XXX perspective-correct interpolation */
-         if (xOrY == 'X') {
-            tex[0] += span->texStepX[u][0];
-            tex[1] += span->texStepX[u][1];
-            tex[2] += span->texStepX[u][2];
-            tex[3] += span->texStepX[u][3];
-         }
-         else {
-            tex[0] += span->texStepY[u][0];
-            tex[1] += span->texStepY[u][1];
-            tex[2] += span->texStepY[u][2];
-            tex[3] += span->texStepY[u][3];
-         }
-      }
-   }
-
-   for (v = 0; v < ctx->Const.MaxVarying; v++) {
-      if (program->Base.InputsRead & (1 << (FRAG_ATTRIB_VAR0 + v))) {
-         GLfloat *var = (GLfloat*) machine->Inputs[FRAG_ATTRIB_VAR0 + v];
-         /* XXXX finish this */
-         var[0] += span->varStepX[v][0];
-         var[1] += span->varStepX[v][1];
-         var[2] += span->varStepX[v][2];
-         var[3] += span->varStepX[v][3];
-      }
-   }
-
-   /* init condition codes */
-   dMachine->CondCodes[0] = COND_EQ;
-   dMachine->CondCodes[1] = COND_EQ;
-   dMachine->CondCodes[2] = COND_EQ;
-   dMachine->CondCodes[3] = COND_EQ;
-}
-
-
-/**
- * Execute the given vertex program.
- * NOTE: we do everything in single-precision floating point; we don't
- * currently observe the single/half/fixed-precision qualifiers.
- * \param ctx - rendering context
- * \param program - the fragment program to execute
- * \param machine - machine state (register file)
- * \param maxInst - max number of instructions to execute
- * \return GL_TRUE if program completed or GL_FALSE if program executed KIL.
- */
-static GLboolean
-execute_program( GLcontext *ctx,
-                 const struct gl_fragment_program *program, GLuint maxInst,
-                 struct fp_machine *machine, const SWspan *span,
-                 GLuint column )
-{
-   GLuint pc;
-
-   if (DEBUG_FRAG) {
-      printf("execute fragment program --------------------\n");
-   }
-
-   for (pc = 0; pc < maxInst; pc++) {
-      const struct prog_instruction *inst = program->Base.Instructions + pc;
-
-      if (ctx->FragmentProgram.CallbackEnabled &&
-          ctx->FragmentProgram.Callback) {
-         ctx->FragmentProgram.CurrentPosition = inst->StringPos;
-         ctx->FragmentProgram.Callback(program->Base.Target,
-                                       ctx->FragmentProgram.CallbackData);
-      }
-
-      if (DEBUG_FRAG) {
-         _mesa_print_instruction(inst);
-      }
-
-      switch (inst->Opcode) {
-         case OPCODE_ABS:
-            {
-               GLfloat a[4], result[4];
-               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
-               result[0] = FABSF(a[0]);
-               result[1] = FABSF(a[1]);
-               result[2] = FABSF(a[2]);
-               result[3] = FABSF(a[3]);
-               store_vector4( inst, machine, result );
-            }
-            break;
-         case OPCODE_ADD:
-            {
-               GLfloat a[4], b[4], result[4];
-               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
-               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
-               result[0] = a[0] + b[0];
-               result[1] = a[1] + b[1];
-               result[2] = a[2] + b[2];
-               result[3] = a[3] + b[3];
-               store_vector4( inst, machine, result );
-               if (DEBUG_FRAG) {
-                  printf("ADD (%g %g %g %g) = (%g %g %g %g) + (%g %g %g %g)\n",
-                         result[0], result[1], result[2], result[3], 
-                         a[0], a[1], a[2], a[3],
-                         b[0], b[1], b[2], b[3]);
-               }
-            }
-            break;
-         case OPCODE_BRA: /* conditional branch */
-            {
-               /* NOTE: The return is conditional! */
-               const GLuint swizzle = inst->DstReg.CondSwizzle;
-               const GLuint condMask = inst->DstReg.CondMask;
-               if (test_cc(machine->CondCodes[GET_SWZ(swizzle, 0)], condMask) ||
-                   test_cc(machine->CondCodes[GET_SWZ(swizzle, 1)], condMask) ||
-                   test_cc(machine->CondCodes[GET_SWZ(swizzle, 2)], condMask) ||
-                   test_cc(machine->CondCodes[GET_SWZ(swizzle, 3)], condMask)) {
-                  /* take branch */
-                  pc = inst->BranchTarget;
-               }
-            }
-            break;
-         case OPCODE_CAL: /* Call subroutine */
-            {
-               /* NOTE: The call is conditional! */
-               const GLuint swizzle = inst->DstReg.CondSwizzle;
-               const GLuint condMask = inst->DstReg.CondMask;
-               if (test_cc(machine->CondCodes[GET_SWZ(swizzle, 0)], condMask) ||
-                   test_cc(machine->CondCodes[GET_SWZ(swizzle, 1)], condMask) ||
-                   test_cc(machine->CondCodes[GET_SWZ(swizzle, 2)], condMask) ||
-                   test_cc(machine->CondCodes[GET_SWZ(swizzle, 3)], condMask)) {
-                  if (machine->StackDepth >= MAX_PROGRAM_CALL_DEPTH) {
-                     return GL_TRUE; /* Per GL_NV_vertex_program2 spec */
-                  }
-                  machine->CallStack[machine->StackDepth++] = pc + 1;
-                  pc = inst->BranchTarget;
-               }
-            }
-            break;
-         case OPCODE_CMP:
-            {
-               GLfloat a[4], b[4], c[4], result[4];
-               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
-               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
-               fetch_vector4( ctx, &inst->SrcReg[2], machine, program, c );
-               result[0] = a[0] < 0.0F ? b[0] : c[0];
-               result[1] = a[1] < 0.0F ? b[1] : c[1];
-               result[2] = a[2] < 0.0F ? b[2] : c[2];
-               result[3] = a[3] < 0.0F ? b[3] : c[3];
-               store_vector4( inst, machine, result );
-            }
-            break;
-         case OPCODE_COS:
-            {
-               GLfloat a[4], result[4];
-               fetch_vector1( ctx, &inst->SrcReg[0], machine, program, a );
-               result[0] = result[1] = result[2] = result[3]
-                  = (GLfloat) _mesa_cos(a[0]);
-               store_vector4( inst, machine, result );
-            }
-            break;
-         case OPCODE_DDX: /* Partial derivative with respect to X */
-            {
-               GLfloat a[4], aNext[4], result[4];
-               struct fp_machine dMachine;
-               if (!fetch_vector4_deriv(ctx, &inst->SrcReg[0], span, 'X',
-                                        column, result)) {
-                  /* This is tricky.  Make a copy of the current machine state,
-                   * increment the input registers by the dx or dy partial
-                   * derivatives, then re-execute the program up to the
-                   * preceeding instruction, then fetch the source register.
-                   * Finally, find the difference in the register values for
-                   * the original and derivative runs.
-                   */
-                  fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a);
-                  init_machine_deriv(ctx, machine, program, span,
-                                     'X', &dMachine);
-                  execute_program(ctx, program, pc, &dMachine, span, column);
-                  fetch_vector4( ctx, &inst->SrcReg[0], &dMachine, program, aNext );
-                  result[0] = aNext[0] - a[0];
-                  result[1] = aNext[1] - a[1];
-                  result[2] = aNext[2] - a[2];
-                  result[3] = aNext[3] - a[3];
-               }
-               store_vector4( inst, machine, result );
-            }
-            break;
-         case OPCODE_DDY: /* Partial derivative with respect to Y */
-            {
-               GLfloat a[4], aNext[4], result[4];
-               struct fp_machine dMachine;
-               if (!fetch_vector4_deriv(ctx, &inst->SrcReg[0], span, 'Y',
-                                        column, result)) {
-                  init_machine_deriv(ctx, machine, program, span,
-                                     'Y', &dMachine);
-                  fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a);
-                  execute_program(ctx, program, pc, &dMachine, span, column);
-                  fetch_vector4( ctx, &inst->SrcReg[0], &dMachine, program, aNext );
-                  result[0] = aNext[0] - a[0];
-                  result[1] = aNext[1] - a[1];
-                  result[2] = aNext[2] - a[2];
-                  result[3] = aNext[3] - a[3];
-               }
-               store_vector4( inst, machine, result );
-            }
-            break;
-         case OPCODE_DP3:
-            {
-               GLfloat a[4], b[4], result[4];
-               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
-               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
-               result[0] = result[1] = result[2] = result[3] = DOT3(a, b);
-               store_vector4( inst, machine, result );
-               if (DEBUG_FRAG) {
-                  printf("DP3 %g = (%g %g %g) . (%g %g %g)\n",
-                         result[0], a[0], a[1], a[2], b[0], b[1], b[2]);
-               }
-            }
-            break;
-         case OPCODE_DP4:
-            {
-               GLfloat a[4], b[4], result[4];
-               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
-               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
-               result[0] = result[1] = result[2] = result[3] = DOT4(a,b);
-               store_vector4( inst, machine, result );
-               if (DEBUG_FRAG) {
-                  printf("DP4 %g = (%g, %g %g %g) . (%g, %g %g %g)\n",
-                         result[0], a[0], a[1], a[2], a[3],
-                         b[0], b[1], b[2], b[3]);
-               }
-            }
-            break;
-         case OPCODE_DPH:
-            {
-               GLfloat a[4], b[4], result[4];
-               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
-               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
-               result[0] = result[1] = result[2] = result[3] = 
-                  a[0] * b[0] + a[1] * b[1] + a[2] * b[2] + b[3];
-               store_vector4( inst, machine, result );
-            }
-            break;
-         case OPCODE_DST: /* Distance vector */
-            {
-               GLfloat a[4], b[4], result[4];
-               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
-               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
-               result[0] = 1.0F;
-               result[1] = a[1] * b[1];
-               result[2] = a[2];
-               result[3] = b[3];
-               store_vector4( inst, machine, result );
-            }
-            break;
-         case OPCODE_EX2: /* Exponential base 2 */
-            {
-               GLfloat a[4], result[4];
-               fetch_vector1( ctx, &inst->SrcReg[0], machine, program, a );
-               result[0] = result[1] = result[2] = result[3] =
-                  (GLfloat) _mesa_pow(2.0, a[0]);
-               store_vector4( inst, machine, result );
-            }
-            break;
-         case OPCODE_FLR:
-            {
-               GLfloat a[4], result[4];
-               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
-               result[0] = FLOORF(a[0]);
-               result[1] = FLOORF(a[1]);
-               result[2] = FLOORF(a[2]);
-               result[3] = FLOORF(a[3]);
-               store_vector4( inst, machine, result );
-            }
-            break;
-         case OPCODE_FRC:
-            {
-               GLfloat a[4], result[4];
-               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
-               result[0] = a[0] - FLOORF(a[0]);
-               result[1] = a[1] - FLOORF(a[1]);
-               result[2] = a[2] - FLOORF(a[2]);
-               result[3] = a[3] - FLOORF(a[3]);
-               store_vector4( inst, machine, result );
-            }
-            break;
-         case OPCODE_KIL_NV: /* NV_f_p only */
-            {
-               const GLuint swizzle = inst->DstReg.CondSwizzle;
-               const GLuint condMask = inst->DstReg.CondMask;
-               if (test_cc(machine->CondCodes[GET_SWZ(swizzle, 0)], condMask) ||
-                   test_cc(machine->CondCodes[GET_SWZ(swizzle, 1)], condMask) ||
-                   test_cc(machine->CondCodes[GET_SWZ(swizzle, 2)], condMask) ||
-                   test_cc(machine->CondCodes[GET_SWZ(swizzle, 3)], condMask)) {
-                  return GL_FALSE;
-               }
-            }
-            break;
-         case OPCODE_KIL: /* ARB_f_p only */
-            {
-               GLfloat a[4];
-               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
-               if (a[0] < 0.0F || a[1] < 0.0F || a[2] < 0.0F || a[3] < 0.0F) {
-                  return GL_FALSE;
-               }
-            }
-            break;
-         case OPCODE_LG2:  /* log base 2 */
-            {
-               GLfloat a[4], result[4];
-               fetch_vector1( ctx, &inst->SrcReg[0], machine, program, a );
-               result[0] = result[1] = result[2] = result[3] = LOG2(a[0]);
-               store_vector4( inst, machine, result );
-            }
-            break;
-         case OPCODE_LIT:
-            {
-               const GLfloat epsilon = 1.0F / 256.0F; /* from NV VP spec */
-               GLfloat a[4], result[4];
-               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
-               a[0] = MAX2(a[0], 0.0F);
-               a[1] = MAX2(a[1], 0.0F);
-               /* XXX ARB version clamps a[3], NV version doesn't */
-               a[3] = CLAMP(a[3], -(128.0F - epsilon), (128.0F - epsilon));
-               result[0] = 1.0F;
-               result[1] = a[0];
-               /* XXX we could probably just use pow() here */
-               if (a[0] > 0.0F) {
-                  if (a[1] == 0.0 && a[3] == 0.0)
-                     result[2] = 1.0;
-                  else
-                     result[2] = EXPF(a[3] * LOGF(a[1]));
-               }
-               else {
-                  result[2] = 0.0;
-               }
-               result[3] = 1.0F;
-               store_vector4( inst, machine, result );
-               if (DEBUG_FRAG) {
-                  printf("LIT (%g %g %g %g) : (%g %g %g %g)\n",
-                         result[0], result[1], result[2], result[3],
-                         a[0], a[1], a[2], a[3]);
-               }
-            }
-            break;
-         case OPCODE_LRP:
-            {
-               GLfloat a[4], b[4], c[4], result[4];
-               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
-               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
-               fetch_vector4( ctx, &inst->SrcReg[2], machine, program, c );
-               result[0] = a[0] * b[0] + (1.0F - a[0]) * c[0];
-               result[1] = a[1] * b[1] + (1.0F - a[1]) * c[1];
-               result[2] = a[2] * b[2] + (1.0F - a[2]) * c[2];
-               result[3] = a[3] * b[3] + (1.0F - a[3]) * c[3];
-               store_vector4( inst, machine, result );
-               if (DEBUG_FRAG) {
-                  printf("LRP (%g %g %g %g) = (%g %g %g %g), "
-                         "(%g %g %g %g), (%g %g %g %g)\n",
-                         result[0], result[1], result[2], result[3],
-                         a[0], a[1], a[2], a[3],
-                         b[0], b[1], b[2], b[3],
-                         c[0], c[1], c[2], c[3]);
-               }
-            }
-            break;
-         case OPCODE_MAD:
-            {
-               GLfloat a[4], b[4], c[4], result[4];
-               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
-               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
-               fetch_vector4( ctx, &inst->SrcReg[2], machine, program, c );
-               result[0] = a[0] * b[0] + c[0];
-               result[1] = a[1] * b[1] + c[1];
-               result[2] = a[2] * b[2] + c[2];
-               result[3] = a[3] * b[3] + c[3];
-               store_vector4( inst, machine, result );
-               if (DEBUG_FRAG) {
-                  printf("MAD (%g %g %g %g) = (%g %g %g %g) * "
-                         "(%g %g %g %g) + (%g %g %g %g)\n",
-                         result[0], result[1], result[2], result[3],
-                         a[0], a[1], a[2], a[3],
-                         b[0], b[1], b[2], b[3],
-                         c[0], c[1], c[2], c[3]);
-               }
-            }
-            break;
-         case OPCODE_MAX:
-            {
-               GLfloat a[4], b[4], result[4];
-               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
-               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
-               result[0] = MAX2(a[0], b[0]);
-               result[1] = MAX2(a[1], b[1]);
-               result[2] = MAX2(a[2], b[2]);
-               result[3] = MAX2(a[3], b[3]);
-               store_vector4( inst, machine, result );
-               if (DEBUG_FRAG) {
-                  printf("MAX (%g %g %g %g) = (%g %g %g %g), (%g %g %g %g)\n",
-                         result[0], result[1], result[2], result[3], 
-                         a[0], a[1], a[2], a[3],
-                         b[0], b[1], b[2], b[3]);
-               }
-            }
-            break;
-         case OPCODE_MIN:
-            {
-               GLfloat a[4], b[4], result[4];
-               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
-               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
-               result[0] = MIN2(a[0], b[0]);
-               result[1] = MIN2(a[1], b[1]);
-               result[2] = MIN2(a[2], b[2]);
-               result[3] = MIN2(a[3], b[3]);
-               store_vector4( inst, machine, result );
-            }
-            break;
-         case OPCODE_MOV:
-            {
-               GLfloat result[4];
-               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, result );
-               store_vector4( inst, machine, result );
-               if (DEBUG_FRAG) {
-                  printf("MOV (%g %g %g %g)\n",
-                         result[0], result[1], result[2], result[3]);
-               }
-            }
-            break;
-         case OPCODE_MUL:
-            {
-               GLfloat a[4], b[4], result[4];
-               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
-               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
-               result[0] = a[0] * b[0];
-               result[1] = a[1] * b[1];
-               result[2] = a[2] * b[2];
-               result[3] = a[3] * b[3];
-               store_vector4( inst, machine, result );
-               if (DEBUG_FRAG) {
-                  printf("MUL (%g %g %g %g) = (%g %g %g %g) * (%g %g %g %g)\n",
-                         result[0], result[1], result[2], result[3], 
-                         a[0], a[1], a[2], a[3],
-                         b[0], b[1], b[2], b[3]);
-               }
-            }
-            break;
-         case OPCODE_PK2H: /* pack two 16-bit floats in one 32-bit float */
-            {
-               GLfloat a[4], result[4];
-               GLhalfNV hx, hy;
-               GLuint *rawResult = (GLuint *) result;
-               GLuint twoHalves;
-               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
-               hx = _mesa_float_to_half(a[0]);
-               hy = _mesa_float_to_half(a[1]);
-               twoHalves = hx | (hy << 16);
-               rawResult[0] = rawResult[1] = rawResult[2] = rawResult[3]
-                  = twoHalves;
-               store_vector4( inst, machine, result );
-            }
-            break;
-         case OPCODE_PK2US: /* pack two GLushorts into one 32-bit float */
-            {
-               GLfloat a[4], result[4];
-               GLuint usx, usy, *rawResult = (GLuint *) result;
-               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
-               a[0] = CLAMP(a[0], 0.0F, 1.0F);
-               a[1] = CLAMP(a[1], 0.0F, 1.0F);
-               usx = IROUND(a[0] * 65535.0F);
-               usy = IROUND(a[1] * 65535.0F);
-               rawResult[0] = rawResult[1] = rawResult[2] = rawResult[3]
-                  = usx | (usy << 16);
-               store_vector4( inst, machine, result );
-            }
-            break;
-         case OPCODE_PK4B: /* pack four GLbytes into one 32-bit float */
-            {
-               GLfloat a[4], result[4];
-               GLuint ubx, uby, ubz, ubw, *rawResult = (GLuint *) result;
-               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
-               a[0] = CLAMP(a[0], -128.0F / 127.0F, 1.0F);
-               a[1] = CLAMP(a[1], -128.0F / 127.0F, 1.0F);
-               a[2] = CLAMP(a[2], -128.0F / 127.0F, 1.0F);
-               a[3] = CLAMP(a[3], -128.0F / 127.0F, 1.0F);
-               ubx = IROUND(127.0F * a[0] + 128.0F);
-               uby = IROUND(127.0F * a[1] + 128.0F);
-               ubz = IROUND(127.0F * a[2] + 128.0F);
-               ubw = IROUND(127.0F * a[3] + 128.0F);
-               rawResult[0] = rawResult[1] = rawResult[2] = rawResult[3]
-                  = ubx | (uby << 8) | (ubz << 16) | (ubw << 24);
-               store_vector4( inst, machine, result );
-            }
-            break;
-         case OPCODE_PK4UB: /* pack four GLubytes into one 32-bit float */
-            {
-               GLfloat a[4], result[4];
-               GLuint ubx, uby, ubz, ubw, *rawResult = (GLuint *) result;
-               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
-               a[0] = CLAMP(a[0], 0.0F, 1.0F);
-               a[1] = CLAMP(a[1], 0.0F, 1.0F);
-               a[2] = CLAMP(a[2], 0.0F, 1.0F);
-               a[3] = CLAMP(a[3], 0.0F, 1.0F);
-               ubx = IROUND(255.0F * a[0]);
-               uby = IROUND(255.0F * a[1]);
-               ubz = IROUND(255.0F * a[2]);
-               ubw = IROUND(255.0F * a[3]);
-               rawResult[0] = rawResult[1] = rawResult[2] = rawResult[3]
-                  = ubx | (uby << 8) | (ubz << 16) | (ubw << 24);
-               store_vector4( inst, machine, result );
-            }
-            break;
-         case OPCODE_POW:
-            {
-               GLfloat a[4], b[4], result[4];
-               fetch_vector1( ctx, &inst->SrcReg[0], machine, program, a );
-               fetch_vector1( ctx, &inst->SrcReg[1], machine, program, b );
-               result[0] = result[1] = result[2] = result[3]
-                  = (GLfloat)_mesa_pow(a[0], b[0]);
-               store_vector4( inst, machine, result );
-            }
-            break;
-         case OPCODE_RCP:
-            {
-               GLfloat a[4], result[4];
-               fetch_vector1( ctx, &inst->SrcReg[0], machine, program, a );
-               if (DEBUG_FRAG) {
-                  if (a[0] == 0)
-                     printf("RCP(0)\n");
-                  else if (IS_INF_OR_NAN(a[0]))
-                     printf("RCP(inf)\n");
-               }
-               result[0] = result[1] = result[2] = result[3] = 1.0F / a[0];
-               store_vector4( inst, machine, result );
-            }
-            break;
-         case OPCODE_RET: /* return from subroutine */
-            {
-               /* NOTE: The return is conditional! */
-               const GLuint swizzle = inst->DstReg.CondSwizzle;
-               const GLuint condMask = inst->DstReg.CondMask;
-               if (test_cc(machine->CondCodes[GET_SWZ(swizzle, 0)], condMask) ||
-                   test_cc(machine->CondCodes[GET_SWZ(swizzle, 1)], condMask) ||
-                   test_cc(machine->CondCodes[GET_SWZ(swizzle, 2)], condMask) ||
-                   test_cc(machine->CondCodes[GET_SWZ(swizzle, 3)], condMask)) {
-                  if (machine->StackDepth == 0) {
-                     return GL_TRUE; /* Per GL_NV_vertex_program2 spec */
-                  }
-                  pc = machine->CallStack[--machine->StackDepth];
-               }
-            }
-            break;
-         case OPCODE_RFL: /* reflection vector */
-            {
-               GLfloat axis[4], dir[4], result[4], tmpX, tmpW;
-               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, axis );
-               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, dir );
-               tmpW = DOT3(axis, axis);
-               tmpX = (2.0F * DOT3(axis, dir)) / tmpW;
-               result[0] = tmpX * axis[0] - dir[0];
-               result[1] = tmpX * axis[1] - dir[1];
-               result[2] = tmpX * axis[2] - dir[2];
-               /* result[3] is never written! XXX enforce in parser! */
-               store_vector4( inst, machine, result );
-            }
-            break;
-         case OPCODE_RSQ: /* 1 / sqrt() */
-            {
-               GLfloat a[4], result[4];
-               fetch_vector1( ctx, &inst->SrcReg[0], machine, program, a );
-               a[0] = FABSF(a[0]);
-               result[0] = result[1] = result[2] = result[3] = INV_SQRTF(a[0]);
-               store_vector4( inst, machine, result );
-               if (DEBUG_FRAG) {
-                  printf("RSQ %g = 1/sqrt(|%g|)\n", result[0], a[0]);
-               }
-            }
-            break;
-         case OPCODE_SCS: /* sine and cos */
-            {
-               GLfloat a[4], result[4];
-               fetch_vector1( ctx, &inst->SrcReg[0], machine, program, a );
-               result[0] = (GLfloat)_mesa_cos(a[0]);
-               result[1] = (GLfloat)_mesa_sin(a[0]);
-               result[2] = 0.0;  /* undefined! */
-               result[3] = 0.0;  /* undefined! */
-               store_vector4( inst, machine, result );
-            }
-            break;
-         case OPCODE_SEQ: /* set on equal */
-            {
-               GLfloat a[4], b[4], result[4];
-               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
-               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
-               result[0] = (a[0] == b[0]) ? 1.0F : 0.0F;
-               result[1] = (a[1] == b[1]) ? 1.0F : 0.0F;
-               result[2] = (a[2] == b[2]) ? 1.0F : 0.0F;
-               result[3] = (a[3] == b[3]) ? 1.0F : 0.0F;
-               store_vector4( inst, machine, result );
-            }
-            break;
-         case OPCODE_SFL: /* set false, operands ignored */
-            {
-               static const GLfloat result[4] = { 0.0F, 0.0F, 0.0F, 0.0F };
-               store_vector4( inst, machine, result );
-            }
-            break;
-         case OPCODE_SGE: /* set on greater or equal */
-            {
-               GLfloat a[4], b[4], result[4];
-               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
-               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
-               result[0] = (a[0] >= b[0]) ? 1.0F : 0.0F;
-               result[1] = (a[1] >= b[1]) ? 1.0F : 0.0F;
-               result[2] = (a[2] >= b[2]) ? 1.0F : 0.0F;
-               result[3] = (a[3] >= b[3]) ? 1.0F : 0.0F;
-               store_vector4( inst, machine, result );
-            }
-            break;
-         case OPCODE_SGT: /* set on greater */
-            {
-               GLfloat a[4], b[4], result[4];
-               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
-               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
-               result[0] = (a[0] > b[0]) ? 1.0F : 0.0F;
-               result[1] = (a[1] > b[1]) ? 1.0F : 0.0F;
-               result[2] = (a[2] > b[2]) ? 1.0F : 0.0F;
-               result[3] = (a[3] > b[3]) ? 1.0F : 0.0F;
-               store_vector4( inst, machine, result );
-            }
-            break;
-         case OPCODE_SIN:
-            {
-               GLfloat a[4], result[4];
-               fetch_vector1( ctx, &inst->SrcReg[0], machine, program, a );
-               result[0] = result[1] = result[2] = result[3]
-                  = (GLfloat) _mesa_sin(a[0]);
-               store_vector4( inst, machine, result );
-            }
-            break;
-         case OPCODE_SLE: /* set on less or equal */
-            {
-               GLfloat a[4], b[4], result[4];
-               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
-               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
-               result[0] = (a[0] <= b[0]) ? 1.0F : 0.0F;
-               result[1] = (a[1] <= b[1]) ? 1.0F : 0.0F;
-               result[2] = (a[2] <= b[2]) ? 1.0F : 0.0F;
-               result[3] = (a[3] <= b[3]) ? 1.0F : 0.0F;
-               store_vector4( inst, machine, result );
-            }
-            break;
-         case OPCODE_SLT: /* set on less */
-            {
-               GLfloat a[4], b[4], result[4];
-               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
-               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
-               result[0] = (a[0] < b[0]) ? 1.0F : 0.0F;
-               result[1] = (a[1] < b[1]) ? 1.0F : 0.0F;
-               result[2] = (a[2] < b[2]) ? 1.0F : 0.0F;
-               result[3] = (a[3] < b[3]) ? 1.0F : 0.0F;
-               store_vector4( inst, machine, result );
-            }
-            break;
-         case OPCODE_SNE: /* set on not equal */
-            {
-               GLfloat a[4], b[4], result[4];
-               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
-               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
-               result[0] = (a[0] != b[0]) ? 1.0F : 0.0F;
-               result[1] = (a[1] != b[1]) ? 1.0F : 0.0F;
-               result[2] = (a[2] != b[2]) ? 1.0F : 0.0F;
-               result[3] = (a[3] != b[3]) ? 1.0F : 0.0F;
-               store_vector4( inst, machine, result );
-            }
-            break;
-         case OPCODE_STR: /* set true, operands ignored */
-            {
-               static const GLfloat result[4] = { 1.0F, 1.0F, 1.0F, 1.0F };
-               store_vector4( inst, machine, result );
-            }
-            break;
-         case OPCODE_SUB:
-            {
-               GLfloat a[4], b[4], result[4];
-               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
-               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
-               result[0] = a[0] - b[0];
-               result[1] = a[1] - b[1];
-               result[2] = a[2] - b[2];
-               result[3] = a[3] - b[3];
-               store_vector4( inst, machine, result );
-               if (DEBUG_FRAG) {
-                  printf("SUB (%g %g %g %g) = (%g %g %g %g) - (%g %g %g %g)\n",
-                         result[0], result[1], result[2], result[3],
-                         a[0], a[1], a[2], a[3], b[0], b[1], b[2], b[3]);
-               }
-            }
-            break;
-         case OPCODE_SWZ: /* extended swizzle */
-            {
-               const struct prog_src_register *source = &inst->SrcReg[0];
-               const GLfloat *src = get_register_pointer(ctx, source,
-                                                         machine, program);
-               GLfloat result[4];
-               GLuint i;
-               for (i = 0; i < 4; i++) {
-                  const GLuint swz = GET_SWZ(source->Swizzle, i);
-                  if (swz == SWIZZLE_ZERO)
-                     result[i] = 0.0;
-                  else if (swz == SWIZZLE_ONE)
-                     result[i] = 1.0;
-                  else {
-                     ASSERT(swz >= 0);
-                     ASSERT(swz <= 3);
-                     result[i] = src[swz];
-                  }
-                  if (source->NegateBase & (1 << i))
-                     result[i] = -result[i];
-               }
-               store_vector4( inst, machine, result );
-            }
-            break;
-         case OPCODE_TEX: /* Both ARB and NV frag prog */
-            /* Texel lookup */
-            {
-               /* Note: only use the precomputed lambda value when we're
-                * sampling texture unit [K] with texcoord[K].
-                * Otherwise, the lambda value may have no relation to the
-                * instruction's texcoord or texture image.  Using the wrong
-                * lambda is usually bad news.
-                * The rest of the time, just use zero (until we get a more
-                * sophisticated way of computing lambda).
-                */
-               GLfloat coord[4], color[4], lambda;
-               if (inst->SrcReg[0].File == PROGRAM_INPUT &&
-                   inst->SrcReg[0].Index == FRAG_ATTRIB_TEX0+inst->TexSrcUnit)
-                  lambda = span->array->lambda[inst->TexSrcUnit][column];
-               else
-                  lambda = 0.0;
-               fetch_vector4(ctx, &inst->SrcReg[0], machine, program, coord);
-               fetch_texel( ctx, coord, lambda, inst->TexSrcUnit, color );
-               if (DEBUG_FRAG) {
-                  printf("TEX (%g, %g, %g, %g) = texture[%d][%g, %g, %g, %g], "
-                         "lod %f\n",
-                         color[0], color[1], color[2], color[3],
-                         inst->TexSrcUnit,
-                         coord[0], coord[1], coord[2], coord[3], lambda);
-               }
-               store_vector4( inst, machine, color );
-            }
-            break;
-         case OPCODE_TXB: /* GL_ARB_fragment_program only */
-            /* Texel lookup with LOD bias */
-            {
-               GLfloat coord[4], color[4], lambda, bias;
-               if (inst->SrcReg[0].File == PROGRAM_INPUT &&
-                   inst->SrcReg[0].Index == FRAG_ATTRIB_TEX0+inst->TexSrcUnit)
-                  lambda = span->array->lambda[inst->TexSrcUnit][column];
-               else
-                  lambda = 0.0;
-               fetch_vector4(ctx, &inst->SrcReg[0], machine, program, coord);
-               /* coord[3] is the bias to add to lambda */
-               bias = ctx->Texture.Unit[inst->TexSrcUnit].LodBias
-                    + ctx->Texture.Unit[inst->TexSrcUnit]._Current->LodBias
-                    + coord[3];
-               fetch_texel(ctx, coord, lambda + bias, inst->TexSrcUnit, color);
-               store_vector4( inst, machine, color );
-            }
-            break;
-         case OPCODE_TXD: /* GL_NV_fragment_program only */
-            /* Texture lookup w/ partial derivatives for LOD */
-            {
-               GLfloat texcoord[4], dtdx[4], dtdy[4], color[4];
-               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, texcoord );
-               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, dtdx );
-               fetch_vector4( ctx, &inst->SrcReg[2], machine, program, dtdy );
-               fetch_texel_deriv( ctx, texcoord, dtdx, dtdy, inst->TexSrcUnit,
-                                  color );
-               store_vector4( inst, machine, color );
-            }
-            break;
-         case OPCODE_TXP: /* GL_ARB_fragment_program only */
-            /* Texture lookup w/ projective divide */
-            {
-               GLfloat texcoord[4], color[4], lambda;
-               if (inst->SrcReg[0].File == PROGRAM_INPUT &&
-                   inst->SrcReg[0].Index == FRAG_ATTRIB_TEX0+inst->TexSrcUnit)
-                  lambda = span->array->lambda[inst->TexSrcUnit][column];
-               else
-                  lambda = 0.0;
-               fetch_vector4(ctx, &inst->SrcReg[0], machine, program,texcoord);
-	       /* Not so sure about this test - if texcoord[3] is
-		* zero, we'd probably be fine except for an ASSERT in
-		* IROUND_POS() which gets triggered by the inf values created.
-		*/
-	       if (texcoord[3] != 0.0) {
-		  texcoord[0] /= texcoord[3];
-		  texcoord[1] /= texcoord[3];
-		  texcoord[2] /= texcoord[3];
-	       }
-               fetch_texel( ctx, texcoord, lambda, inst->TexSrcUnit, color );
-               store_vector4( inst, machine, color );
-            }
-            break;
-         case OPCODE_TXP_NV: /* GL_NV_fragment_program only */
-            /* Texture lookup w/ projective divide */
-            {
-               GLfloat texcoord[4], color[4], lambda;
-               if (inst->SrcReg[0].File == PROGRAM_INPUT &&
-                   inst->SrcReg[0].Index == FRAG_ATTRIB_TEX0+inst->TexSrcUnit)
-                  lambda = span->array->lambda[inst->TexSrcUnit][column];
-               else
-                  lambda = 0.0;
-               fetch_vector4(ctx, &inst->SrcReg[0], machine, program,texcoord);
-               if (inst->TexSrcTarget != TEXTURE_CUBE_INDEX &&
-		   texcoord[3] != 0.0) {
-                  texcoord[0] /= texcoord[3];
-                  texcoord[1] /= texcoord[3];
-                  texcoord[2] /= texcoord[3];
-               }
-               fetch_texel( ctx, texcoord, lambda, inst->TexSrcUnit, color );
-               store_vector4( inst, machine, color );
-            }
-            break;
-         case OPCODE_UP2H: /* unpack two 16-bit floats */
-            {
-               GLfloat a[4], result[4];
-               const GLuint *rawBits = (const GLuint *) a;
-               GLhalfNV hx, hy;
-               fetch_vector1( ctx, &inst->SrcReg[0], machine, program, a );
-               hx = rawBits[0] & 0xffff;
-               hy = rawBits[0] >> 16;
-               result[0] = result[2] = _mesa_half_to_float(hx);
-               result[1] = result[3] = _mesa_half_to_float(hy);
-               store_vector4( inst, machine, result );
-            }
-            break;
-         case OPCODE_UP2US: /* unpack two GLushorts */
-            {
-               GLfloat a[4], result[4];
-               const GLuint *rawBits = (const GLuint *) a;
-               GLushort usx, usy;
-               fetch_vector1( ctx, &inst->SrcReg[0], machine, program, a );
-               usx = rawBits[0] & 0xffff;
-               usy = rawBits[0] >> 16;
-               result[0] = result[2] = usx * (1.0f / 65535.0f);
-               result[1] = result[3] = usy * (1.0f / 65535.0f);
-               store_vector4( inst, machine, result );
-            }
-            break;
-         case OPCODE_UP4B: /* unpack four GLbytes */
-            {
-               GLfloat a[4], result[4];
-               const GLuint *rawBits = (const GLuint *) a;
-               fetch_vector1( ctx, &inst->SrcReg[0], machine, program, a );
-               result[0] = (((rawBits[0] >>  0) & 0xff) - 128) / 127.0F;
-               result[1] = (((rawBits[0] >>  8) & 0xff) - 128) / 127.0F;
-               result[2] = (((rawBits[0] >> 16) & 0xff) - 128) / 127.0F;
-               result[3] = (((rawBits[0] >> 24) & 0xff) - 128) / 127.0F;
-               store_vector4( inst, machine, result );
-            }
-            break;
-         case OPCODE_UP4UB: /* unpack four GLubytes */
-            {
-               GLfloat a[4], result[4];
-               const GLuint *rawBits = (const GLuint *) a;
-               fetch_vector1( ctx, &inst->SrcReg[0], machine, program, a );
-               result[0] = ((rawBits[0] >>  0) & 0xff) / 255.0F;
-               result[1] = ((rawBits[0] >>  8) & 0xff) / 255.0F;
-               result[2] = ((rawBits[0] >> 16) & 0xff) / 255.0F;
-               result[3] = ((rawBits[0] >> 24) & 0xff) / 255.0F;
-               store_vector4( inst, machine, result );
-            }
-            break;
-         case OPCODE_XPD: /* cross product */
-            {
-               GLfloat a[4], b[4], result[4];
-               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
-               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
-               result[0] = a[1] * b[2] - a[2] * b[1];
-               result[1] = a[2] * b[0] - a[0] * b[2];
-               result[2] = a[0] * b[1] - a[1] * b[0];
-               result[3] = 1.0;
-               store_vector4( inst, machine, result );
-            }
-            break;
-         case OPCODE_X2D: /* 2-D matrix transform */
-            {
-               GLfloat a[4], b[4], c[4], result[4];
-               fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a );
-               fetch_vector4( ctx, &inst->SrcReg[1], machine, program, b );
-               fetch_vector4( ctx, &inst->SrcReg[2], machine, program, c );
-               result[0] = a[0] + b[0] * c[0] + b[1] * c[1];
-               result[1] = a[1] + b[0] * c[2] + b[1] * c[3];
-               result[2] = a[2] + b[0] * c[0] + b[1] * c[1];
-               result[3] = a[3] + b[0] * c[2] + b[1] * c[3];
-               store_vector4( inst, machine, result );
-            }
-            break;
-         case OPCODE_PRINT:
-            {
-               if (inst->SrcReg[0].File != -1) {
-                  GLfloat a[4];
-                  fetch_vector4( ctx, &inst->SrcReg[0], machine, program, a);
-                  _mesa_printf("%s%g, %g, %g, %g\n", (const char *) inst->Data,
-                               a[0], a[1], a[2], a[3]);
-               }
-               else {
-                  _mesa_printf("%s\n", (const char *) inst->Data);
-               }
-            }
-            break;
-         case OPCODE_END:
-            return GL_TRUE;
-         default:
-            _mesa_problem(ctx, "Bad opcode %d in _mesa_exec_fragment_program",
-                          inst->Opcode);
-            return GL_TRUE; /* return value doesn't matter */
-      }
-   }
-   return GL_TRUE;
-}
-
-
-/**
- * Initialize the virtual fragment program machine state prior to running
- * fragment program on a fragment.  This involves initializing the input
- * registers, condition codes, etc.
- * \param machine  the virtual machine state to init
- * \param program  the fragment program we're about to run
- * \param span  the span of pixels we'll operate on
- * \param col  which element (column) of the span we'll operate on
- */
-static void
-init_machine( GLcontext *ctx, struct fp_machine *machine,
-              const struct gl_fragment_program *program,
-              const SWspan *span, GLuint col )
-{
-   GLuint inputsRead = program->Base.InputsRead;
-   GLuint u, v;
-
-   if (ctx->FragmentProgram.CallbackEnabled)
-      inputsRead = ~0;
-
-   if (program->Base.Target == GL_FRAGMENT_PROGRAM_NV) {
-      /* Clear temporary registers (undefined for ARB_f_p) */
-      _mesa_bzero(machine->Temporaries,
-                  MAX_NV_FRAGMENT_PROGRAM_TEMPS * 4 * sizeof(GLfloat));
-   }
-
-   /* Load input registers */
-   if (inputsRead & (1 << FRAG_ATTRIB_WPOS)) {
-      GLfloat *wpos = machine->Inputs[FRAG_ATTRIB_WPOS];
-      ASSERT(span->arrayMask & SPAN_Z);
-      if (span->arrayMask & SPAN_XY) {
-         wpos[0] = (GLfloat) span->array->x[col];
-         wpos[1] = (GLfloat) span->array->y[col];
-      }
-      else {
-         wpos[0] = (GLfloat) span->x + col;
-         wpos[1] = (GLfloat) span->y;
-      }
-      wpos[2] = (GLfloat) span->array->z[col] / ctx->DrawBuffer->_DepthMaxF;
-      wpos[3] = span->w + col * span->dwdx;
-   }
-   if (inputsRead & (1 << FRAG_ATTRIB_COL0)) {
-      ASSERT(span->arrayMask & SPAN_RGBA);
-      COPY_4V(machine->Inputs[FRAG_ATTRIB_COL0],
-              span->array->color.sz4.rgba[col]);
-   }
-   if (inputsRead & (1 << FRAG_ATTRIB_COL1)) {
-      ASSERT(span->arrayMask & SPAN_SPEC);
-      COPY_4V(machine->Inputs[FRAG_ATTRIB_COL1],
-              span->array->color.sz4.spec[col]);
-   }
-   if (inputsRead & (1 << FRAG_ATTRIB_FOGC)) {
-      GLfloat *fogc = machine->Inputs[FRAG_ATTRIB_FOGC];
-      ASSERT(span->arrayMask & SPAN_FOG);
-      fogc[0] = span->array->fog[col];
-      fogc[1] = 0.0F;
-      fogc[2] = 0.0F;
-      fogc[3] = 0.0F;
-   }
-   for (u = 0; u < ctx->Const.MaxTextureCoordUnits; u++) {
-      if (inputsRead & (1 << (FRAG_ATTRIB_TEX0 + u))) {
-         GLfloat *tex = machine->Inputs[FRAG_ATTRIB_TEX0 + u];
-         /*ASSERT(ctx->Texture._EnabledCoordUnits & (1 << u));*/
-         COPY_4V(tex, span->array->texcoords[u][col]);
-         /*ASSERT(tex[0] != 0 || tex[1] != 0 || tex[2] != 0);*/
-      }
-   }
-   for (v = 0; v < ctx->Const.MaxVarying; v++) {
-      if (inputsRead & (1 << (FRAG_ATTRIB_VAR0 + v))) {
-#if 0
-         printf("Frag Var %d: %f %f %f\n", col,
-                span->array->varying[col][v][0],
-                span->array->varying[col][v][1],
-                span->array->varying[col][v][2]);
-#endif
-         COPY_4V(machine->Inputs[FRAG_ATTRIB_VAR0 + v],
-                 span->array->varying[col][v]);
-      }
-   }
-
-   /* 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;
-}
-
-
-/**
- * Run fragment program on the pixels in span from 'start' to 'end' - 1.
- */
-static void
-run_program(GLcontext *ctx, SWspan *span, GLuint start, GLuint end)
-{
-   const struct gl_fragment_program *program = ctx->FragmentProgram._Current;
-   struct fp_machine machine;
-   GLuint i;
-
-   CurrentMachine = &machine;
-
-   for (i = start; i < end; i++) {
-      if (span->array->mask[i]) {
-         init_machine(ctx, &machine, program, span, i);
-
-         if (execute_program(ctx, program, ~0, &machine, span, i)) {
-            /* Store result color */
-            COPY_4V(span->array->color.sz4.rgba[i],
-                    machine.Outputs[FRAG_RESULT_COLR]);
-
-            /* Store result depth/z */
-            if (program->Base.OutputsWritten & (1 << FRAG_RESULT_DEPR)) {
-               const GLfloat depth = machine.Outputs[FRAG_RESULT_DEPR][2];
-               if (depth <= 0.0)
-                  span->array->z[i] = 0;
-               else if (depth >= 1.0)
-                  span->array->z[i] = ctx->DrawBuffer->_DepthMax;
-               else
-                  span->array->z[i] = IROUND(depth * ctx->DrawBuffer->_DepthMaxF);
-            }
-         }
-         else {
-            /* killed fragment */
-            span->array->mask[i] = GL_FALSE;
-            span->writeAll = GL_FALSE;
-         }
-      }
-   }
-
-   CurrentMachine = NULL;
-}
-
-
-/**
- * Execute the current fragment program for all the fragments
- * in the given span.
- */
-void
-_swrast_exec_fragment_program( GLcontext *ctx, SWspan *span )
-{
-   const struct gl_fragment_program *program = ctx->FragmentProgram._Current;
-
-   /* incoming colors should be floats */
-   ASSERT(span->array->ChanType == GL_FLOAT);
-
-   ctx->_CurrentProgram = GL_FRAGMENT_PROGRAM_ARB; /* or NV, doesn't matter */
-
-   run_program(ctx, span, 0, span->end);
-
-   if (program->Base.OutputsWritten & (1 << FRAG_RESULT_DEPR)) {
-      span->interpMask &= ~SPAN_Z;
-      span->arrayMask |= SPAN_Z;
-   }
-
-   ctx->_CurrentProgram = 0;
-}
-
diff --git a/src/mesa/swrast/s_nvfragprog.h b/src/mesa/swrast/s_nvfragprog.h
deleted file mode 100644
index 188bacc3d8..0000000000
--- a/src/mesa/swrast/s_nvfragprog.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.1
- *
- * Copyright (C) 1999-2003  Brian Paul   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.
- */
-
-
-#ifndef S_NVFRAGPROG_H
-#define S_NVFRAGPROG_H
-
-
-#include "s_context.h"
-
-
-extern void
-_swrast_exec_fragment_program( GLcontext *ctx, SWspan *span );
-
-
-#endif