r5xx: Enable fragment.position, partial ARB_shadow.
[mesa.git] / src / mesa / drivers / dri / r300 / r500_fragprog.c
index 252171c66bfd0c9052e1b0cebe0f54c100aaacc5..5d72ec2784facd9712975c366174f4ea9616f036 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005 Ben Skeggs.
+ * Copyright 2008 Corbin Simpson <MostAwesomeDude@gmail.com>
  *
  * All Rights Reserved.
  *
  *
  */
 
-/**
- * \file
- *
- * \author Ben Skeggs <darktama@iinet.net.au>
- *
- * \author Jerome Glisse <j.glisse@gmail.com>
- *
- * \author Corbin Simpson <MostAwesomeDude@gmail.com>
- *
- * \todo Depth write, WPOS/FOGC inputs
- *
- * \todo FogOption
- *
- * \todo Verify results of opcodes for accuracy, I've only checked them in
- * specific cases.
- */
-
-#include "glheader.h"
-#include "macros.h"
-#include "enums.h"
-#include "shader/prog_instruction.h"
-#include "shader/prog_parameter.h"
-#include "shader/prog_print.h"
-
-#include "r300_context.h"
 #include "r500_fragprog.h"
-#include "r300_reg.h"
-#include "r300_state.h"
-
-/*
- * Useful macros and values
- */
-#define ERROR(fmt, args...) do {                       \
-               fprintf(stderr, "%s::%s(): " fmt "\n",  \
-                       __FILE__, __FUNCTION__, ##args);        \
-               fp->error = GL_TRUE;                    \
-       } while(0)
-
-#define COMPILE_STATE struct r300_pfs_compile_state *cs = fp->cs
-
-#define R500_US_NUM_TEMP_REGS 128
-#define R500_US_NUM_CONST_REGS 256
-
-/* "Register" flags */
-#define REG_CONSTANT (1 << 8)
-#define REG_SRC_REL (1 << 9)
-#define REG_DEST_REL (1 << 7)
-
-/* Swizzle tools */
-#define R500_SWIZZLE_ZERO 4
-#define R500_SWIZZLE_HALF 5
-#define R500_SWIZZLE_ONE 6
-#define R500_SWIZ_RGB_ZERO ((4 << 0) | (4 << 3) | (4 << 6))
-#define R500_SWIZ_RGB_ONE ((6 << 0) | (6 << 3) | (6 << 6))
-#define R500_SWIZ_RGB_RGB ((0 << 0) | (1 << 3) | (2 << 6))
-/* Swizzles for inst2 */
-#define MAKE_SWIZ_TEX_STRQ(x) (x << 8)
-#define MAKE_SWIZ_TEX_RGBA(x) (x << 24)
-/* Swizzles for inst3 */
-#define MAKE_SWIZ_RGB_A(x) (x << 2)
-#define MAKE_SWIZ_RGB_B(x) (x << 15)
-/* Swizzles for inst4 */
-#define MAKE_SWIZ_ALPHA_A(x) (x << 14)
-#define MAKE_SWIZ_ALPHA_B(x) (x << 21)
-/* Swizzle for inst5 */
-#define MAKE_SWIZ_RGBA_C(x) (x << 14)
-#define MAKE_SWIZ_ALPHA_C(x) (x << 27)
-
-static void dump_program(struct r500_fragment_program *fp);
-
-static inline GLuint make_rgb_swizzle(struct prog_src_register src) {
-       GLuint swiz = 0x0;
-       GLuint temp;
-       /* This could be optimized, but it should be plenty fast already. */
-       int i;
-       for (i = 0; i < 3; i++) {
-               temp = (src.Swizzle >> i*3) & 0x7;
-               /* Fix SWIZZLE_ONE */
-               if (temp == 5) temp++;
-               swiz += temp << i*3;
-       }
-       return swiz;
-}
 
-static inline GLuint make_alpha_swizzle(struct prog_src_register src) {
-       GLuint swiz = (src.Swizzle >> 12) & 0x7;
-       if (swiz == 5) swiz++;
-       return swiz;
-}
-
-static inline GLuint make_strq_swizzle(struct prog_src_register src) {
-       GLuint swiz = 0x0;
-       GLuint temp = src.Swizzle;
-       int i;
-       for (i = 0; i < 4; i++) {
-               swiz += (temp & 0x3) << i*2;
-               temp >>= 3;
-       }
-       return swiz;
+static void reset_srcreg(struct prog_src_register* reg)
+{
+       _mesa_bzero(reg, sizeof(*reg));
+       reg->Swizzle = SWIZZLE_NOOP;
 }
 
-static int get_temp(struct r500_fragment_program *fp, int slot) {
-
-       COMPILE_STATE;
+/**
+ * Transform TEX, TXP, TXB, and KIL instructions in the following way:
+ *  - premultiply texture coordinates for RECT
+ *  - extract operand swizzles
+ *  - introduce a temporary register when write masks are needed
+ *
+ */
+static GLboolean transform_TEX(
+       struct radeon_program_transform_context* context,
+       struct prog_instruction* orig_inst, void* data)
+{
+       struct r500_fragment_program_compiler *compiler =
+               (struct r500_fragment_program_compiler*)data;
+       struct prog_instruction inst = *orig_inst;
+       struct prog_instruction* tgt;
+       GLboolean destredirect = GL_FALSE;
+
+       if (inst.Opcode != OPCODE_TEX &&
+           inst.Opcode != OPCODE_TXB &&
+           inst.Opcode != OPCODE_TXP &&
+           inst.Opcode != OPCODE_KIL)
+               return GL_FALSE;
 
-       int r = slot;
+       /* ARB_shadow & EXT_shadow_funcs */
+       if (inst.Opcode != OPCODE_KIL &&
+           compiler->fp->mesa_program.Base.ShadowSamplers & (1 << inst.TexSrcUnit)) {
+               GLuint comparefunc = GL_NEVER + compiler->fp->state.unit[inst.TexSrcUnit].texture_compare_func;
+
+               if (comparefunc == GL_NEVER || comparefunc == GL_ALWAYS) {
+                       tgt = radeonClauseInsertInstructions(context->compiler, context->dest,
+                               context->dest->NumInstructions, 1);
+
+                       tgt->Opcode = OPCODE_MOV;
+                       tgt->DstReg.File = inst.DstReg.File;
+                       tgt->DstReg.Index = inst.DstReg.Index;
+                       tgt->DstReg.WriteMask = inst.DstReg.WriteMask;
+                       tgt->SrcReg[0].File = PROGRAM_BUILTIN;
+                       tgt->SrcReg[0].Swizzle = comparefunc == GL_ALWAYS ? SWIZZLE_1111 : SWIZZLE_0000;
+                       return GL_TRUE;
+               }
 
-       while (cs->inputs[r].refcount != 0) {
-               /* Crap, taken. */
-               r++;
+               inst.DstReg.File = PROGRAM_TEMPORARY;
+               inst.DstReg.Index = radeonCompilerAllocateTemporary(context->compiler);
+               inst.DstReg.WriteMask = WRITEMASK_XYZW;
        }
 
-       fp->temp_reg_offset = r - slot;
-
-       if (r >= R500_US_NUM_TEMP_REGS) {
-               ERROR("Out of hardware temps!\n");
-               return 0;
+       tgt = radeonClauseInsertInstructions(context->compiler, context->dest,
+               context->dest->NumInstructions, 1);
+       _mesa_copy_instructions(tgt, &inst, 1);
+
+       if (inst.Opcode != OPCODE_KIL &&
+           compiler->fp->mesa_program.Base.ShadowSamplers & (1 << inst.TexSrcUnit)) {
+               GLuint comparefunc = GL_NEVER + compiler->fp->state.unit[inst.TexSrcUnit].texture_compare_func;
+               GLuint depthmode = compiler->fp->state.unit[inst.TexSrcUnit].depth_texture_mode;
+
+               tgt = radeonClauseInsertInstructions(context->compiler, context->dest,
+                       context->dest->NumInstructions, 2);
+
+               tgt[0].Opcode = OPCODE_MAD;
+               tgt[0].DstReg = inst.DstReg;
+               tgt[0].DstReg.WriteMask = orig_inst->DstReg.WriteMask;
+               tgt[0].SrcReg[0].File = PROGRAM_TEMPORARY;
+               tgt[0].SrcReg[0].Index = inst.DstReg.Index;
+               if (depthmode == 0) /* GL_LUMINANCE */
+                       tgt[0].SrcReg[0].Swizzle = MAKE_SWIZZLE4(SWIZZLE_X, SWIZZLE_Y, SWIZZLE_Z, SWIZZLE_Z);
+               else if (depthmode == 2) /* GL_ALPHA */
+                       tgt[0].SrcReg[0].Swizzle = SWIZZLE_WWWW;
+               tgt[0].SrcReg[1].File = PROGRAM_BUILTIN;
+               tgt[0].SrcReg[1].Swizzle = SWIZZLE_1111;
+               tgt[0].SrcReg[2] = inst.SrcReg[0];
+               tgt[0].SrcReg[2].Swizzle = SWIZZLE_ZZZZ;
+
+               /* Recall that SrcReg[0] is tex, SrcReg[2] is r and:
+                *   r  < tex  <=>      -tex+r < 0
+                *   r >= tex  <=> not (-tex+r < 0 */
+               if (comparefunc == GL_LESS || comparefunc == GL_GEQUAL)
+                       tgt[0].SrcReg[0].NegateBase = tgt[0].SrcReg[0].NegateBase ^ NEGATE_XYZW;
+               else
+                       tgt[0].SrcReg[2].NegateBase = tgt[0].SrcReg[2].NegateBase ^ NEGATE_XYZW;
+
+               tgt[1].Opcode = OPCODE_CMP;
+               tgt[1].DstReg = orig_inst->DstReg;
+               tgt[1].SrcReg[0].File = PROGRAM_TEMPORARY;
+               tgt[1].SrcReg[0].Index = tgt[0].DstReg.Index;
+               tgt[1].SrcReg[1].File = PROGRAM_BUILTIN;
+               tgt[1].SrcReg[2].File = PROGRAM_BUILTIN;
+
+               if (comparefunc == GL_LESS || comparefunc == GL_GREATER) {
+                       tgt[1].SrcReg[1].Swizzle = SWIZZLE_1111;
+                       tgt[1].SrcReg[2].Swizzle = SWIZZLE_0000;
+               } else {
+                       tgt[1].SrcReg[1].Swizzle = SWIZZLE_0000;
+                       tgt[1].SrcReg[2].Swizzle = SWIZZLE_1111;
+               }
+       } else if (destredirect) {
+               tgt = radeonClauseInsertInstructions(context->compiler, context->dest,
+                       context->dest->NumInstructions, 1);
+
+               tgt->Opcode = OPCODE_MAD;
+               tgt->DstReg = orig_inst->DstReg;
+               tgt->SrcReg[0].File = PROGRAM_TEMPORARY;
+               tgt->SrcReg[0].Index = inst.DstReg.Index;
+               tgt->SrcReg[1].File = PROGRAM_BUILTIN;
+               tgt->SrcReg[1].Swizzle = SWIZZLE_1111;
+               tgt->SrcReg[2].File = PROGRAM_BUILTIN;
+               tgt->SrcReg[2].Swizzle = SWIZZLE_0000;
        }
 
-       if (r > fp->max_temp_idx)
-               fp->max_temp_idx = r;
-
-       return r;
+       return GL_TRUE;
 }
 
-/* Borrowed verbatim from r300_fragprog since it hasn't changed. */
-static GLuint emit_const4fv(struct r500_fragment_program *fp,
-                           const GLfloat * cp)
+
+static void update_params(r300ContextPtr r300, struct r500_fragment_program *fp)
 {
-       GLuint reg = 0x0;
-       int index;
+       struct gl_fragment_program *mp = &fp->mesa_program;
 
-       for (index = 0; index < fp->const_nr; ++index) {
-               if (fp->constant[index] == cp)
-                       break;
-       }
+       /* Ask Mesa nicely to fill in ParameterValues for us */
+       if (mp->Base.Parameters)
+               _mesa_load_state_parameters(r300->radeon.glCtx, mp->Base.Parameters);
+}
 
-       if (index >= fp->const_nr) {
-               if (index >= R500_US_NUM_CONST_REGS) {
-                       ERROR("Out of hw constants!\n");
-                       return reg;
-               }
 
-               fp->const_nr++;
-               fp->constant[index] = cp;
-       }
+/**
+ * Transform the program to support fragment.position.
+ *
+ * Introduce a small fragment at the start of the program that will be
+ * the only code that directly reads the FRAG_ATTRIB_WPOS input.
+ * All other code pieces that reference that input will be rewritten
+ * to read from a newly allocated temporary.
+ *
+ * \todo if/when r5xx supports the radeon_program architecture, this is a
+ * likely candidate for code sharing.
+ */
+static void insert_WPOS_trailer(struct r500_fragment_program_compiler *compiler)
+{
+       GLuint InputsRead = compiler->fp->mesa_program.Base.InputsRead;
 
-       reg = index | REG_CONSTANT;
-       return reg;
-}
+       if (!(InputsRead & FRAG_BIT_WPOS))
+               return;
 
-static GLuint make_src(struct r500_fragment_program *fp, struct prog_src_register src) {
-       COMPILE_STATE;
-       GLuint reg;
-       switch (src.File) {
-               case PROGRAM_TEMPORARY:
-                       reg = src.Index + fp->temp_reg_offset;
-                       break;
-               case PROGRAM_INPUT:
-                       reg = cs->inputs[src.Index].reg;
-                       break;
-               case PROGRAM_STATE_VAR:
-               case PROGRAM_NAMED_PARAM:
-               case PROGRAM_CONSTANT:
-                       reg = emit_const4fv(fp, fp->mesa_program.Base.Parameters->
-                                 ParameterValues[src.Index]);
-                       break;
-               default:
-                       ERROR("Can't handle src.File %x\n", src.File);
-                       reg = 0x0;
-                       break;
+       static gl_state_index tokens[STATE_LENGTH] = {
+               STATE_INTERNAL, STATE_R300_WINDOW_DIMENSION, 0, 0, 0
+       };
+       struct prog_instruction *fpi;
+       GLuint window_index;
+       int i = 0;
+       GLuint tempregi = radeonCompilerAllocateTemporary(&compiler->compiler);
+
+       fpi = radeonClauseInsertInstructions(&compiler->compiler, &compiler->compiler.Clauses[0], 0, 3);
+
+       /* perspective divide */
+       fpi[i].Opcode = OPCODE_RCP;
+
+       fpi[i].DstReg.File = PROGRAM_TEMPORARY;
+       fpi[i].DstReg.Index = tempregi;
+       fpi[i].DstReg.WriteMask = WRITEMASK_W;
+       fpi[i].DstReg.CondMask = COND_TR;
+
+       fpi[i].SrcReg[0].File = PROGRAM_INPUT;
+       fpi[i].SrcReg[0].Index = FRAG_ATTRIB_WPOS;
+       fpi[i].SrcReg[0].Swizzle = SWIZZLE_WWWW;
+       i++;
+
+       fpi[i].Opcode = OPCODE_MUL;
+
+       fpi[i].DstReg.File = PROGRAM_TEMPORARY;
+       fpi[i].DstReg.Index = tempregi;
+       fpi[i].DstReg.WriteMask = WRITEMASK_XYZ;
+       fpi[i].DstReg.CondMask = COND_TR;
+
+       fpi[i].SrcReg[0].File = PROGRAM_INPUT;
+       fpi[i].SrcReg[0].Index = FRAG_ATTRIB_WPOS;
+       fpi[i].SrcReg[0].Swizzle = SWIZZLE_XYZW;
+
+       fpi[i].SrcReg[1].File = PROGRAM_TEMPORARY;
+       fpi[i].SrcReg[1].Index = tempregi;
+       fpi[i].SrcReg[1].Swizzle = SWIZZLE_WWWW;
+       i++;
+
+       /* viewport transformation */
+       window_index = _mesa_add_state_reference(compiler->fp->mesa_program.Base.Parameters, tokens);
+
+       fpi[i].Opcode = OPCODE_MAD;
+
+       fpi[i].DstReg.File = PROGRAM_TEMPORARY;
+       fpi[i].DstReg.Index = tempregi;
+       fpi[i].DstReg.WriteMask = WRITEMASK_XYZ;
+       fpi[i].DstReg.CondMask = COND_TR;
+
+       fpi[i].SrcReg[0].File = PROGRAM_TEMPORARY;
+       fpi[i].SrcReg[0].Index = tempregi;
+       fpi[i].SrcReg[0].Swizzle =
+           MAKE_SWIZZLE4(SWIZZLE_X, SWIZZLE_Y, SWIZZLE_Z, SWIZZLE_ZERO);
+
+       fpi[i].SrcReg[1].File = PROGRAM_STATE_VAR;
+       fpi[i].SrcReg[1].Index = window_index;
+       fpi[i].SrcReg[1].Swizzle =
+           MAKE_SWIZZLE4(SWIZZLE_X, SWIZZLE_Y, SWIZZLE_Z, SWIZZLE_ZERO);
+
+       fpi[i].SrcReg[2].File = PROGRAM_STATE_VAR;
+       fpi[i].SrcReg[2].Index = window_index;
+       fpi[i].SrcReg[2].Swizzle =
+           MAKE_SWIZZLE4(SWIZZLE_X, SWIZZLE_Y, SWIZZLE_Z, SWIZZLE_ZERO);
+       i++;
+
+       for (; i < compiler->compiler.Clauses[0].NumInstructions; ++i) {
+               int reg;
+               for (reg = 0; reg < 3; reg++) {
+                       if (fpi[i].SrcReg[reg].File == PROGRAM_INPUT &&
+                           fpi[i].SrcReg[reg].Index == FRAG_ATTRIB_WPOS) {
+                               fpi[i].SrcReg[reg].File = PROGRAM_TEMPORARY;
+                               fpi[i].SrcReg[reg].Index = tempregi;
+                       }
+               }
        }
-       return reg;
 }
 
-static GLuint make_dest(struct r500_fragment_program *fp, struct prog_dst_register dest) {
-       GLuint reg;
-       switch (dest.File) {
-               case PROGRAM_TEMPORARY:
-                       reg = dest.Index + fp->temp_reg_offset;
-                       break;
-               case PROGRAM_OUTPUT:
-                       /* Eventually we may need to handle multiple
-                        * rendering targets... */
-                       reg = dest.Index;
-                       break;
-               default:
-                       ERROR("Can't handle dest.File %x\n", dest.File);
-                       reg = 0x0;
-                       break;
-       }
-       return reg;
-}
 
-static void emit_tex(struct r500_fragment_program *fp,
-                    struct prog_instruction *fpi, int opcode, int dest, int counter)
+static GLuint build_dtm(GLuint depthmode)
 {
-       int hwsrc, hwdest;
-       GLuint mask;
-
-       mask = fpi->DstReg.WriteMask << 11;
-       hwsrc = make_src(fp, fpi->SrcReg[0]);
-
-       fp->inst[counter].inst0 = R500_INST_TYPE_TEX | mask
-               | R500_INST_TEX_SEM_WAIT;
-
-       fp->inst[counter].inst1 = R500_TEX_ID(fpi->TexSrcUnit)
-               | R500_TEX_SEM_ACQUIRE | R500_TEX_IGNORE_UNCOVERED;
-       
-       if (fpi->TexSrcTarget == TEXTURE_RECT_INDEX)
-               fp->inst[counter].inst1 |= R500_TEX_UNSCALED;
-
-       switch (opcode) {
-       case OPCODE_KIL:
-               fp->inst[counter].inst1 |= R500_TEX_INST_TEXKILL;
-               break;
-       case OPCODE_TEX:
-               fp->inst[counter].inst1 |= R500_TEX_INST_LD;
-               break;
-       case OPCODE_TXB:
-               fp->inst[counter].inst1 |= R500_TEX_INST_LODBIAS;
-               break;
-       case OPCODE_TXP:
-               fp->inst[counter].inst1 |= R500_TEX_INST_PROJ;
-               break;
+       switch(depthmode) {
        default:
-               ERROR("emit_tex can't handle opcode %x\n", opcode);
+       case GL_LUMINANCE: return 0;
+       case GL_INTENSITY: return 1;
+       case GL_ALPHA: return 2;
        }
-
-       fp->inst[counter].inst2 = R500_TEX_SRC_ADDR(hwsrc)
-               /* | MAKE_SWIZ_TEX_STRQ(make_strq_swizzle(fpi->SrcReg[0])) */
-               | R500_TEX_SRC_S_SWIZ_R | R500_TEX_SRC_T_SWIZ_G
-               | R500_TEX_SRC_R_SWIZ_B | R500_TEX_SRC_Q_SWIZ_A
-               | R500_TEX_DST_ADDR(dest)
-               | R500_TEX_DST_R_SWIZ_R | R500_TEX_DST_G_SWIZ_G
-               | R500_TEX_DST_B_SWIZ_B | R500_TEX_DST_A_SWIZ_A;
-
-
-
-       fp->inst[counter].inst3 = 0x0;
-       fp->inst[counter].inst4 = 0x0;
-       fp->inst[counter].inst5 = 0x0;  
 }
 
-static void dumb_shader(struct r500_fragment_program *fp)
+static GLuint build_func(GLuint comparefunc)
 {
-       fp->inst[0].inst0 = R500_INST_TYPE_TEX
-               | R500_INST_TEX_SEM_WAIT
-               | R500_INST_RGB_WMASK_R
-               | R500_INST_RGB_WMASK_G
-               | R500_INST_RGB_WMASK_B
-               | R500_INST_ALPHA_WMASK
-               | R500_INST_RGB_CLAMP
-               | R500_INST_ALPHA_CLAMP;
-       fp->inst[0].inst1 = R500_TEX_ID(0)
-               | R500_TEX_INST_LD
-               | R500_TEX_SEM_ACQUIRE
-               | R500_TEX_IGNORE_UNCOVERED;
-       fp->inst[0].inst2 = R500_TEX_SRC_ADDR(0)
-               | R500_TEX_SRC_S_SWIZ_R
-               | R500_TEX_SRC_T_SWIZ_G
-               | R500_TEX_DST_ADDR(0)
-               | R500_TEX_DST_R_SWIZ_R
-               | R500_TEX_DST_G_SWIZ_G
-               | R500_TEX_DST_B_SWIZ_B
-               | R500_TEX_DST_A_SWIZ_A;
-       fp->inst[0].inst3 = R500_DX_ADDR(0)
-               | R500_DX_S_SWIZ_R
-               | R500_DX_T_SWIZ_R
-               | R500_DX_R_SWIZ_R
-               | R500_DX_Q_SWIZ_R
-               | R500_DY_ADDR(0)
-               | R500_DY_S_SWIZ_R
-               | R500_DY_T_SWIZ_R
-               | R500_DY_R_SWIZ_R
-               | R500_DY_Q_SWIZ_R;
-       fp->inst[0].inst4 = 0x0;
-       fp->inst[0].inst5 = 0x0;
-
-       fp->inst[1].inst0 = R500_INST_TYPE_OUT |
-               R500_INST_TEX_SEM_WAIT |
-               R500_INST_LAST |
-               R500_INST_RGB_OMASK_R |
-               R500_INST_RGB_OMASK_G |
-               R500_INST_RGB_OMASK_B |
-               R500_INST_ALPHA_OMASK;
-       fp->inst[1].inst1 = R500_RGB_ADDR0(0) |
-               R500_RGB_ADDR1(0) |
-               R500_RGB_ADDR1_CONST |
-               R500_RGB_ADDR2(0) |
-               R500_RGB_ADDR2_CONST |
-               R500_RGB_SRCP_OP_1_MINUS_2RGB0;
-       fp->inst[1].inst2 = R500_ALPHA_ADDR0(0) |
-               R500_ALPHA_ADDR1(0) |
-               R500_ALPHA_ADDR1_CONST |
-               R500_ALPHA_ADDR2(0) |
-               R500_ALPHA_ADDR2_CONST |
-               R500_ALPHA_SRCP_OP_1_MINUS_2A0;
-       fp->inst[1].inst3 = R500_ALU_RGB_SEL_A_SRC0 |
-               R500_ALU_RGB_R_SWIZ_A_R |
-               R500_ALU_RGB_G_SWIZ_A_G |
-               R500_ALU_RGB_B_SWIZ_A_B |
-               R500_ALU_RGB_SEL_B_SRC0 |
-               R500_ALU_RGB_R_SWIZ_B_1 |
-               R500_ALU_RGB_B_SWIZ_B_1 |
-               R500_ALU_RGB_G_SWIZ_B_1;
-       fp->inst[1].inst4 = R500_ALPHA_OP_MAD |
-               R500_ALPHA_SWIZ_A_A |
-               R500_ALPHA_SWIZ_B_1;
-       fp->inst[1].inst5 = R500_ALU_RGBA_OP_MAD |
-               R500_ALU_RGBA_R_SWIZ_0 |
-               R500_ALU_RGBA_G_SWIZ_0 |
-               R500_ALU_RGBA_B_SWIZ_0 |
-               R500_ALU_RGBA_A_SWIZ_0;
-
-       fp->cs->nrslots = 2;
-       fp->translated = GL_TRUE;
+       return comparefunc - GL_NEVER;
 }
 
-static void emit_alu(struct r500_fragment_program *fp, int counter, struct prog_instruction *fpi) {
-       if (fpi->DstReg.File == PROGRAM_OUTPUT) {
-               fp->inst[counter].inst0 = R500_INST_TYPE_OUT
-                       /* output_mask */
-                       | (fpi->DstReg.WriteMask << 15);
-       } else {
-               fp->inst[counter].inst0 = R500_INST_TYPE_ALU
-                       /* pixel_mask */
-                       | (fpi->DstReg.WriteMask << 11);
-       }
-
-       fp->inst[counter].inst0 |= R500_INST_TEX_SEM_WAIT;
-}
 
-static void emit_mov(struct r500_fragment_program *fp, int counter, struct prog_src_register src, GLuint dest) {
-       /* The r3xx shader uses MAD to implement MOV. We are using CMP, since
-        * it is technically more accurate and recommended by ATI/AMD. */
-       GLuint src_reg = make_src(fp, src);
-       fp->inst[counter].inst1 = R500_RGB_ADDR0(src_reg);
-       fp->inst[counter].inst2 = R500_ALPHA_ADDR0(src_reg);
-       fp->inst[counter].inst3 = R500_ALU_RGB_SEL_A_SRC0
-               | MAKE_SWIZ_RGB_A(make_rgb_swizzle(src))
-               | R500_ALU_RGB_SEL_B_SRC0
-               | MAKE_SWIZ_RGB_B(make_rgb_swizzle(src))
-               | R500_ALU_RGB_OMOD_DISABLE;
-       fp->inst[counter].inst4 = R500_ALPHA_OP_CMP
-               | R500_ALPHA_ADDRD(dest)
-               | R500_ALPHA_SEL_A_SRC0 | MAKE_SWIZ_ALPHA_A(make_alpha_swizzle(src))
-               | R500_ALPHA_SEL_B_SRC0 | MAKE_SWIZ_ALPHA_B(make_alpha_swizzle(src))
-               | R500_ALPHA_OMOD_DISABLE;
-       fp->inst[counter].inst5 = R500_ALU_RGBA_OP_CMP
-               | R500_ALU_RGBA_ADDRD(dest)
-               | MAKE_SWIZ_RGBA_C(R500_SWIZ_RGB_ZERO)
-               | MAKE_SWIZ_ALPHA_C(R500_SWIZZLE_ZERO);
-}
-
-static GLboolean parse_program(struct r500_fragment_program *fp)
+/**
+ * Collect all external state that is relevant for compiling the given
+ * fragment program.
+ */
+static void build_state(
+       r300ContextPtr r300,
+       struct r500_fragment_program *fp,
+       struct r500_fragment_program_external_state *state)
 {
-       struct gl_fragment_program *mp = &fp->mesa_program;
-       const struct prog_instruction *inst = mp->Base.Instructions;
-       struct prog_instruction *fpi;
-       GLuint src[3], dest, temp[2];
-       int flags, pixel_mask = 0, output_mask = 0, counter = 0;
-
-       if (!inst || inst[0].Opcode == OPCODE_END) {
-               ERROR("The program is empty!\n");
-               return GL_FALSE;
-       }
-
-       for (fpi = mp->Base.Instructions; fpi->Opcode != OPCODE_END; fpi++) {
+       int unit;
 
-               if (fpi->Opcode != OPCODE_KIL) {
-                       dest = make_dest(fp, fpi->DstReg);
-
-                       pixel_mask = fpi->DstReg.WriteMask << 11;
-                       output_mask = fpi->DstReg.WriteMask << 15;
-               }
+       _mesa_bzero(state, sizeof(*state));
 
-               switch (fpi->Opcode) {
-                       case OPCODE_ABS:
-                               emit_alu(fp, counter, fpi);
-                               emit_mov(fp, counter, fpi->SrcReg[0], dest);
-                               fp->inst[counter].inst3 |= R500_ALU_RGB_MOD_A_ABS
-                                       | R500_ALU_RGB_MOD_B_ABS;
-                               fp->inst[counter].inst4 |= R500_ALPHA_MOD_A_ABS
-                                       | R500_ALPHA_MOD_B_ABS;
-                               break;
-                       case OPCODE_ADD:
-                               src[0] = make_src(fp, fpi->SrcReg[0]);
-                               src[1] = make_src(fp, fpi->SrcReg[1]);
-                               /* Variation on MAD: 1*src0+src1 */
-                               emit_alu(fp, counter, fpi);
-                               fp->inst[counter].inst1 = R500_RGB_ADDR0(src[0])
-                                       | R500_RGB_ADDR1(src[1]) | R500_RGB_ADDR2(0);
-                               fp->inst[counter].inst2 = R500_ALPHA_ADDR0(src[0])
-                                       | R500_ALPHA_ADDR1(src[1]) | R500_ALPHA_ADDR2(0);
-                               fp->inst[counter].inst3 = /* 1 */
-                                       MAKE_SWIZ_RGB_A(R500_SWIZ_RGB_ONE)
-                                       | R500_ALU_RGB_SEL_B_SRC0 | MAKE_SWIZ_RGB_B(make_rgb_swizzle(fpi->SrcReg[0]));
-                               fp->inst[counter].inst4 = R500_ALPHA_OP_MAD
-                                       | R500_ALPHA_ADDRD(dest)
-                                       | MAKE_SWIZ_ALPHA_A(R500_SWIZZLE_ONE)
-                                       | R500_ALPHA_SEL_B_SRC0 | MAKE_SWIZ_ALPHA_B(make_alpha_swizzle(fpi->SrcReg[0]));
-                               fp->inst[counter].inst5 = R500_ALU_RGBA_OP_MAD
-                                       | R500_ALU_RGBA_ADDRD(dest)
-                                       | R500_ALU_RGBA_SEL_C_SRC1
-                                       | MAKE_SWIZ_RGBA_C(make_rgb_swizzle(fpi->SrcReg[1]))
-                                       | R500_ALU_RGBA_ALPHA_SEL_C_SRC1
-                                       | MAKE_SWIZ_ALPHA_C(make_alpha_swizzle(fpi->SrcReg[1]));
-                               break;
-                       case OPCODE_CMP:
-                               /* This inst's selects need to be swapped as follows:
-                                * 0 -> C ; 1 -> B ; 2 -> A */
-                               src[0] = make_src(fp, fpi->SrcReg[0]);
-                               src[1] = make_src(fp, fpi->SrcReg[1]);
-                               src[2] = make_src(fp, fpi->SrcReg[2]);
-                               emit_alu(fp, counter, fpi);
-                               fp->inst[counter].inst1 = R500_RGB_ADDR0(src[2])
-                                       | R500_RGB_ADDR1(src[1]) | R500_RGB_ADDR2(src[0]);
-                               fp->inst[counter].inst2 = R500_ALPHA_ADDR0(src[2])
-                                       | R500_ALPHA_ADDR1(src[1]) | R500_ALPHA_ADDR2(src[0]);
-                               fp->inst[counter].inst3 = R500_ALU_RGB_SEL_A_SRC0
-                                       | MAKE_SWIZ_RGB_A(make_rgb_swizzle(fpi->SrcReg[2]))
-                                       | R500_ALU_RGB_SEL_B_SRC1 | MAKE_SWIZ_RGB_B(make_rgb_swizzle(fpi->SrcReg[1]));
-                               fp->inst[counter].inst4 = R500_ALPHA_OP_CMP
-                                       | R500_ALPHA_ADDRD(dest)
-                                       | R500_ALPHA_SEL_A_SRC0 | MAKE_SWIZ_ALPHA_A(make_alpha_swizzle(fpi->SrcReg[2]))
-                                       | R500_ALPHA_SEL_B_SRC1 | MAKE_SWIZ_ALPHA_B(make_alpha_swizzle(fpi->SrcReg[1]));
-                               fp->inst[counter].inst5 = R500_ALU_RGBA_OP_CMP
-                                       | R500_ALU_RGBA_ADDRD(dest)
-                                       | R500_ALU_RGBA_SEL_C_SRC2
-                                       | MAKE_SWIZ_RGBA_C(make_rgb_swizzle(fpi->SrcReg[0]))
-                                       | R500_ALU_RGBA_ALPHA_SEL_C_SRC2
-                                       | MAKE_SWIZ_ALPHA_C(make_alpha_swizzle(fpi->SrcReg[0]));
-                               break;
-                       case OPCODE_COS:
-                               src[0] = make_src(fp, fpi->SrcReg[0]);
-                               emit_alu(fp, counter, fpi);
-                               fp->inst[counter].inst1 = R500_RGB_ADDR0(src[0]);
-                               fp->inst[counter].inst2 = R500_ALPHA_ADDR0(src[0]);
-                               fp->inst[counter].inst3 = R500_ALU_RGB_SEL_A_SRC0
-                                       | MAKE_SWIZ_RGB_A(make_rgb_swizzle(fpi->SrcReg[0]));
-                               fp->inst[counter].inst4 = R500_ALPHA_OP_COS
-                                       | R500_ALPHA_ADDRD(dest)
-                                       | R500_ALPHA_SEL_A_SRC0 | MAKE_SWIZ_ALPHA_A(make_alpha_swizzle(fpi->SrcReg[0]));
-                               fp->inst[counter].inst5 = R500_ALU_RGBA_OP_SOP
-                                       | R500_ALU_RGBA_ADDRD(dest);
-                               break;
-                       case OPCODE_DP3:
-                               src[0] = make_src(fp, fpi->SrcReg[0]);
-                               src[1] = make_src(fp, fpi->SrcReg[1]);
-                               emit_alu(fp, counter, fpi);
-                               fp->inst[counter].inst1 = R500_RGB_ADDR0(src[0])
-                                       | R500_RGB_ADDR1(src[1]);
-                               fp->inst[counter].inst2 = R500_ALPHA_ADDR0(src[0])
-                                       | R500_ALPHA_ADDR1(src[1]);
-                               fp->inst[counter].inst3 = R500_ALU_RGB_SEL_A_SRC0
-                                       | MAKE_SWIZ_RGB_A(make_rgb_swizzle(fpi->SrcReg[0]))
-                                       | R500_ALU_RGB_SEL_B_SRC1 | MAKE_SWIZ_RGB_B(make_rgb_swizzle(fpi->SrcReg[1]));
-                               fp->inst[counter].inst4 = R500_ALPHA_OP_DP
-                                       | R500_ALPHA_ADDRD(dest)
-                                       | R500_ALPHA_SEL_A_SRC0 | MAKE_SWIZ_ALPHA_A(make_alpha_swizzle(fpi->SrcReg[0]))
-                                       | R500_ALPHA_SEL_B_SRC1 | MAKE_SWIZ_ALPHA_B(make_alpha_swizzle(fpi->SrcReg[1]));
-                               fp->inst[counter].inst5 = R500_ALU_RGBA_OP_DP3
-                                       | R500_ALU_RGBA_ADDRD(dest);
-                               break;
-                       case OPCODE_DP4:
-                               src[0] = make_src(fp, fpi->SrcReg[0]);
-                               src[1] = make_src(fp, fpi->SrcReg[1]);
-                               /* Based on DP3 */
-                               emit_alu(fp, counter, fpi);
-                               fp->inst[counter].inst1 = R500_RGB_ADDR0(src[0])
-                                       | R500_RGB_ADDR1(src[1]);
-                               fp->inst[counter].inst2 = R500_ALPHA_ADDR0(src[0])
-                                       | R500_ALPHA_ADDR1(src[1]);
-                               fp->inst[counter].inst3 = R500_ALU_RGB_SEL_A_SRC0
-                                       | MAKE_SWIZ_RGB_A(make_rgb_swizzle(fpi->SrcReg[0]))
-                                       | R500_ALU_RGB_SEL_B_SRC1 | MAKE_SWIZ_RGB_B(make_rgb_swizzle(fpi->SrcReg[1]));
-                               fp->inst[counter].inst4 = R500_ALPHA_OP_DP
-                                       | R500_ALPHA_ADDRD(dest)
-                                       | R500_ALPHA_SEL_A_SRC0 | MAKE_SWIZ_ALPHA_A(make_alpha_swizzle(fpi->SrcReg[0]))
-                                       | R500_ALPHA_SEL_B_SRC1 | MAKE_SWIZ_ALPHA_B(make_alpha_swizzle(fpi->SrcReg[1]));
-                               fp->inst[counter].inst5 = R500_ALU_RGBA_OP_DP4
-                                       | R500_ALU_RGBA_ADDRD(dest);
-                               break;
-                       case OPCODE_DPH:
-                               src[0] = make_src(fp, fpi->SrcReg[0]);
-                               src[1] = make_src(fp, fpi->SrcReg[1]);
-                               /* Based on DP3 */
-                               emit_alu(fp, counter, fpi);
-                               fp->inst[counter].inst1 = R500_RGB_ADDR0(src[0])
-                                       | R500_RGB_ADDR1(src[1]);
-                               fp->inst[counter].inst2 = R500_ALPHA_ADDR0(src[0])
-                                       | R500_ALPHA_ADDR1(src[1]);
-                               fp->inst[counter].inst3 = R500_ALU_RGB_SEL_A_SRC0
-                                       | MAKE_SWIZ_RGB_A(make_rgb_swizzle(fpi->SrcReg[0]))
-                                       | R500_ALU_RGB_SEL_B_SRC1 | MAKE_SWIZ_RGB_B(make_rgb_swizzle(fpi->SrcReg[1]));
-                               fp->inst[counter].inst4 = R500_ALPHA_OP_DP
-                                       | R500_ALPHA_ADDRD(dest)
-                                       | R500_ALPHA_SEL_A_SRC0 | MAKE_SWIZ_ALPHA_A(R500_SWIZZLE_ONE)
-                                       | R500_ALPHA_SEL_B_SRC1 | MAKE_SWIZ_ALPHA_B(make_alpha_swizzle(fpi->SrcReg[1]));
-                               fp->inst[counter].inst5 = R500_ALU_RGBA_OP_DP4
-                                       | R500_ALU_RGBA_ADDRD(dest);
-                               break;
-                       case OPCODE_EX2:
-                               src[0] = make_src(fp, fpi->SrcReg[0]);
-                               emit_alu(fp, counter, fpi);
-                               fp->inst[counter].inst1 = R500_RGB_ADDR0(src[0]);
-                               fp->inst[counter].inst2 = R500_ALPHA_ADDR0(src[0]);
-                               fp->inst[counter].inst3 = R500_ALU_RGB_SEL_A_SRC0
-                                       | MAKE_SWIZ_RGB_A(make_rgb_swizzle(fpi->SrcReg[0]));
-                               fp->inst[counter].inst4 = R500_ALPHA_OP_EX2
-                                       | R500_ALPHA_ADDRD(dest)
-                                       | R500_ALPHA_SEL_A_SRC0 | MAKE_SWIZ_ALPHA_A(make_alpha_swizzle(fpi->SrcReg[0]));
-                               fp->inst[counter].inst5 = R500_ALU_RGBA_OP_SOP
-                                       | R500_ALU_RGBA_ADDRD(dest);
-                               break;
-                       case OPCODE_FRC:
-                               src[0] = make_src(fp, fpi->SrcReg[0]);
-                               emit_alu(fp, counter, fpi);
-                               fp->inst[counter].inst1 = R500_RGB_ADDR0(src[0]);
-                               fp->inst[counter].inst2 = R500_ALPHA_ADDR0(src[0]);
-                               fp->inst[counter].inst3 = R500_ALU_RGB_SEL_A_SRC0
-                                       | MAKE_SWIZ_RGB_A(make_rgb_swizzle(fpi->SrcReg[0]));
-                               fp->inst[counter].inst4 = R500_ALPHA_OP_FRC
-                                       | R500_ALPHA_ADDRD(dest)
-                                       | R500_ALPHA_SEL_A_SRC0 | MAKE_SWIZ_ALPHA_A(make_alpha_swizzle(fpi->SrcReg[0]));
-                               fp->inst[counter].inst5 = R500_ALU_RGBA_OP_FRC
-                                       | R500_ALU_RGBA_ADDRD(dest);
-                               break;
-                       case OPCODE_KIL:
-                               emit_tex(fp, fpi, OPCODE_KIL, dest, counter);
-                               break;
-                       case OPCODE_LG2:
-                               src[0] = make_src(fp, fpi->SrcReg[0]);
-                               emit_alu(fp, counter, fpi);
-                               fp->inst[counter].inst1 = R500_RGB_ADDR0(src[0]);
-                               fp->inst[counter].inst2 = R500_ALPHA_ADDR0(src[0]);
-                               fp->inst[counter].inst3 = R500_ALU_RGB_SEL_A_SRC0
-                                       | MAKE_SWIZ_RGB_A(make_rgb_swizzle(fpi->SrcReg[0]));
-                               fp->inst[counter].inst4 = R500_ALPHA_OP_LN2
-                                       | R500_ALPHA_ADDRD(dest)
-                                       | R500_ALPHA_SEL_A_SRC0 | MAKE_SWIZ_ALPHA_A(make_alpha_swizzle(fpi->SrcReg[0]));
-                               fp->inst[counter].inst5 = R500_ALU_RGBA_OP_SOP
-                                       | R500_ALU_RGBA_ADDRD(dest);
-                               break;
-                       case OPCODE_MAD:
-                               src[0] = make_src(fp, fpi->SrcReg[0]);
-                               src[1] = make_src(fp, fpi->SrcReg[1]);
-                               src[2] = make_src(fp, fpi->SrcReg[2]);
-                               emit_alu(fp, counter, fpi);
-                               fp->inst[counter].inst1 = R500_RGB_ADDR0(src[0])
-                                       | R500_RGB_ADDR1(src[1]) | R500_RGB_ADDR2(src[2]);
-                               fp->inst[counter].inst2 = R500_ALPHA_ADDR0(src[0])
-                                       | R500_ALPHA_ADDR1(src[1]) | R500_ALPHA_ADDR2(src[2]);
-                               fp->inst[counter].inst3 = R500_ALU_RGB_SEL_A_SRC0
-                                       | MAKE_SWIZ_RGB_A(make_rgb_swizzle(fpi->SrcReg[0]))
-                                       | R500_ALU_RGB_SEL_B_SRC1 | MAKE_SWIZ_RGB_B(make_rgb_swizzle(fpi->SrcReg[1]));
-                               fp->inst[counter].inst4 = R500_ALPHA_OP_MAD
-                                       | R500_ALPHA_ADDRD(dest)
-                                       | R500_ALPHA_SEL_A_SRC0 | MAKE_SWIZ_ALPHA_A(make_alpha_swizzle(fpi->SrcReg[0]))
-                                       | R500_ALPHA_SEL_B_SRC1 | MAKE_SWIZ_ALPHA_B(make_alpha_swizzle(fpi->SrcReg[1]));
-                               fp->inst[counter].inst5 = R500_ALU_RGBA_OP_MAD
-                                       | R500_ALU_RGBA_ADDRD(dest)
-                                       | R500_ALU_RGBA_SEL_C_SRC2
-                                       | MAKE_SWIZ_RGBA_C(make_rgb_swizzle(fpi->SrcReg[2]))
-                                       | R500_ALU_RGBA_ALPHA_SEL_C_SRC2
-                                       | MAKE_SWIZ_ALPHA_C(make_alpha_swizzle(fpi->SrcReg[2]));
-                               break;
-                       case OPCODE_MAX:
-                               src[0] = make_src(fp, fpi->SrcReg[0]);
-                               src[1] = make_src(fp, fpi->SrcReg[1]);
-                               emit_alu(fp, counter, fpi);
-                               fp->inst[counter].inst1 = R500_RGB_ADDR0(src[0]) | R500_RGB_ADDR1(src[1]);
-                               fp->inst[counter].inst2 = R500_ALPHA_ADDR0(src[0]) | R500_ALPHA_ADDR1(src[1]);
-                               fp->inst[counter].inst3 = R500_ALU_RGB_SEL_A_SRC0
-                                       | MAKE_SWIZ_RGB_A(make_rgb_swizzle(fpi->SrcReg[0]))
-                                       | R500_ALU_RGB_SEL_B_SRC1
-                                       | MAKE_SWIZ_RGB_B(make_rgb_swizzle(fpi->SrcReg[1]));
-                               fp->inst[counter].inst4 = R500_ALPHA_OP_MAX
-                                       | R500_ALPHA_ADDRD(dest)
-                                       | R500_ALPHA_SEL_A_SRC0 | MAKE_SWIZ_ALPHA_A(make_alpha_swizzle(fpi->SrcReg[0]))
-                                       | R500_ALPHA_SEL_B_SRC1 | MAKE_SWIZ_ALPHA_B(make_alpha_swizzle(fpi->SrcReg[1]));
-                               fp->inst[counter].inst5 = R500_ALU_RGBA_OP_MAX
-                                       | R500_ALU_RGBA_ADDRD(dest);
-                               break;
-                       case OPCODE_MIN:
-                               src[0] = make_src(fp, fpi->SrcReg[0]);
-                               src[1] = make_src(fp, fpi->SrcReg[1]);
-                               emit_alu(fp, counter, fpi);
-                               fp->inst[counter].inst1 = R500_RGB_ADDR0(src[0]) | R500_RGB_ADDR1(src[1]);
-                               fp->inst[counter].inst2 = R500_ALPHA_ADDR0(src[0]) | R500_ALPHA_ADDR1(src[1]);
-                               fp->inst[counter].inst3 = R500_ALU_RGB_SEL_A_SRC0
-                                       | MAKE_SWIZ_RGB_A(make_rgb_swizzle(fpi->SrcReg[0]))
-                                       | R500_ALU_RGB_SEL_B_SRC1
-                                       | MAKE_SWIZ_RGB_B(make_rgb_swizzle(fpi->SrcReg[1]));
-                               fp->inst[counter].inst4 = R500_ALPHA_OP_MIN
-                                       | R500_ALPHA_ADDRD(dest)
-                                       | R500_ALPHA_SEL_A_SRC0 | MAKE_SWIZ_ALPHA_A(make_alpha_swizzle(fpi->SrcReg[0]))
-                                       | R500_ALPHA_SEL_B_SRC1 | MAKE_SWIZ_ALPHA_B(make_alpha_swizzle(fpi->SrcReg[1]));
-                               fp->inst[counter].inst5 = R500_ALU_RGBA_OP_MIN
-                                       | R500_ALU_RGBA_ADDRD(dest);
-                               break;
-                       case OPCODE_MOV:
-                               emit_alu(fp, counter, fpi);
-                               emit_mov(fp, counter, fpi->SrcReg[0], dest);
-                               break;
-                       case OPCODE_MUL:
-                               src[0] = make_src(fp, fpi->SrcReg[0]);
-                               src[1] = make_src(fp, fpi->SrcReg[1]);
-                               /* Variation on MAD: src0*src1+0 */
-                               emit_alu(fp, counter, fpi);
-                               fp->inst[counter].inst1 = R500_RGB_ADDR0(src[0])
-                                       | R500_RGB_ADDR1(src[1]);
-                               fp->inst[counter].inst2 = R500_ALPHA_ADDR0(src[0])
-                                       | R500_ALPHA_ADDR1(src[1]);
-                               fp->inst[counter].inst3 = R500_ALU_RGB_SEL_A_SRC0
-                                       | MAKE_SWIZ_RGB_A(make_rgb_swizzle(fpi->SrcReg[0]))
-                                       | R500_ALU_RGB_SEL_B_SRC1 | MAKE_SWIZ_RGB_B(make_rgb_swizzle(fpi->SrcReg[1]));
-                               fp->inst[counter].inst4 = R500_ALPHA_OP_MAD
-                                       | R500_ALPHA_ADDRD(dest)
-                                       | R500_ALPHA_SEL_A_SRC0 | MAKE_SWIZ_ALPHA_A(make_alpha_swizzle(fpi->SrcReg[0]))
-                                       | R500_ALPHA_SEL_B_SRC1 | MAKE_SWIZ_ALPHA_B(make_alpha_swizzle(fpi->SrcReg[1]));
-                               fp->inst[counter].inst5 = R500_ALU_RGBA_OP_MAD
-                                       | R500_ALU_RGBA_ADDRD(dest)
-                                       // | R500_ALU_RGBA_SEL_C_SRC2
-                                       | MAKE_SWIZ_RGBA_C(R500_SWIZ_RGB_ZERO)
-                                       // | R500_ALU_RGBA_ALPHA_SEL_C_SRC2
-                                       | MAKE_SWIZ_ALPHA_C(R500_SWIZZLE_ZERO);
-                               break;
-                       case OPCODE_RCP:
-                               src[0] = make_src(fp, fpi->SrcReg[0]);
-                               emit_alu(fp, counter, fpi);
-                               fp->inst[counter].inst1 = R500_RGB_ADDR0(src[0]);
-                               fp->inst[counter].inst2 = R500_ALPHA_ADDR0(src[0]);
-                               fp->inst[counter].inst3 = R500_ALU_RGB_SEL_A_SRC0
-                                       | MAKE_SWIZ_RGB_A(make_rgb_swizzle(fpi->SrcReg[0]));
-                               fp->inst[counter].inst4 = R500_ALPHA_OP_RCP
-                                       | R500_ALPHA_ADDRD(dest)
-                                       | R500_ALPHA_SEL_A_SRC0 | MAKE_SWIZ_ALPHA_A(make_alpha_swizzle(fpi->SrcReg[0]));
-                               fp->inst[counter].inst5 = R500_ALU_RGBA_OP_SOP
-                                       | R500_ALU_RGBA_ADDRD(dest);
-                               break;
-                       case OPCODE_RSQ:
-                               src[0] = make_src(fp, fpi->SrcReg[0]);
-                               emit_alu(fp, counter, fpi);
-                               fp->inst[counter].inst1 = R500_RGB_ADDR0(src[0]);
-                               fp->inst[counter].inst2 = R500_ALPHA_ADDR0(src[0]);
-                               fp->inst[counter].inst3 = R500_ALU_RGB_SEL_A_SRC0
-                                       | MAKE_SWIZ_RGB_A(make_rgb_swizzle(fpi->SrcReg[0]));
-                               fp->inst[counter].inst4 = R500_ALPHA_OP_RSQ
-                                       | R500_ALPHA_ADDRD(dest)
-                                       | R500_ALPHA_SEL_A_SRC0 | MAKE_SWIZ_ALPHA_A(make_alpha_swizzle(fpi->SrcReg[0]));
-                               fp->inst[counter].inst5 = R500_ALU_RGBA_OP_SOP
-                                       | R500_ALU_RGBA_ADDRD(dest);
-                               break;
-                       case OPCODE_SCS:
-                               /* TODO: Make this elegant! */
-                               /* Do a cosine, then a sine, masking out the channels we want to protect. */
-                               src[0] = make_src(fp, fpi->SrcReg[0]);
-                               /* Cosine only goes in R (x) channel. */
-                               fpi->DstReg.WriteMask = 0x1;
-                               emit_alu(fp, counter, fpi);
-                               if (fpi->DstReg.File == PROGRAM_OUTPUT) {
-                                       fp->inst[counter].inst0 = R500_INST_TYPE_OUT
-                                               | R500_INST_TEX_SEM_WAIT | 0x1 << 14;
-                               } else {
-                                       fp->inst[counter].inst0 = R500_INST_TYPE_ALU
-                                               | R500_INST_TEX_SEM_WAIT | 0x1 << 11;
-                               }
-                               fp->inst[counter].inst1 = R500_RGB_ADDR0(src[0]);
-                               fp->inst[counter].inst2 = R500_ALPHA_ADDR0(src[0]);
-                               fp->inst[counter].inst3 = R500_ALU_RGB_SEL_A_SRC0
-                                       | MAKE_SWIZ_RGB_A(make_rgb_swizzle(fpi->SrcReg[0]));
-                               fp->inst[counter].inst4 = R500_ALPHA_OP_COS
-                                       | R500_ALPHA_ADDRD(dest)
-                                       | R500_ALPHA_SEL_A_SRC0 | MAKE_SWIZ_ALPHA_A(make_alpha_swizzle(fpi->SrcReg[0]));
-                               fp->inst[counter].inst5 = R500_ALU_RGBA_OP_SOP
-                                       | R500_ALU_RGBA_ADDRD(dest);
-                               counter++;
-                               /* Sine only goes in G (y) channel. */
-                               fpi->DstReg.WriteMask = 0x2;
-                               emit_alu(fp, counter, fpi);
-                               fp->inst[counter].inst1 = R500_RGB_ADDR0(src[0]);
-                               fp->inst[counter].inst2 = R500_ALPHA_ADDR0(src[0]);
-                               fp->inst[counter].inst3 = R500_ALU_RGB_SEL_A_SRC0
-                                       | MAKE_SWIZ_RGB_A(make_rgb_swizzle(fpi->SrcReg[0]));
-                               fp->inst[counter].inst4 = R500_ALPHA_OP_SIN
-                                       | R500_ALPHA_ADDRD(dest)
-                                       | R500_ALPHA_SEL_A_SRC0 | MAKE_SWIZ_ALPHA_A(make_alpha_swizzle(fpi->SrcReg[0]));
-                               fp->inst[counter].inst5 = R500_ALU_RGBA_OP_SOP
-                                       | R500_ALU_RGBA_ADDRD(dest);
-                               counter++;
-                               /* Put 0 into B,A (z,w) channels. */
-                               fpi->DstReg.WriteMask = 0xC;
-                               emit_alu(fp, counter, fpi);
-                               fp->inst[counter].inst1 = R500_RGB_ADDR0(src[0]);
-                               fp->inst[counter].inst2 = R500_ALPHA_ADDR0(src[0]);
-                               fp->inst[counter].inst3 = R500_ALU_RGB_SEL_A_SRC0
-                                       | MAKE_SWIZ_RGB_A(R500_SWIZ_RGB_ZERO)
-                                       | R500_ALU_RGB_SEL_B_SRC0
-                                       | MAKE_SWIZ_RGB_B(R500_SWIZ_RGB_ZERO);
-                               fp->inst[counter].inst4 = R500_ALPHA_OP_CMP
-                                       | R500_ALPHA_ADDRD(dest)
-                                       | R500_ALPHA_SEL_A_SRC0 | MAKE_SWIZ_ALPHA_A(R500_SWIZZLE_ZERO)
-                                       | R500_ALPHA_SEL_B_SRC0 | MAKE_SWIZ_ALPHA_B(R500_SWIZZLE_ZERO);
-                               fp->inst[counter].inst5 = R500_ALU_RGBA_OP_CMP
-                                       | R500_ALU_RGBA_ADDRD(dest)
-                                       | MAKE_SWIZ_RGBA_C(R500_SWIZ_RGB_ZERO)
-                                       | MAKE_SWIZ_ALPHA_C(R500_SWIZZLE_ZERO);
-                               break;
-                       case OPCODE_SIN:
-                               src[0] = make_src(fp, fpi->SrcReg[0]);
-                               emit_alu(fp, counter, fpi);
-                               fp->inst[counter].inst1 = R500_RGB_ADDR0(src[0]);
-                               fp->inst[counter].inst2 = R500_ALPHA_ADDR0(src[0]);
-                               fp->inst[counter].inst3 = R500_ALU_RGB_SEL_A_SRC0
-                                       | MAKE_SWIZ_RGB_A(make_rgb_swizzle(fpi->SrcReg[0]));
-                               fp->inst[counter].inst4 = R500_ALPHA_OP_SIN
-                                       | R500_ALPHA_ADDRD(dest)
-                                       | R500_ALPHA_SEL_A_SRC0 | MAKE_SWIZ_ALPHA_A(make_alpha_swizzle(fpi->SrcReg[0]));
-                               fp->inst[counter].inst5 = R500_ALU_RGBA_OP_SOP
-                                       | R500_ALU_RGBA_ADDRD(dest);
-                               break;
-                       case OPCODE_SUB:
-                               src[0] = make_src(fp, fpi->SrcReg[0]);
-                               src[1] = make_src(fp, fpi->SrcReg[1]);
-                               /* Variation on MAD: 1*src0-src1 */
-                               emit_alu(fp, counter, fpi);
-                               fp->inst[counter].inst1 = R500_RGB_ADDR1(src[0])
-                                       | R500_RGB_ADDR2(src[1]);
-                               fp->inst[counter].inst2 = R500_ALPHA_ADDR1(src[0])
-                                       | R500_ALPHA_ADDR2(src[1]);
-                               fp->inst[counter].inst3 = /* 1 */
-                                       MAKE_SWIZ_RGB_A(R500_SWIZ_RGB_ONE)
-                                       | R500_ALU_RGB_SEL_B_SRC1 | MAKE_SWIZ_RGB_B(make_rgb_swizzle(fpi->SrcReg[0]));
-                               fp->inst[counter].inst4 = R500_ALPHA_OP_MAD
-                                       | R500_ALPHA_ADDRD(dest)
-                                       | R500_ALPHA_SEL_A_SRC0 | MAKE_SWIZ_ALPHA_A(R500_SWIZZLE_ONE)
-                                       | R500_ALPHA_SEL_B_SRC1 | MAKE_SWIZ_ALPHA_B(make_alpha_swizzle(fpi->SrcReg[0]));
-                               fp->inst[counter].inst5 = R500_ALU_RGBA_OP_MAD
-                                       | R500_ALU_RGBA_ADDRD(dest)
-                                       | R500_ALU_RGBA_SEL_C_SRC2
-                                       | MAKE_SWIZ_RGBA_C(make_rgb_swizzle(fpi->SrcReg[1]))
-                                       | R500_ALU_RGBA_MOD_C_NEG
-                                       | R500_ALU_RGBA_ALPHA_SEL_C_SRC2
-                                       | MAKE_SWIZ_ALPHA_C(make_alpha_swizzle(fpi->SrcReg[1]))
-                                       | R500_ALU_RGBA_ALPHA_MOD_C_NEG;
-                               break;
-                       case OPCODE_SWZ:
-                               /* TODO: Negation masks! */
-                               emit_alu(fp, counter, fpi);
-                               emit_mov(fp, counter, fpi->SrcReg[0], dest);
-                               break;
-                       case OPCODE_TEX:
-                               emit_tex(fp, fpi, OPCODE_TEX, dest, counter);
-                               break;
-                       case OPCODE_TXB:
-                               emit_tex(fp, fpi, OPCODE_TXB, dest, counter);
-                               break;
-                       case OPCODE_TXP:
-                               emit_tex(fp, fpi, OPCODE_TXP, dest, counter);
-                               break;
-                       default:
-                               ERROR("unknown fpi->Opcode %d\n", fpi->Opcode);
-                               break;
-               }
+       for(unit = 0; unit < 16; ++unit) {
+               if (fp->mesa_program.Base.ShadowSamplers & (1 << unit)) {
+                       struct gl_texture_object* tex = r300->radeon.glCtx->Texture.Unit[unit]._Current;
 
-               /* Finishing touches */
-               if (fpi->SaturateMode == SATURATE_ZERO_ONE) {
-                       fp->inst[counter].inst0 |= R500_INST_RGB_CLAMP | R500_INST_ALPHA_CLAMP;
+                       state->unit[unit].depth_texture_mode = build_dtm(tex->DepthMode);
+                       state->unit[unit].texture_compare_func = build_func(tex->CompareFunc);
                }
-
-               counter++;
-
-               if (fp->error)
-                       return GL_FALSE;
-
        }
-
-       /* Finish him! (If it's an ALU/OUT instruction...) */
-       if ((fp->inst[counter-1].inst0 & 0x3) == 1) {
-               fp->inst[counter-1].inst0 |= R500_INST_LAST;
-       } else {
-               /* We still need to put an output inst, right? */
-               WARN_ONCE("Final FP instruction is not an OUT.\n");
-#if 0
-               fp->inst[counter].inst0 = R500_INST_TYPE_OUT
-                       | R500_INST_TEX_SEM_WAIT | R500_INST_LAST |
-                       output_mask;
-               fp->inst[counter].inst1 = R500_RGB_ADDR0(dest);
-               fp->inst[counter].inst2 = R500_ALPHA_ADDR0(dest);
-               fp->inst[counter].inst3 = R500_ALU_RGB_SEL_A_SRC0
-                       | MAKE_SWIZ_RGB_A(R500_SWIZ_RGB_RGB)
-                       | R500_ALU_RGB_SEL_B_SRC0
-                       | MAKE_SWIZ_RGB_B(R500_SWIZ_RGB_ONE);
-               fp->inst[counter].inst4 = R500_ALPHA_OP_MAD
-                       | R500_ALPHA_ADDRD(0)
-                       | R500_ALPHA_SEL_A_SRC0 | R500_ALPHA_SEL_B_SRC0 
-                       | R500_ALPHA_SWIZ_A_A | R500_ALPHA_SWIZ_B_1;
-               fp->inst[counter].inst5 = R500_ALU_RGBA_OP_MAD
-                       | R500_ALU_RGBA_ADDRD(0)
-                       | MAKE_SWIZ_RGBA_C(R500_SWIZ_RGB_ZERO)
-                       | MAKE_SWIZ_ALPHA_C(R500_SWIZZLE_ZERO);
-               counter++;
-#endif
-       }
-
-       fp->cs->nrslots = counter;
-
-       fp->max_temp_idx++;
-
-       return GL_TRUE;
 }
 
-static void init_program(r300ContextPtr r300, struct r500_fragment_program *fp)
+static void dump_program(struct r500_fragment_program_code *code);
+
+void r500TranslateFragmentShader(r300ContextPtr r300,
+                                struct r500_fragment_program *fp)
 {
-       struct r300_pfs_compile_state *cs = NULL;
-       struct gl_fragment_program *mp = &fp->mesa_program;
-       struct prog_instruction *fpi;
-       GLuint InputsRead = mp->Base.InputsRead;
-       GLuint temps_used = 0;  /* for fp->temps[] */
-       int i, j;
-
-       /* New compile, reset tracking data */
-       fp->optimization =
-           driQueryOptioni(&r300->radeon.optionCache, "fp_optimization");
-       fp->translated = GL_FALSE;
-       fp->error = GL_FALSE;
-       fp->cs = cs = &(R300_CONTEXT(fp->ctx)->state.pfs_compile);
-       fp->cur_node = 0;
-       fp->first_node_has_tex = 0;
-       fp->const_nr = 0;
-       /* Size of pixel stack, plus 1. */
-       fp->max_temp_idx = 1;
-       /* Temp register offset. */
-       fp->temp_reg_offset = 0;
-       fp->node[0].alu_end = -1;
-       fp->node[0].tex_end = -1;
-
-       _mesa_memset(cs, 0, sizeof(*fp->cs));
-       for (i = 0; i < PFS_MAX_ALU_INST; i++) {
-               for (j = 0; j < 3; j++) {
-                       cs->slot[i].vsrc[j] = SRC_CONST;
-                       cs->slot[i].ssrc[j] = SRC_CONST;
-               }
-       }
+       struct r500_fragment_program_external_state state;
 
-       /* Work out what temps the Mesa inputs correspond to, this must match
-        * what setup_rs_unit does, which shouldn't be a problem as rs_unit
-        * configures itself based on the fragprog's InputsRead
-        *
-        * NOTE: this depends on get_hw_temp() allocating registers in order,
-        * starting from register 0, so we're just going to do that instead.
-        */
-
-       /* Texcoords come first */
-       for (i = 0; i < fp->ctx->Const.MaxTextureUnits; i++) {
-               if (InputsRead & (FRAG_BIT_TEX0 << i)) {
-                       cs->inputs[FRAG_ATTRIB_TEX0 + i].refcount = 0;
-                       cs->inputs[FRAG_ATTRIB_TEX0 + i].reg =
-                               fp->temp_reg_offset;
-                       fp->temp_reg_offset++;
-               }
-       }
-       InputsRead &= ~FRAG_BITS_TEX_ANY;
-
-       /* fragment position treated as a texcoord */
-       if (InputsRead & FRAG_BIT_WPOS) {
-               cs->inputs[FRAG_ATTRIB_WPOS].refcount = 0;
-               cs->inputs[FRAG_ATTRIB_WPOS].reg =
-                       fp->temp_reg_offset;
-               fp->temp_reg_offset++;
-       }
-       InputsRead &= ~FRAG_BIT_WPOS;
-
-       /* Then primary colour */
-       if (InputsRead & FRAG_BIT_COL0) {
-               cs->inputs[FRAG_ATTRIB_COL0].refcount = 0;
-               cs->inputs[FRAG_ATTRIB_COL0].reg =
-                       fp->temp_reg_offset;
-               fp->temp_reg_offset++;
-       }
-       InputsRead &= ~FRAG_BIT_COL0;
-
-       /* Secondary color */
-       if (InputsRead & FRAG_BIT_COL1) {
-               cs->inputs[FRAG_ATTRIB_COL1].refcount = 0;
-               cs->inputs[FRAG_ATTRIB_COL1].reg =
-                       fp->temp_reg_offset;
-               fp->temp_reg_offset++;
-       }
-       InputsRead &= ~FRAG_BIT_COL1;
-
-       /* Anything else */
-       if (InputsRead) {
-               WARN_ONCE("Don't know how to handle inputs 0x%x\n", InputsRead);
-               /* force read from hwreg 0 for now */
-               for (i = 0; i < 32; i++)
-                       if (InputsRead & (1 << i))
-                               cs->inputs[i].reg = 0;
+       build_state(r300, fp, &state);
+       if (_mesa_memcmp(&fp->state, &state, sizeof(state))) {
+               /* TODO: cache compiled programs */
+               fp->translated = GL_FALSE;
+               _mesa_memcpy(&fp->state, &state, sizeof(state));
        }
 
-       /* Pre-parse the mesa program, grabbing refcounts on input/temp regs.
-        * That way, we can free up the reg when it's no longer needed
-        */
-       if (!mp->Base.Instructions) {
-               ERROR("No instructions found in program, going to go die now.\n");
-               return;
-       }
+       if (!fp->translated) {
+               struct r500_fragment_program_compiler compiler;
 
-#if 0
-       for (fpi = mp->Base.Instructions; fpi->Opcode != OPCODE_END; fpi++) {
-               int idx;
-               for (i = 0; i < 3; i++) {
-                       idx = fpi->SrcReg[i].Index;
-                       if (fpi->SrcReg[i].File == PROGRAM_INPUT) {
-                               cs->inputs[idx].refcount++;
-                               if (fp->max_temp_idx < idx)
-                                       fp->max_temp_idx = idx;
-                       }
-               }
-       }
-#endif
+               compiler.r300 = r300;
+               compiler.fp = fp;
+               compiler.code = &fp->code;
 
-       fp->max_temp_idx = fp->temp_reg_offset + 1;
+               radeonCompilerInit(&compiler.compiler, r300->radeon.glCtx, &fp->mesa_program.Base);
 
-       cs->temp_in_use = temps_used;
-}
+               insert_WPOS_trailer(&compiler);
 
-static void update_params(struct r500_fragment_program *fp)
-{
-       struct gl_fragment_program *mp = &fp->mesa_program;
+               struct radeon_program_transformation transformations[1] = {
+                       { &transform_TEX, &compiler }
+               };
+               radeonClauseLocalTransform(&compiler.compiler,
+                       &compiler.compiler.Clauses[0],
+                       1, transformations);
 
-       /* Ask Mesa nicely to fill in ParameterValues for us */
-       if (mp->Base.Parameters)
-               _mesa_load_state_parameters(fp->ctx, mp->Base.Parameters);
-}
+               if (RADEON_DEBUG & DEBUG_PIXEL) {
+                       _mesa_printf("Compiler state after transformations:\n");
+                       radeonCompilerDump(&compiler.compiler);
+               }
 
-void r500TranslateFragmentShader(r300ContextPtr r300,
-                                struct r500_fragment_program *fp)
-{
+               fp->translated = r500FragmentProgramEmit(&compiler);
 
-       struct r300_pfs_compile_state *cs = NULL;
+               radeonCompilerCleanup(&compiler.compiler);
 
-       if (!fp->translated) {
+               r300UpdateStateParameters(r300->radeon.glCtx, _NEW_PROGRAM);
 
-               /* I need to see what I'm working with! */
-               fprintf(stderr, "Mesa program:\n");
-               fprintf(stderr, "-------------\n");
-               _mesa_print_program(&fp->mesa_program.Base);
-               fflush(stdout);
-
-               init_program(r300, fp);
-               cs = fp->cs;
-
-               if (parse_program(fp) == GL_FALSE) {
-                       ERROR("Huh. Couldn't parse program. There should be additional errors explaining why.\nUsing dumb shader...\n");
-                       dumb_shader(fp);
-                       fp->inst_offset = 0;
-                       fp->inst_end = cs->nrslots - 1;
-                       return;
+               if (RADEON_DEBUG & DEBUG_PIXEL) {
+                       fprintf(stderr, "Mesa program:\n");
+                       fprintf(stderr, "-------------\n");
+                       _mesa_print_program(&fp->mesa_program.Base);
+                       fflush(stdout);
+                       if (fp->translated)
+                               dump_program(&fp->code);
                }
-               fp->inst_offset = 0;
-               fp->inst_end = cs->nrslots - 1;
-
-               fp->translated = GL_TRUE;
-               if (RADEON_DEBUG & DEBUG_PIXEL)
-                 dump_program(fp);
 
-               r300UpdateStateParameters(fp->ctx, _NEW_PROGRAM);
        }
 
-       update_params(fp);
+       update_params(r300, fp);
 
 }
 
@@ -1012,11 +359,12 @@ static char *toswiz(int swiz_val) {
   case 6: return "1";
   case 7: return "U";
   }
+  return NULL;
 }
 
 static char *toop(int op_val)
 {
-  char *str;
+  char *str = NULL;
   switch (op_val) {
   case 0: str = "MAD"; break;
   case 1: str = "DP3"; break;
@@ -1037,7 +385,7 @@ static char *toop(int op_val)
 
 static char *to_alpha_op(int op_val)
 {
-  char *str;
+  char *str = NULL;
   switch (op_val) {
   case 0: str = "MAD"; break;
   case 1: str = "DP"; break;
@@ -1059,16 +407,66 @@ static char *to_alpha_op(int op_val)
   return str;
 }
 
-static void dump_program(struct r500_fragment_program *fp)
+static char *to_mask(int val)
+{
+  char *str = NULL;
+  switch(val) {
+  case 0: str = "NONE"; break;
+  case 1: str = "R"; break;
+  case 2: str = "G"; break;
+  case 3: str = "RG"; break;
+  case 4: str = "B"; break;
+  case 5: str = "RB"; break;
+  case 6: str = "GB"; break;
+  case 7: str = "RGB"; break;
+  case 8: str = "A"; break;
+  case 9: str = "AR"; break;
+  case 10: str = "AG"; break;
+  case 11: str = "ARG"; break;
+  case 12: str = "AB"; break;
+  case 13: str = "ARB"; break;
+  case 14: str = "AGB"; break;
+  case 15: str = "ARGB"; break;
+  }
+  return str;
+}
+
+static char *to_texop(int val)
 {
-  int pc = 0;
+  switch(val) {
+  case 0: return "NOP";
+  case 1: return "LD";
+  case 2: return "TEXKILL";
+  case 3: return "PROJ";
+  case 4: return "LODBIAS";
+  case 5: return "LOD";
+  case 6: return "DXDY";
+  }
+  return NULL;
+}
+
+static void dump_program(struct r500_fragment_program_code *code)
+{
+
+  fprintf(stderr, "R500 Fragment Program:\n--------\n");
+
   int n;
   uint32_t inst;
   uint32_t inst0;
-  char *str;
+  char *str = NULL;
+
+  if (code->const_nr) {
+    fprintf(stderr, "--------\nConstants:\n");
+    for (n = 0; n < code->const_nr; n++) {
+      fprintf(stderr, "Constant %d: %f %f\n\t %f %f\n", n,
+        code->constant[n][0], code->constant[n][1], code->constant[n][2],
+        code->constant[n][3]);
+    }
+    fprintf(stderr, "--------\n");
+  }
 
-  for (n = 0; n < fp->inst_end+1; n++) {
-    inst0 = inst = fp->inst[n].inst0;
+  for (n = 0; n < code->inst_end+1; n++) {
+    inst0 = inst = code->inst[n].inst0;
     fprintf(stderr,"%d\t0:CMN_INST   0x%08x:", n, inst);
     switch(inst & 0x3) {
     case R500_INST_TYPE_ALU: str = "ALU"; break;
@@ -1081,13 +479,14 @@ static void dump_program(struct r500_fragment_program *fp)
            inst & R500_INST_LAST ? "LAST" : "",
            inst & R500_INST_NOP ? "NOP" : "",
            inst & R500_INST_ALU_WAIT ? "ALU WAIT" : "");
-    fprintf(stderr,"%x %x\n", (inst >> 11) & 0xf, (inst >> 15) & 0xf);
+    fprintf(stderr,"wmask: %s omask: %s\n", to_mask((inst >> 11) & 0xf),
+           to_mask((inst >> 15) & 0xf));
 
     switch(inst0 & 0x3) {
     case 0:
     case 1:
-      fprintf(stderr,"\t1:RGB_ADDR   0x%08x:", fp->inst[n].inst1);
-      inst = fp->inst[n].inst1;
+      fprintf(stderr,"\t1:RGB_ADDR   0x%08x:", code->inst[n].inst1);
+      inst = code->inst[n].inst1;
 
       fprintf(stderr,"Addr0: %d%c, Addr1: %d%c, Addr2: %d%c, srcp:%d\n",
              inst & 0xff, (inst & (1<<8)) ? 'c' : 't',
@@ -1095,47 +494,58 @@ static void dump_program(struct r500_fragment_program *fp)
              (inst >> 20) & 0xff, (inst & (1<<28)) ? 'c' : 't',
              (inst >> 30));
 
-      fprintf(stderr,"\t2:ALPHA_ADDR 0x%08x:", fp->inst[n].inst2);
-      inst = fp->inst[n].inst2;
+      fprintf(stderr,"\t2:ALPHA_ADDR 0x%08x:", code->inst[n].inst2);
+      inst = code->inst[n].inst2;
       fprintf(stderr,"Addr0: %d%c, Addr1: %d%c, Addr2: %d%c, srcp:%d\n",
              inst & 0xff, (inst & (1<<8)) ? 'c' : 't',
              (inst >> 10) & 0xff, (inst & (1<<18)) ? 'c' : 't',
              (inst >> 20) & 0xff, (inst & (1<<28)) ? 'c' : 't',
              (inst >> 30));
-      fprintf(stderr,"\t3 RGB_INST:  0x%08x:", fp->inst[n].inst3);
-      inst = fp->inst[n].inst3;
+      fprintf(stderr,"\t3 RGB_INST:  0x%08x:", code->inst[n].inst3);
+      inst = code->inst[n].inst3;
       fprintf(stderr,"rgb_A_src:%d %s/%s/%s %d rgb_B_src:%d %s/%s/%s %d\n",
-             (inst) & 0x3, toswiz((inst >> 2) & 0x7), toswiz((inst >> 5) & 0x7), toswiz((inst >> 8) & 0x7), 
+             (inst) & 0x3, toswiz((inst >> 2) & 0x7), toswiz((inst >> 5) & 0x7), toswiz((inst >> 8) & 0x7),
              (inst >> 11) & 0x3,
-             (inst >> 13) & 0x3, toswiz((inst >> 15) & 0x7), toswiz((inst >> 18) & 0x7), toswiz((inst >> 21) & 0x7), 
+             (inst >> 13) & 0x3, toswiz((inst >> 15) & 0x7), toswiz((inst >> 18) & 0x7), toswiz((inst >> 21) & 0x7),
              (inst >> 24) & 0x3);
 
 
-      fprintf(stderr,"\t4 ALPHA_INST:0x%08x:", fp->inst[n].inst4);
-      inst = fp->inst[n].inst4;
-      fprintf(stderr,"%s dest:%d%s alp_A_src:%d %s %d alp_b_src:%d %s %d\n", to_alpha_op(inst & 0xf),
+      fprintf(stderr,"\t4 ALPHA_INST:0x%08x:", code->inst[n].inst4);
+      inst = code->inst[n].inst4;
+      fprintf(stderr,"%s dest:%d%s alp_A_src:%d %s %d alp_B_src:%d %s %d w:%d\n", to_alpha_op(inst & 0xf),
              (inst >> 4) & 0x7f, inst & (1<<11) ? "(rel)":"",
              (inst >> 12) & 0x3, toswiz((inst >> 14) & 0x7), (inst >> 17) & 0x3,
-             (inst >> 19) & 0x3, toswiz((inst >> 21) & 0x7), (inst >> 24) & 0x3);
+             (inst >> 19) & 0x3, toswiz((inst >> 21) & 0x7), (inst >> 24) & 0x3,
+             (inst >> 31) & 0x1);
 
-      fprintf(stderr,"\t5 RGBA_INST: 0x%08x:", fp->inst[n].inst5);
-      inst = fp->inst[n].inst5;
+      fprintf(stderr,"\t5 RGBA_INST: 0x%08x:", code->inst[n].inst5);
+      inst = code->inst[n].inst5;
       fprintf(stderr,"%s dest:%d%s rgb_C_src:%d %s/%s/%s %d alp_C_src:%d %s %d\n", toop(inst & 0xf),
              (inst >> 4) & 0x7f, inst & (1<<11) ? "(rel)":"",
-             (inst >> 12) & 0x3, toswiz((inst >> 14) & 0x7), toswiz((inst >> 17) & 0x7), toswiz((inst >> 20) & 0x7), 
+             (inst >> 12) & 0x3, toswiz((inst >> 14) & 0x7), toswiz((inst >> 17) & 0x7), toswiz((inst >> 20) & 0x7),
              (inst >> 23) & 0x3,
              (inst >> 25) & 0x3, toswiz((inst >> 27) & 0x7), (inst >> 30) & 0x3);
       break;
     case 2:
       break;
     case 3:
-      fprintf(stderr,"1: TEX INST 0x%08x\n", fp->inst[n].inst1);
-      fprintf(stderr,"2: TEX ADDR 0x%08x\n", fp->inst[n].inst2);
-      fprintf(stderr,"2: TEX ADDR DXDY 0x%08x\n", fp->inst[n].inst3);
+      inst = code->inst[n].inst1;
+      fprintf(stderr,"\t1:TEX_INST:  0x%08x: id: %d op:%s, %s, %s %s\n", inst, (inst >> 16) & 0xf,
+             to_texop((inst >> 22) & 0x7), (inst & (1<<25)) ? "ACQ" : "",
+             (inst & (1<<26)) ? "IGNUNC" : "", (inst & (1<<27)) ? "UNSCALED" : "SCALED");
+      inst = code->inst[n].inst2;
+      fprintf(stderr,"\t2:TEX_ADDR:  0x%08x: src: %d%s %s/%s/%s/%s dst: %d%s %s/%s/%s/%s\n", inst,
+             inst & 127, inst & (1<<7) ? "(rel)" : "",
+             toswiz((inst >> 8) & 0x3), toswiz((inst >> 10) & 0x3),
+             toswiz((inst >> 12) & 0x3), toswiz((inst >> 14) & 0x3),
+             (inst >> 16) & 127, inst & (1<<23) ? "(rel)" : "",
+             toswiz((inst >> 24) & 0x3), toswiz((inst >> 26) & 0x3),
+             toswiz((inst >> 28) & 0x3), toswiz((inst >> 30) & 0x3));
+
+      fprintf(stderr,"\t3:TEX_DXDY:  0x%08x\n", code->inst[n].inst3);
       break;
     }
     fprintf(stderr,"\n");
   }
 
-    
 }