OSDN Git Service

r300: Fix WRITEMASK handling when writing to result.depth
[android-x86/external-mesa.git] / src / mesa / drivers / dri / r300 / r300_fragprog.c
index de6a36f..fb559e8 100644 (file)
 /*
  * Authors:
  *   Ben Skeggs <darktama@iinet.net.au>
+ *   Jerome Glisse <j.glisse@gmail.com>
  */
 
 /*TODO'S
  *
- * - Implement remaining arb_f_p opcodes
- * - Depth write
- * - Negate on individual components (implement in swizzle code?)
- * - Reuse input/temp regs, if they're no longer needed.
- * - Find out whether there's any benifit in ordering registers the way
- *   fglrx does (see r300_reg.h).
+ * - Depth write, WPOS/FOGC inputs
+ * - FogOption
  * - Verify results of opcodes for accuracy, I've only checked them
  *   in specific cases.
- * - Learn more about interaction between xyz/w units.. A few bugs are
- *   caused by something I'm missing..
  * - and more...
  */
 
 #include "enums.h"
 
 #include "program.h"
-#include "nvfragprog.h"
+#include "program_instruction.h"
 #include "r300_context.h"
-#if USE_ARB_F_P == 1
 #include "r300_fragprog.h"
 #include "r300_reg.h"
+#include "r300_state.h"
+
+/*
+ * Usefull macros and values
+ */
+#define ERROR(fmt, args...) do {                       \
+               fprintf(stderr, "%s::%s(): " fmt "\n",  \
+                       __FILE__, __func__, ##args);    \
+               rp->error = GL_TRUE;                    \
+       } while(0)
 
 #define PFS_INVAL 0xFFFFFFFF
+#define COMPILE_STATE struct r300_pfs_compile_state *cs = rp->cs
 
-static void dump_program(struct r300_fragment_program *rp);
-static void emit_arith(struct r300_fragment_program *rp, int op,
-                               pfs_reg_t dest, int mask,
-                               pfs_reg_t src0, pfs_reg_t src1, pfs_reg_t src2,
-                               int flags);
+#define SWIZZLE_XYZ            0
+#define SWIZZLE_XXX            1
+#define SWIZZLE_YYY            2
+#define SWIZZLE_ZZZ            3
+#define SWIZZLE_WWW            4
+#define SWIZZLE_YZX            5
+#define SWIZZLE_ZXY            6
+#define SWIZZLE_WZY            7
+#define SWIZZLE_111            8
+#define SWIZZLE_000            9
+#define SWIZZLE_HHH            10
+
+#define swizzle(r, x, y, z, w) do_swizzle(rp, r,               \
+                                         ((SWIZZLE_##x<<0)|    \
+                                          (SWIZZLE_##y<<3)|    \
+                                          (SWIZZLE_##z<<6)|    \
+                                          (SWIZZLE_##w<<9)),   \
+                                         0)
+
+#define REG_TYPE_INPUT         0
+#define REG_TYPE_OUTPUT                1
+#define REG_TYPE_TEMP          2
+#define REG_TYPE_CONST         3
+
+#define REG_TYPE_SHIFT         0
+#define REG_INDEX_SHIFT                2
+#define REG_VSWZ_SHIFT         8
+#define REG_SSWZ_SHIFT         13
+#define REG_NEGV_SHIFT         18
+#define REG_NEGS_SHIFT         19
+#define REG_ABS_SHIFT          20
+#define REG_NO_USE_SHIFT       21 // Hack for refcounting
+#define REG_VALID_SHIFT                22 // Does the register contain a defined value?
+#define REG_BUILTIN_SHIFT   23 // Is it a builtin (like all zero/all one)?
+
+#define REG_TYPE_MASK          (0x03 << REG_TYPE_SHIFT)
+#define REG_INDEX_MASK         (0x3F << REG_INDEX_SHIFT)
+#define REG_VSWZ_MASK          (0x1F << REG_VSWZ_SHIFT)
+#define REG_SSWZ_MASK          (0x1F << REG_SSWZ_SHIFT)
+#define REG_NEGV_MASK          (0x01 << REG_NEGV_SHIFT)
+#define REG_NEGS_MASK          (0x01 << REG_NEGS_SHIFT)
+#define REG_ABS_MASK           (0x01 << REG_ABS_SHIFT)
+#define REG_NO_USE_MASK                (0x01 << REG_NO_USE_SHIFT)
+#define REG_VALID_MASK         (0x01 << REG_VALID_SHIFT)
+#define REG_BUILTIN_MASK       (0x01 << REG_BUILTIN_SHIFT)
+
+#define REG(type, index, vswz, sswz, nouse, valid, builtin)    \
+       (((type << REG_TYPE_SHIFT) & REG_TYPE_MASK) |                   \
+        ((index << REG_INDEX_SHIFT) & REG_INDEX_MASK) |                \
+        ((nouse << REG_NO_USE_SHIFT) & REG_NO_USE_MASK) |              \
+        ((valid << REG_VALID_SHIFT) & REG_VALID_MASK) |                \
+        ((builtin << REG_BUILTIN_SHIFT) & REG_BUILTIN_MASK) |  \
+        ((vswz << REG_VSWZ_SHIFT) & REG_VSWZ_MASK) |                   \
+        ((sswz << REG_SSWZ_SHIFT) & REG_SSWZ_MASK))
+#define REG_GET_TYPE(reg)                                              \
+       ((reg & REG_TYPE_MASK) >> REG_TYPE_SHIFT)
+#define REG_GET_INDEX(reg)                                             \
+       ((reg & REG_INDEX_MASK) >> REG_INDEX_SHIFT)
+#define REG_GET_VSWZ(reg)                                              \
+       ((reg & REG_VSWZ_MASK) >> REG_VSWZ_SHIFT)
+#define REG_GET_SSWZ(reg)                                              \
+       ((reg & REG_SSWZ_MASK) >> REG_SSWZ_SHIFT)
+#define REG_GET_NO_USE(reg)                                            \
+       ((reg & REG_NO_USE_MASK) >> REG_NO_USE_SHIFT)
+#define REG_GET_VALID(reg)                                             \
+       ((reg & REG_VALID_MASK) >> REG_VALID_SHIFT)
+#define REG_GET_BUILTIN(reg)                                           \
+       ((reg & REG_BUILTIN_MASK) >> REG_BUILTIN_SHIFT)
+#define REG_SET_TYPE(reg, type)                                                \
+       reg = ((reg & ~REG_TYPE_MASK) |                                 \
+              ((type << REG_TYPE_SHIFT) & REG_TYPE_MASK))
+#define REG_SET_INDEX(reg, index)                                      \
+       reg = ((reg & ~REG_INDEX_MASK) |                                \
+              ((index << REG_INDEX_SHIFT) & REG_INDEX_MASK))
+#define REG_SET_VSWZ(reg, vswz)                                                \
+       reg = ((reg & ~REG_VSWZ_MASK) |                                 \
+              ((vswz << REG_VSWZ_SHIFT) & REG_VSWZ_MASK))
+#define REG_SET_SSWZ(reg, sswz)                                                \
+       reg = ((reg & ~REG_SSWZ_MASK) |                                 \
+              ((sswz << REG_SSWZ_SHIFT) & REG_SSWZ_MASK))
+#define REG_SET_NO_USE(reg, nouse)                                     \
+       reg = ((reg & ~REG_NO_USE_MASK) |                               \
+              ((nouse << REG_NO_USE_SHIFT) & REG_NO_USE_MASK))
+#define REG_SET_VALID(reg, valid)                                      \
+       reg = ((reg & ~REG_VALID_MASK) |                                \
+              ((valid << REG_VALID_SHIFT) & REG_VALID_MASK))
+#define REG_SET_BUILTIN(reg, builtin)                                  \
+       reg = ((reg & ~REG_BUILTIN_MASK) |                              \
+              ((builtin << REG_BUILTIN_SHIFT) & REG_BUILTIN_MASK))
+#define REG_ABS(reg)                                                   \
+       reg = (reg | REG_ABS_MASK)
+#define REG_NEGV(reg)                                                  \
+       reg = (reg | REG_NEGV_MASK)
+#define REG_NEGS(reg)                                                  \
+       reg = (reg | REG_NEGS_MASK)
 
-/***************************************
- * begin: useful data structions for fragment program generation
- ***************************************/
+
+/*
+ * Datas structures for fragment program generation
+ */
 
 /* description of r300 native hw instructions */
-const struct {
+static const struct {
        const char *name;
        int argc;
        int v_op;
        int s_op;
 } r300_fpop[] = {
        { "MAD", 3, R300_FPI0_OUTC_MAD, R300_FPI2_OUTA_MAD },
-       { "DP3", 2, R300_FPI0_OUTC_DP3, PFS_INVAL },
+       { "DP3", 2, R300_FPI0_OUTC_DP3, R300_FPI2_OUTA_DP4 },
        { "DP4", 2, R300_FPI0_OUTC_DP4, R300_FPI2_OUTA_DP4 },
        { "MIN", 2, R300_FPI0_OUTC_MIN, R300_FPI2_OUTA_MIN },
        { "MAX", 2, R300_FPI0_OUTC_MAX, R300_FPI2_OUTA_MAX },
@@ -86,377 +182,638 @@ const struct {
        { "LG2", 1, R300_FPI0_OUTC_REPL_ALPHA, R300_FPI2_OUTA_LG2 },
        { "RCP", 1, R300_FPI0_OUTC_REPL_ALPHA, R300_FPI2_OUTA_RCP },
        { "RSQ", 1, R300_FPI0_OUTC_REPL_ALPHA, R300_FPI2_OUTA_RSQ },
-       { "REPL_ALPHA", 1, R300_FPI0_OUTC_REPL_ALPHA, PFS_INVAL }
+       { "REPL_ALPHA", 1, R300_FPI0_OUTC_REPL_ALPHA, PFS_INVAL },
+       { "CMPH", 3, R300_FPI0_OUTC_CMPH, PFS_INVAL },
 };
 
-#define MAKE_SWZ3(x, y, z) (MAKE_SWIZZLE4(SWIZZLE_##x, \
-                                                                                       SWIZZLE_##y, \
-                                                                                       SWIZZLE_##z, \
-                                                                                       SWIZZLE_ZERO))
 
 /* vector swizzles r300 can support natively, with a couple of
  * cases we handle specially
  *
- * pfs_reg_t.v_swz/pfs_reg_t.s_swz is an index into this table
- **/
-static const struct r300_pfv_swizzle {
-       const char *name;
+ * REG_VSWZ/REG_SSWZ is an index into this table
+ */
+
+/* mapping from SWIZZLE_* to r300 native values for scalar insns */
+#define SWIZZLE_HALF 6
+
+#define MAKE_SWZ3(x, y, z) (MAKE_SWIZZLE4(SWIZZLE_##x, \
+                                         SWIZZLE_##y, \
+                                         SWIZZLE_##z, \
+                                         SWIZZLE_ZERO))
+static const struct r300_pfs_swizzle {
        GLuint hash;    /* swizzle value this matches */
-       GLboolean native;
        GLuint base;    /* base value for hw swizzle */
        GLuint stride;  /* difference in base between arg0/1/2 */
-       GLboolean dep_sca;
+       GLuint flags;
 } v_swiz[] = {
 /* native swizzles */
-       { "xyz", MAKE_SWZ3(X, Y, Z), GL_TRUE, R300_FPI0_ARGC_SRC0C_XYZ, 4, GL_FALSE },
-       { "xxx", MAKE_SWZ3(X, X, X), GL_TRUE, R300_FPI0_ARGC_SRC0C_XXX, 4, GL_FALSE },
-       { "yyy", MAKE_SWZ3(Y, Y, Y), GL_TRUE, R300_FPI0_ARGC_SRC0C_YYY, 4, GL_FALSE },
-       { "zzz", MAKE_SWZ3(Z, Z, Z), GL_TRUE, R300_FPI0_ARGC_SRC0C_ZZZ, 4, GL_FALSE },
-       { "yzx", MAKE_SWZ3(Y, Z, X), GL_TRUE, R300_FPI0_ARGC_SRC0C_YZX, 1, GL_FALSE },
-       { "zxy", MAKE_SWZ3(Z, X, Y), GL_TRUE, R300_FPI0_ARGC_SRC0C_ZXY, 1, GL_FALSE },
-       { "wzy", MAKE_SWZ3(W, Z, Y), GL_TRUE, R300_FPI0_ARGC_SRC0CA_WZY, 1, GL_TRUE },
-/* special cases */
-       { NULL, MAKE_SWZ3(W, W, W), GL_FALSE, 0, 0, GL_FALSE},
-       { NULL, MAKE_SWZ3(ONE, ONE, ONE), GL_FALSE, R300_FPI0_ARGC_ONE, 0, GL_FALSE},
-       { NULL, MAKE_SWZ3(ZERO, ZERO, ZERO), GL_FALSE, R300_FPI0_ARGC_ZERO, 0, GL_FALSE},
-       { NULL, PFS_INVAL, GL_FALSE, R300_FPI0_ARGC_HALF, 0, GL_FALSE},
-       { NULL, PFS_INVAL, GL_FALSE, 0, 0, 0 },
+       { MAKE_SWZ3(X, Y, Z), R300_FPI0_ARGC_SRC0C_XYZ, 4, SLOT_SRC_VECTOR },
+       { MAKE_SWZ3(X, X, X), R300_FPI0_ARGC_SRC0C_XXX, 4, SLOT_SRC_VECTOR },
+       { MAKE_SWZ3(Y, Y, Y), R300_FPI0_ARGC_SRC0C_YYY, 4, SLOT_SRC_VECTOR },
+       { MAKE_SWZ3(Z, Z, Z), R300_FPI0_ARGC_SRC0C_ZZZ, 4, SLOT_SRC_VECTOR },
+       { MAKE_SWZ3(W, W, W), R300_FPI0_ARGC_SRC0A,     1, SLOT_SRC_SCALAR },
+       { MAKE_SWZ3(Y, Z, X), R300_FPI0_ARGC_SRC0C_YZX, 1, SLOT_SRC_VECTOR },
+       { MAKE_SWZ3(Z, X, Y), R300_FPI0_ARGC_SRC0C_ZXY, 1, SLOT_SRC_VECTOR },
+       { MAKE_SWZ3(W, Z, Y), R300_FPI0_ARGC_SRC0CA_WZY, 1, SLOT_SRC_BOTH },
+       { MAKE_SWZ3(ONE, ONE, ONE), R300_FPI0_ARGC_ONE, 0, 0},
+       { MAKE_SWZ3(ZERO, ZERO, ZERO), R300_FPI0_ARGC_ZERO, 0, 0},
+       { MAKE_SWZ3(HALF, HALF, HALF), R300_FPI0_ARGC_HALF, 0, 0},
+       { PFS_INVAL, 0, 0, 0},
 };
-#define SWIZZLE_XYZ            0
-#define SWIZZLE_XXX            1
-#define SWIZZLE_WZY            6
-#define SWIZZLE_111            8
-#define SWIZZLE_000            9
-#define SWIZZLE_HHH            10
 
+/* used during matching of non-native swizzles */
 #define SWZ_X_MASK (7 << 0)
 #define SWZ_Y_MASK (7 << 3)
 #define SWZ_Z_MASK (7 << 6)
 #define SWZ_W_MASK (7 << 9)
-/* used during matching of non-native swizzles */
 static const struct {
-       GLuint hash;    /* used to mask matching swizzle components */
+       GLuint hash;            /* used to mask matching swizzle components */
        int mask;               /* actual outmask */
        int count;              /* count of components matched */
 } s_mask[] = {
-    { SWZ_X_MASK|SWZ_Y_MASK|SWZ_Z_MASK, 1|2|4, 3},
-    { SWZ_X_MASK|SWZ_Y_MASK, 1|2, 2},
-    { SWZ_X_MASK|SWZ_Z_MASK, 1|4, 2},
-    { SWZ_Y_MASK|SWZ_Z_MASK, 2|4, 2},
-    { SWZ_X_MASK, 1, 1},
-    { SWZ_Y_MASK, 2, 1},
-    { SWZ_Z_MASK, 4, 1},
-    { PFS_INVAL, PFS_INVAL, PFS_INVAL}
+       { SWZ_X_MASK|SWZ_Y_MASK|SWZ_Z_MASK, 1|2|4, 3},
+       { SWZ_X_MASK|SWZ_Y_MASK, 1|2, 2},
+       { SWZ_X_MASK|SWZ_Z_MASK, 1|4, 2},
+       { SWZ_Y_MASK|SWZ_Z_MASK, 2|4, 2},
+       { SWZ_X_MASK, 1, 1},
+       { SWZ_Y_MASK, 2, 1},
+       { SWZ_Z_MASK, 4, 1},
+       { PFS_INVAL, PFS_INVAL, PFS_INVAL}
 };
 
-/* mapping from SWIZZLE_* to r300 native values for scalar insns */
 static const struct {
-       const char *name;
        int base;       /* hw value of swizzle */
        int stride;     /* difference between SRC0/1/2 */
-       GLboolean dep_vec;
+       GLuint flags;
 } s_swiz[] = {
-       { "x", R300_FPI2_ARGA_SRC0C_X, 3, GL_TRUE },
-       { "y", R300_FPI2_ARGA_SRC0C_Y, 3, GL_TRUE },
-       { "z", R300_FPI2_ARGA_SRC0C_Z, 3, GL_TRUE },
-       { "w", R300_FPI2_ARGA_SRC0A     , 1, GL_FALSE },
-       { "0", R300_FPI2_ARGA_ZERO      , 0, GL_FALSE },
-       { "1", R300_FPI2_ARGA_ONE       , 0, GL_FALSE },
-       { ".5", R300_FPI2_ARGA_HALF, 0, GL_FALSE }
+       { R300_FPI2_ARGA_SRC0C_X, 3, SLOT_SRC_VECTOR },
+       { R300_FPI2_ARGA_SRC0C_Y, 3, SLOT_SRC_VECTOR },
+       { R300_FPI2_ARGA_SRC0C_Z, 3, SLOT_SRC_VECTOR },
+       { R300_FPI2_ARGA_SRC0A  , 1, SLOT_SRC_SCALAR },
+       { R300_FPI2_ARGA_ZERO   , 0, 0 },
+       { R300_FPI2_ARGA_ONE    , 0, 0 },
+       { R300_FPI2_ARGA_HALF   , 0, 0 }
 };
-#define SWIZZLE_HALF 6
 
 /* boiler-plate reg, for convenience */
-const pfs_reg_t pfs_default_reg = {
-       type: REG_TYPE_TEMP,
-       index: 0,
-       v_swz: 0 /* matches XYZ in table */,
-       s_swz: SWIZZLE_W,
-       negate: 0,
-       valid: GL_FALSE
-};
-
-/* constant zero source */
-const pfs_reg_t pfs_one = {
-       type: REG_TYPE_CONST,
-       index: 0,
-       v_swz: SWIZZLE_111,
-       s_swz: SWIZZLE_ONE,
-       valid: GL_TRUE
-};
+static const GLuint undef = REG(REG_TYPE_TEMP,
+                               0,
+                               SWIZZLE_XYZ,
+                               SWIZZLE_W,
+                               GL_FALSE,
+                               GL_FALSE,
+                               GL_FALSE);
 
 /* constant one source */
-const pfs_reg_t pfs_zero = {
-       type: REG_TYPE_CONST,
-       index: 0,
-       v_swz: SWIZZLE_000,
-       s_swz: SWIZZLE_ZERO,
-       valid: GL_TRUE
-};
+static const GLuint pfs_one = REG(REG_TYPE_CONST,
+                                 0,
+                                 SWIZZLE_111,
+                                 SWIZZLE_ONE,
+                                 GL_FALSE,
+                                 GL_TRUE,
+                                 GL_TRUE);
+
+/* constant half source */
+static const GLuint pfs_half = REG(REG_TYPE_CONST,
+                                  0,
+                                  SWIZZLE_HHH,
+                                  SWIZZLE_HALF,
+                                  GL_FALSE,
+                                  GL_TRUE,
+                                  GL_TRUE);
 
-/***************************************
- * end: data structures
- ***************************************/
+/* constant zero source */
+static const GLuint pfs_zero = REG(REG_TYPE_CONST,
+                                  0,
+                                  SWIZZLE_000,
+                                  SWIZZLE_ZERO,
+                                  GL_FALSE,
+                                  GL_TRUE,
+                                  GL_TRUE);
 
-#define ERROR(fmt, args...) do { \
-               fprintf(stderr, "%s::%s(): " fmt "\n", __FILE__, __func__, ##args); \
-               rp->error = GL_TRUE; \
-} while(0)
+/*
+ * Common functions prototypes
+ */
+static void dump_program(struct r300_fragment_program *rp);
+static void emit_arith(struct r300_fragment_program *rp, int op,
+                               GLuint dest, int mask,
+                               GLuint src0, GLuint src1, GLuint src2,
+                               int flags);
 
-static int get_hw_temp(struct r300_fragment_program *rp)
+/**
+ * Get an R300 temporary that can be written to in the given slot.
+ */
+static int get_hw_temp(struct r300_fragment_program *rp, int slot)
 {
-       int r = ffs(~rp->hwreg_in_use);
-       if (!r) {
+       COMPILE_STATE;
+       int r;
+       
+       for(r = 0; r < PFS_NUM_TEMP_REGS; ++r) {
+               if (cs->hwtemps[r].free >= 0 && cs->hwtemps[r].free <= slot)
+                       break;
+       }
+       
+       if (r >= PFS_NUM_TEMP_REGS) {
                ERROR("Out of hardware temps\n");
                return 0;
        }
+       
+       // Reserved is used to avoid the following scenario:
+       //  R300 temporary X is first assigned to Mesa temporary Y during vector ops
+       //  R300 temporary X is then assigned to Mesa temporary Z for further vector ops
+       //  Then scalar ops on Mesa temporary Z are emitted and move back in time
+       //  to overwrite the value of temporary Y.
+       // End scenario.
+       cs->hwtemps[r].reserved = cs->hwtemps[r].free;
+       cs->hwtemps[r].free = -1;
+       
+       // Reset to some value that won't mess things up when the user
+       // tries to read from a temporary that hasn't been assigned a value yet.
+       // In the normal case, vector_valid and scalar_valid should be set to
+       // a sane value by the first emit that writes to this temporary.
+       cs->hwtemps[r].vector_valid = 0;
+       cs->hwtemps[r].scalar_valid = 0;
+       
+       if (r > rp->max_temp_idx)
+               rp->max_temp_idx = r;
+       
+       return r;
+}
+
+/**
+ * Get an R300 temporary that will act as a TEX destination register.
+ */
+static int get_hw_temp_tex(struct r300_fragment_program *rp)
+{
+       COMPILE_STATE;
+       int r;
 
-       rp->hwreg_in_use |= (1 << --r);
+       for(r = 0; r < PFS_NUM_TEMP_REGS; ++r) {
+               if (cs->used_in_node & (1 << r))
+                       continue;
+               
+               // Note: Be very careful here
+               if (cs->hwtemps[r].free >= 0 && cs->hwtemps[r].free <= 0)
+                       break;
+       }
+       
+       if (r >= PFS_NUM_TEMP_REGS)
+               return get_hw_temp(rp, 0); /* Will cause an indirection */
+
+       cs->hwtemps[r].reserved = cs->hwtemps[r].free;
+       cs->hwtemps[r].free = -1;
+       
+       // Reset to some value that won't mess things up when the user
+       // tries to read from a temporary that hasn't been assigned a value yet.
+       // In the normal case, vector_valid and scalar_valid should be set to
+       // a sane value by the first emit that writes to this temporary.
+       cs->hwtemps[r].vector_valid = cs->nrslots;
+       cs->hwtemps[r].scalar_valid = cs->nrslots;
+       
        if (r > rp->max_temp_idx)
                rp->max_temp_idx = r;
 
        return r;
 }
 
+/**
+ * Mark the given hardware register as free.
+ */
 static void free_hw_temp(struct r300_fragment_program *rp, int idx)
 {
-       rp->hwreg_in_use &= ~(1<<idx);
+       COMPILE_STATE;
+       
+       // Be very careful here. Consider sequences like
+       //  MAD r0, r1,r2,r3
+       //  TEX r4, ...
+       // The TEX instruction may be moved in front of the MAD instruction
+       // due to the way nodes work. We don't want to alias r1 and r4 in
+       // this case.
+       // I'm certain the register allocation could be further sanitized,
+       // but it's tricky because of stuff that can happen inside emit_tex
+       // and emit_arith.
+       cs->hwtemps[idx].free = cs->nrslots+1;
 }
 
-static pfs_reg_t get_temp_reg(struct r300_fragment_program *rp)
+
+/**
+ * Create a new Mesa temporary register.
+ */
+static GLuint get_temp_reg(struct r300_fragment_program *rp)
 {
-       pfs_reg_t r = pfs_default_reg;
+       COMPILE_STATE;
+       GLuint r = undef;
+       GLuint index;
 
-       r.index = ffs(~rp->temp_in_use);
-       if (!r.index) {
+       index = ffs(~cs->temp_in_use);
+       if (!index) {
                ERROR("Out of program temps\n");
                return r;
        }
-       rp->temp_in_use |= (1 << --r.index);
-       
-       rp->temps[r.index] = get_hw_temp(rp);
-       r.valid = GL_TRUE;
+
+       cs->temp_in_use |= (1 << --index);
+       cs->temps[index].refcount = 0xFFFFFFFF;
+       cs->temps[index].reg = -1;
+
+       REG_SET_TYPE(r, REG_TYPE_TEMP);
+       REG_SET_INDEX(r, index);
+       REG_SET_VALID(r, GL_TRUE);
+       return r;
+}
+
+/**
+ * Create a new Mesa temporary register that will act as the destination
+ * register for a texture read.
+ */
+static GLuint get_temp_reg_tex(struct r300_fragment_program *rp)
+{
+       COMPILE_STATE;
+       GLuint r = undef;
+       GLuint index;
+
+       index = ffs(~cs->temp_in_use);
+       if (!index) {
+               ERROR("Out of program temps\n");
+               return r;
+       }
+
+       cs->temp_in_use |= (1 << --index);
+       cs->temps[index].refcount = 0xFFFFFFFF;
+       cs->temps[index].reg = get_hw_temp_tex(rp);
+
+       REG_SET_TYPE(r, REG_TYPE_TEMP);
+       REG_SET_INDEX(r, index);
+       REG_SET_VALID(r, GL_TRUE);
        return r;
 }
 
-static void free_temp(struct r300_fragment_program *rp, pfs_reg_t r)
+/**
+ * Free a Mesa temporary and the associated R300 temporary.
+ */
+static void free_temp(struct r300_fragment_program *rp, GLuint r)
 {
-       if (!rp || !(rp->temp_in_use & (1<<r.index))) return;
+       COMPILE_STATE;
+       GLuint index = REG_GET_INDEX(r);
+
+       if (!(cs->temp_in_use & (1 << index)))
+               return;
        
-       free_hw_temp(rp, rp->temps[r.index]);   
-       rp->temp_in_use &= ~(1<<r.index);
+       if (REG_GET_TYPE(r) == REG_TYPE_TEMP) {
+               free_hw_temp(rp, cs->temps[index].reg);
+               cs->temps[index].reg = -1;
+               cs->temp_in_use &= ~(1 << index);
+       } else if (REG_GET_TYPE(r) == REG_TYPE_INPUT) {
+               free_hw_temp(rp, cs->inputs[index].reg);
+               cs->inputs[index].reg = -1;
+       }
 }
 
-static pfs_reg_t emit_param4fv(struct r300_fragment_program *rp, GLfloat *values)
+static GLuint emit_param4fv(struct r300_fragment_program *rp,
+                           GLfloat *values)
 {
-       pfs_reg_t r = pfs_default_reg;
-               r.type = REG_TYPE_CONST;
+       GLuint r = undef;
+       GLuint index;
        int pidx;
 
        pidx = rp->param_nr++;
-       r.index = rp->const_nr++;
-       if (pidx >= PFS_NUM_CONST_REGS || r.index >= PFS_NUM_CONST_REGS) {
+       index = rp->const_nr++;
+       if (pidx >= PFS_NUM_CONST_REGS || index >= PFS_NUM_CONST_REGS) {
                ERROR("Out of const/param slots!\n");
                return r;
        }
-       
-       rp->param[pidx].idx = r.index;
+
+       rp->param[pidx].idx = index;
        rp->param[pidx].values = values;
        rp->params_uptodate = GL_FALSE;
 
-       r.valid = GL_TRUE;
+       REG_SET_TYPE(r, REG_TYPE_CONST);
+       REG_SET_INDEX(r, index);
+       REG_SET_VALID(r, GL_TRUE);
        return r;
 }
 
-static pfs_reg_t emit_const4fv(struct r300_fragment_program *rp, GLfloat *cp)
+static GLuint emit_const4fv(struct r300_fragment_program *rp, const GLfloat* cp)
 { 
-       pfs_reg_t r = pfs_default_reg;
-               r.type = REG_TYPE_CONST;
+       GLuint r = undef;
+       GLuint index;
 
-       r.index = rp->const_nr++;
-       if (r.index >= PFS_NUM_CONST_REGS) {
+       index = rp->const_nr++;
+       if (index >= PFS_NUM_CONST_REGS) {
                ERROR("Out of hw constants!\n");
                return r;
        }
-       
-       COPY_4V(rp->constant[r.index], cp);
 
-       r.valid = GL_TRUE;
+       COPY_4V(rp->constant[index], cp);
+
+       REG_SET_TYPE(r, REG_TYPE_CONST);
+       REG_SET_INDEX(r, index);
+       REG_SET_VALID(r, GL_TRUE);
+       return r;
+}
+
+static inline GLuint negate(GLuint r)
+{
+       REG_NEGS(r);
+       REG_NEGV(r);
        return r;
 }
 
-static pfs_reg_t negate(pfs_reg_t r)
+/* Hack, to prevent clobbering sources used multiple times when
+ * emulating non-native instructions
+ */
+static inline GLuint keep(GLuint r)
 {
-       r.negate = 1;
+       REG_SET_NO_USE(r, GL_TRUE);
+       return r;
+}
+
+static inline GLuint absolute(GLuint r)
+{
+       REG_ABS(r);
        return r;
 }
 
 static int swz_native(struct r300_fragment_program *rp,
-                               pfs_reg_t src, pfs_reg_t *r)
+                     GLuint src,
+                     GLuint *r,
+                     GLuint arbneg)
 {
-       /* Native swizzle, nothing to see here */
-       *r = src;
+       /* Native swizzle, handle negation */
+       src = (src & ~REG_NEGS_MASK) |
+               (((arbneg >> 3) & 1) << REG_NEGS_SHIFT);
+
+       if ((arbneg & 0x7) == 0x0) {
+               src = src & ~REG_NEGV_MASK;
+               *r = src;
+       } else if ((arbneg & 0x7) == 0x7) {
+               src |= REG_NEGV_MASK;
+               *r = src;
+       } else {
+               if (!REG_GET_VALID(*r))
+                       *r = get_temp_reg(rp);
+               src |= REG_NEGV_MASK;
+               emit_arith(rp,
+                          PFS_OP_MAD,
+                          *r,
+                          arbneg & 0x7,
+                          keep(src),
+                          pfs_one,
+                          pfs_zero,
+                          0);
+               src = src & ~REG_NEGV_MASK;
+               emit_arith(rp,
+                          PFS_OP_MAD,
+                          *r,
+                          (arbneg ^ 0x7) | WRITEMASK_W,
+                          src,
+                          pfs_one,
+                          pfs_zero,
+                          0);
+       }
+
        return 3;
 }
 
 static int swz_emit_partial(struct r300_fragment_program *rp,
-                               pfs_reg_t src, pfs_reg_t *r, int mask, int mc)
+                           GLuint src,
+                           GLuint *r,
+                           int mask,
+                           int mc,
+                           GLuint arbneg)
 {
-       if (!r->valid)
+       GLuint tmp;
+       GLuint wmask = 0;
+
+       if (!REG_GET_VALID(*r))
                *r = get_temp_reg(rp);
 
-       /* A partial match, src.v_swz/mask define what parts of the
-        * desired swizzle we match */
-       if (mc + s_mask[mask].count == 3)
-               emit_arith(rp, PFS_OP_MAD, *r, s_mask[mask].mask|WRITEMASK_W, src, pfs_one, pfs_zero, 0);
-       else
-               emit_arith(rp, PFS_OP_MAD, *r, s_mask[mask].mask, src, pfs_one, pfs_zero, 0);
-       return s_mask[mask].count;
-}
+       /* A partial match, VSWZ/mask define what parts of the
+        * desired swizzle we match
+        */
+       if (mc + s_mask[mask].count == 3) {
+               wmask = WRITEMASK_W;
+               src |= ((arbneg >> 3) & 1) << REG_NEGS_SHIFT;
+       }
 
-static int swz_special_case(struct r300_fragment_program *rp,
-                               pfs_reg_t src, pfs_reg_t *r, int mask, int mc)
-{
-       pfs_reg_t ssrc = pfs_default_reg;
-
-       switch(GET_SWZ(v_swiz[src.v_swz].hash, 0)) {
-       case SWIZZLE_W:
-               ssrc = get_temp_reg(rp);
-               src.v_swz = SWIZZLE_WZY;
-               if (s_mask[mask].count == 3) {
-                       emit_arith(rp, PFS_OP_MAD, ssrc, WRITEMASK_XW, src, pfs_one, pfs_zero, 0);
-                       *r = ssrc;
-                       r->v_swz = SWIZZLE_XXX;
-                       r->s_swz = SWIZZLE_W;
-               } else if (mc + s_mask[mask].count == 3) {
-                       if (!r->valid)
-                               *r = get_temp_reg(rp);
-                       emit_arith(rp, PFS_OP_MAD, ssrc, WRITEMASK_XW, src, pfs_one, pfs_zero, 0);
-                       ssrc.v_swz = SWIZZLE_XXX;
-                       emit_arith(rp, PFS_OP_MAD, *r, s_mask[mask].mask|WRITEMASK_W, ssrc, pfs_one, pfs_zero, 0);
-                       free_temp(rp, ssrc);
+       tmp = arbneg & s_mask[mask].mask;
+       if (tmp) {
+               tmp = tmp ^ s_mask[mask].mask;
+               if (tmp) {
+                       emit_arith(rp,
+                                  PFS_OP_MAD,
+                                  *r,
+                                  arbneg & s_mask[mask].mask,
+                                  keep(src) | REG_NEGV_MASK,
+                                  pfs_one,
+                                  pfs_zero,
+                                  0);
+                       if (!wmask) {
+                               REG_SET_NO_USE(src, GL_TRUE);
+                       } else {
+                               REG_SET_NO_USE(src, GL_FALSE);
+                       }
+                       emit_arith(rp,
+                                  PFS_OP_MAD,
+                                  *r,
+                                  tmp | wmask,
+                                  src,
+                                  pfs_one,
+                                  pfs_zero,
+                                  0);
                } else {
-                       if (!r->valid)
-                               *r = get_temp_reg(rp);
-                       emit_arith(rp, PFS_OP_MAD, ssrc, WRITEMASK_X, src, pfs_one, pfs_zero, 0);
-                       ssrc.v_swz = SWIZZLE_XXX;
-                       emit_arith(rp, PFS_OP_MAD, *r, s_mask[mask].mask, ssrc, pfs_one, pfs_zero, 0);
-                       free_temp(rp, ssrc);
+                       if (!wmask) {
+                               REG_SET_NO_USE(src, GL_TRUE);
+                       } else {
+                               REG_SET_NO_USE(src, GL_FALSE);
+                       }
+                       emit_arith(rp,
+                                  PFS_OP_MAD,
+                                  *r,
+                                  (arbneg & s_mask[mask].mask) | wmask,
+                                  src | REG_NEGV_MASK,
+                                  pfs_one,
+                                  pfs_zero,
+                                  0);
                }
-               break;
-       case SWIZZLE_ONE:
-       case SWIZZLE_ZERO:
-               if (!r->valid)
-                       *r = get_temp_reg(rp);
-               if (mc + s_mask[mask].count == 3)
-                       emit_arith(rp, PFS_OP_MAD, *r, s_mask[mask].mask|WRITEMASK_W, src, pfs_one, pfs_zero, 0);
-               else
-                       emit_arith(rp, PFS_OP_MAD, *r, s_mask[mask].mask, src, pfs_one, pfs_zero, 0);
-               break;
-       default:
-               ERROR("Unknown special-case swizzle! %d\n", src.v_swz);
-               return 0;
+       } else {
+               if (!wmask) {
+                       REG_SET_NO_USE(src, GL_TRUE);
+               } else {
+                       REG_SET_NO_USE(src, GL_FALSE);
+               }
+               emit_arith(rp, PFS_OP_MAD,
+                          *r,
+                          s_mask[mask].mask | wmask,
+                          src,
+                          pfs_one,
+                          pfs_zero,
+                          0);
        }
 
        return s_mask[mask].count;
 }
 
-static pfs_reg_t swizzle(struct r300_fragment_program *rp,
-                               pfs_reg_t src, 
-                               GLuint arbswz)
+static GLuint do_swizzle(struct r300_fragment_program *rp,
+                        GLuint src,
+                        GLuint arbswz,
+                        GLuint arbneg)
 {
-       pfs_reg_t r = pfs_default_reg;
-       
+       GLuint r = undef;
+       GLuint vswz;
        int c_mask = 0;
-       int v_matched = 0;
-       src.v_swz = SWIZZLE_XYZ;
-       src.s_swz = GET_SWZ(arbswz, 3);
+       int v_match = 0;
+
+       /* If swizzling from something without an XYZW native swizzle,
+        * emit result to a temp, and do new swizzle from the temp.
+        */
+#if 0
+       if (REG_GET_VSWZ(src) != SWIZZLE_XYZ ||
+           REG_GET_SSWZ(src) != SWIZZLE_W) {
+               GLuint temp = get_temp_reg(rp);
+               emit_arith(rp,
+                          PFS_OP_MAD,
+                          temp,
+                          WRITEMASK_XYZW,
+                          src,
+                          pfs_one,
+                          pfs_zero,
+                          0);
+               src = temp;
+       }
+#endif
+
+       if (REG_GET_VSWZ(src) != SWIZZLE_XYZ ||
+           REG_GET_SSWZ(src) != SWIZZLE_W) {
+           GLuint vsrcswz = (v_swiz[REG_GET_VSWZ(src)].hash & (SWZ_X_MASK|SWZ_Y_MASK|SWZ_Z_MASK)) | REG_GET_SSWZ(src) << 9;
+           GLint i;
+
+           GLuint newswz = 0;
+           GLuint offset;
+           for(i=0; i < 4; ++i){
+               offset = GET_SWZ(arbswz, i);
+               
+               newswz |= (offset <= 3)?GET_SWZ(vsrcswz, offset) << i*3:offset << i*3;
+           }
+
+           arbswz = newswz & (SWZ_X_MASK|SWZ_Y_MASK|SWZ_Z_MASK);
+           REG_SET_SSWZ(src, GET_SWZ(newswz, 3));
+       }
+       else
+       {
+           /* set scalar swizzling */
+           REG_SET_SSWZ(src, GET_SWZ(arbswz, 3));
 
+       }
        do {
+               vswz = REG_GET_VSWZ(src);
                do {
-#define CUR_HASH (v_swiz[src.v_swz].hash & s_mask[c_mask].hash)
-                       if (CUR_HASH == (arbswz & s_mask[c_mask].hash)) {
-                               if (v_swiz[src.v_swz].native == GL_FALSE)
-                                       v_matched += swz_special_case(rp, src, &r, c_mask, v_matched);
-                               else if (s_mask[c_mask].count == 3)
-                                       v_matched += swz_native(rp, src, &r);
-                               else
-                                       v_matched += swz_emit_partial(rp, src, &r, c_mask, v_matched);
-
-                               if (v_matched == 3)
+                       int chash;
+
+                       REG_SET_VSWZ(src, vswz);
+                       chash = v_swiz[REG_GET_VSWZ(src)].hash &
+                               s_mask[c_mask].hash;
+
+                       if (chash == (arbswz & s_mask[c_mask].hash)) {
+                               if (s_mask[c_mask].count == 3) {
+                                       v_match += swz_native(rp,
+                                                               src,
+                                                               &r,
+                                                               arbneg);
+                               } else {
+                                       v_match += swz_emit_partial(rp,
+                                                                   src,
+                                                                   &r,
+                                                                   c_mask,
+                                                                   v_match,
+                                                                   arbneg);
+                               }
+
+                               if (v_match == 3)
                                        return r;
 
-                               /* Fill with something invalid.. all 0's was wrong before, matched
-                                * SWIZZLE_X.  So all 1's will be okay for now */
+                               /* Fill with something invalid.. all 0's was
+                                * wrong before, matched SWIZZLE_X.  So all
+                                * 1's will be okay for now
+                                */
                                arbswz |= (PFS_INVAL & s_mask[c_mask].hash);
                        }
-               } while(v_swiz[++src.v_swz].hash != PFS_INVAL);
-               src.v_swz = SWIZZLE_XYZ;
+               } while(v_swiz[++vswz].hash != PFS_INVAL);
+               REG_SET_VSWZ(src, SWIZZLE_XYZ);
        } while (s_mask[++c_mask].hash != PFS_INVAL);
 
        ERROR("should NEVER get here\n");
        return r;
 }
-                               
-static pfs_reg_t t_src(struct r300_fragment_program *rp,
-                                               struct fp_src_register fpsrc) {
-       pfs_reg_t r = pfs_default_reg;
+
+static GLuint t_src(struct r300_fragment_program *rp,
+                   struct prog_src_register fpsrc)
+{
+       GLuint r = undef;
 
        switch (fpsrc.File) {
        case PROGRAM_TEMPORARY:
-               r.index = fpsrc.Index;
-               r.valid = GL_TRUE;
+               REG_SET_INDEX(r, fpsrc.Index);
+               REG_SET_VALID(r, GL_TRUE);
+               REG_SET_TYPE(r, REG_TYPE_TEMP);
                break;
        case PROGRAM_INPUT:
-               r.index = fpsrc.Index;
-               r.type = REG_TYPE_INPUT;
-               r.valid = GL_TRUE;
+               REG_SET_INDEX(r, fpsrc.Index);
+               REG_SET_VALID(r, GL_TRUE);
+               REG_SET_TYPE(r, REG_TYPE_INPUT);
                break;
        case PROGRAM_LOCAL_PARAM:
-               r = emit_param4fv(rp, rp->mesa_program.Base.LocalParams[fpsrc.Index]);
+               r = emit_param4fv(rp,
+                                 rp->mesa_program.Base.LocalParams[fpsrc.Index]);
                break;
        case PROGRAM_ENV_PARAM:
-               r = emit_param4fv(rp, rp->ctx->FragmentProgram.Parameters[fpsrc.Index]);
+               r = emit_param4fv(rp,
+                                 rp->ctx->FragmentProgram.Parameters[fpsrc.Index]);
                break;
        case PROGRAM_STATE_VAR:
        case PROGRAM_NAMED_PARAM:
-               r = emit_param4fv(rp, rp->mesa_program.Parameters->ParameterValues[fpsrc.Index]);
+               r = emit_param4fv(rp,
+                                 rp->mesa_program.Base.Parameters->ParameterValues[fpsrc.Index]);
                break;
        default:
                ERROR("unknown SrcReg->File %x\n", fpsrc.File);
                return r;
        }
-       
-       /* no point swizzling ONE/ZERO/HALF constants... */
-       if (r.v_swz < SWIZZLE_111 && r.s_swz < SWIZZLE_ZERO)
-               r = swizzle(rp, r, fpsrc.Swizzle);
-       
-       /* WRONG! Need to be able to do individual component negation,
-        * should probably handle this in the swizzling code unless
-        * all components are negated, then we can do this natively */
-       if (fpsrc.NegateBase)
-               r.negate = GL_TRUE;
 
+       /* no point swizzling ONE/ZERO/HALF constants... */
+       if (REG_GET_VSWZ(r) < SWIZZLE_111 || REG_GET_SSWZ(r) < SWIZZLE_ZERO)
+               r = do_swizzle(rp, r, fpsrc.Swizzle, fpsrc.NegateBase);
        return r;
 }
 
-static pfs_reg_t t_dst(struct r300_fragment_program *rp,
-                               struct fp_dst_register dest) {
-       pfs_reg_t r = pfs_default_reg;
+static GLuint t_scalar_src(struct r300_fragment_program *rp,
+                          struct prog_src_register fpsrc)
+{
+       struct prog_src_register src = fpsrc;
+       int sc = GET_SWZ(fpsrc.Swizzle, 0); /* X */
+
+       src.Swizzle = ((sc<<0)|(sc<<3)|(sc<<6)|(sc<<9));
+
+       return t_src(rp, src);
+}
+
+static GLuint t_dst(struct r300_fragment_program *rp,
+                      struct prog_dst_register dest)
+{
+       GLuint r = undef;
        
        switch (dest.File) {
        case PROGRAM_TEMPORARY:
-               r.index = dest.Index;
-               r.valid = GL_TRUE;
+               REG_SET_INDEX(r, dest.Index);
+               REG_SET_VALID(r, GL_TRUE);
+               REG_SET_TYPE(r, REG_TYPE_TEMP);
                return r;
        case PROGRAM_OUTPUT:
-               r.type = REG_TYPE_OUTPUT;
+               REG_SET_TYPE(r, REG_TYPE_OUTPUT);
                switch (dest.Index) {
-               case 0:
-                       r.valid = GL_TRUE;
-                       return r;
-               case 1:
-                       ERROR("I don't know how to write depth!\n");
+               case FRAG_RESULT_COLR:
+               case FRAG_RESULT_DEPR:
+                       REG_SET_INDEX(r, dest.Index);
+                       REG_SET_VALID(r, GL_TRUE);
                        return r;
                default:
                        ERROR("Bad DstReg->Index 0x%x\n", dest.Index);
@@ -468,379 +825,1182 @@ static pfs_reg_t t_dst(struct r300_fragment_program *rp,
        }
 }
 
-static void sync_streams(struct r300_fragment_program *rp) {
-       /* Bring vector/scalar streams into sync, inserting nops into
-        * whatever stream is lagging behind
-        *
-        * I'm using "MAD t0, t0, 1.0, 0.0" as a NOP
-        */
-       while (rp->v_pos != rp->s_pos) {
-               if (rp->s_pos > rp->v_pos) {
-                       rp->alu.inst[rp->v_pos].inst0 = 0x00050A80;
-                       rp->alu.inst[rp->v_pos].inst1 = 0x03820800;
-                       rp->v_pos++;
-               } else {
-                       rp->alu.inst[rp->s_pos].inst2 = 0x00040889;
-                       rp->alu.inst[rp->s_pos].inst3 = 0x00820800;
-                       rp->s_pos++;
-               }
-       }       
-}
-
-static void emit_tex(struct r300_fragment_program *rp,
-                               struct fp_instruction *fpi,
-                               int opcode)
+static int t_hw_src(struct r300_fragment_program *rp,
+                   GLuint src,
+                   GLboolean tex)
 {
-       pfs_reg_t coord = t_src(rp, fpi->SrcReg[0]);
-       pfs_reg_t dest = t_dst(rp, fpi->DstReg);
-       int unit = fpi->TexSrcUnit;
-       int hwsrc, hwdest, flags = 0;
+       COMPILE_STATE;
+       int idx;
+       int index = REG_GET_INDEX(src);
 
-       switch (coord.type) {
+       switch(REG_GET_TYPE(src)) {
        case REG_TYPE_TEMP:
-               hwsrc = rp->temps[coord.index];
+               /* NOTE: if reg==-1 here, a source is being read that
+                *       hasn't been written to. Undefined results.
+                */
+               if (cs->temps[index].reg == -1)
+                       cs->temps[index].reg = get_hw_temp(rp, cs->nrslots);
+
+               idx = cs->temps[index].reg;
+
+               if (!REG_GET_NO_USE(src) &&
+                   (--cs->temps[index].refcount == 0))
+                       free_temp(rp, src);
                break;
        case REG_TYPE_INPUT:
-               hwsrc = rp->inputs[coord.index];
+               idx = cs->inputs[index].reg;
+
+               if (!REG_GET_NO_USE(src) &&
+                   (--cs->inputs[index].refcount == 0))
+                       free_hw_temp(rp, cs->inputs[index].reg);
                break;
        case REG_TYPE_CONST:
-               hwsrc = coord.index;
-               flags = R300_FPITX_SRC_CONST;
+               return (index | SRC_CONST);
+       default:
+               ERROR("Invalid type for source reg\n");
+               return (0 | SRC_CONST);
+       }
+
+       if (!tex)
+               cs->used_in_node |= (1 << idx);
+
+       return idx;
+}
+
+static int t_hw_dst(struct r300_fragment_program *rp,
+                   GLuint dest,
+                   GLboolean tex,
+                   int slot)
+{
+       COMPILE_STATE;
+       int idx;
+       GLuint index = REG_GET_INDEX(dest);
+       assert(REG_GET_VALID(dest));
+
+       switch(REG_GET_TYPE(dest)) {
+       case REG_TYPE_TEMP:
+               if (cs->temps[REG_GET_INDEX(dest)].reg == -1) {
+                       if (!tex) {
+                               cs->temps[index].reg = get_hw_temp(rp, slot);
+                       } else {
+                               cs->temps[index].reg = get_hw_temp_tex(rp);
+                       }
+               }
+               idx = cs->temps[index].reg;
+
+               if (!REG_GET_NO_USE(dest) &&
+                   (--cs->temps[index].refcount == 0))
+                       free_temp(rp, dest);
+
+               cs->dest_in_node |= (1 << idx);
+               cs->used_in_node |= (1 << idx);
+               break;
+       case REG_TYPE_OUTPUT:
+               switch(index) {
+               case FRAG_RESULT_COLR:
+                       rp->node[rp->cur_node].flags |= R300_PFS_NODE_OUTPUT_COLOR;
+                       break;
+               case FRAG_RESULT_DEPR:
+                       rp->node[rp->cur_node].flags |= R300_PFS_NODE_OUTPUT_DEPTH;
+                       break;
+               }
+               return index;
                break;
        default:
-               ERROR("Unknown coord.type = %d\n", coord.type);
+               ERROR("invalid dest reg type %d\n", REG_GET_TYPE(dest));
+               return 0;
+       }
+       
+       return idx;
+}
+
+static void emit_nop(struct r300_fragment_program *rp)
+{
+       COMPILE_STATE;
+       
+       if (cs->nrslots >= PFS_MAX_ALU_INST) {
+               ERROR("Out of ALU instruction slots\n");
                return;
        }
-       hwdest = rp->temps[dest.index];
+       
+       rp->alu.inst[cs->nrslots].inst0 = NOP_INST0;
+       rp->alu.inst[cs->nrslots].inst1 = NOP_INST1;
+       rp->alu.inst[cs->nrslots].inst2 = NOP_INST2;
+       rp->alu.inst[cs->nrslots].inst3 = NOP_INST3;
+       cs->nrslots++;
+}
 
-       /* Indirection if source has been written in this node, or if the dest has
-        * been read/written in this node
+static void emit_tex(struct r300_fragment_program *rp,
+                    struct prog_instruction *fpi,
+                    int opcode)
+{
+       COMPILE_STATE;
+       GLuint coord = t_src(rp, fpi->SrcReg[0]);
+       GLuint dest = undef, rdest = undef;
+       GLuint din = cs->dest_in_node, uin = cs->used_in_node;
+       int unit = fpi->TexSrcUnit;
+       int hwsrc, hwdest;
+       
+       /* Resolve source/dest to hardware registers */
+       hwsrc = t_hw_src(rp, coord, GL_TRUE);
+       if (opcode != R300_FPITX_OP_KIL) {
+               dest = t_dst(rp, fpi->DstReg);
+
+               /* r300 doesn't seem to be able to do TEX->output reg */
+               if (REG_GET_TYPE(dest) == REG_TYPE_OUTPUT) {
+                       rdest = dest;
+                       dest = get_temp_reg_tex(rp);
+               }
+               hwdest = t_hw_dst(rp, dest, GL_TRUE, rp->node[rp->cur_node].alu_offset);
+               
+               /* Use a temp that hasn't been used in this node, rather
+                * than causing an indirection
+                */
+               if (uin & (1 << hwdest)) {
+                       free_hw_temp(rp, hwdest);
+                       hwdest = get_hw_temp_tex(rp);
+                       cs->temps[REG_GET_INDEX(dest)].reg = hwdest;
+               }
+       } else {
+               hwdest = 0;
+               unit = 0;
+       }
+       
+       /* Indirection if source has been written in this node, or if the
+        * dest has been read/written in this node
         */
-       if ((coord.type != REG_TYPE_CONST && (rp->dest_in_node & (1<<hwsrc))) ||
-                                       (rp->used_in_node & (1<<hwdest))) {
+       if ((REG_GET_TYPE(coord) != REG_TYPE_CONST &&
+            (din & (1<<hwsrc))) || (uin & (1<<hwdest))) {
                        
-               if (rp->cur_node == 3) { /* We only support 4 natively */
+               /* Finish off current node */
+               if (rp->node[rp->cur_node].alu_offset == cs->nrslots)
+                       emit_nop(rp);
+                               
+               rp->node[rp->cur_node].alu_end =
+                               cs->nrslots - rp->node[rp->cur_node].alu_offset - 1;
+               assert(rp->node[rp->cur_node].alu_end >= 0);
+
+               if (++rp->cur_node >= PFS_MAX_TEX_INDIRECT) {
                        ERROR("too many levels of texture indirection\n");
                        return;
                }
-               /* Finish off current node */
-               sync_streams(rp);
-               rp->node[rp->cur_node].alu_end = rp->v_pos - 1;
 
                /* Start new node */
-               rp->cur_node++;
-               rp->used_in_node = 0;
-               rp->dest_in_node = 0;
                rp->node[rp->cur_node].tex_offset = rp->tex.length;
-               rp->node[rp->cur_node].alu_offset = rp->v_pos;
+               rp->node[rp->cur_node].alu_offset = cs->nrslots;
                rp->node[rp->cur_node].tex_end = -1;
                rp->node[rp->cur_node].alu_end = -1;    
+               rp->node[rp->cur_node].flags = 0;
+               cs->used_in_node = 0;
+               cs->dest_in_node = 0;
        }
        
-       if (rp->cur_node == 0) rp->first_node_has_tex = 1;
-
-    rp->tex.inst[rp->tex.length++] = 0
-        | (hwsrc << R300_FPITX_SRC_SHIFT)
-        | (hwdest << R300_FPITX_DST_SHIFT)
-        | (unit << R300_FPITX_IMAGE_SHIFT)
-        | (opcode << R300_FPITX_OPCODE_SHIFT) /* not entirely sure about this */
-               | flags;
-       rp->dest_in_node |= (1 << hwdest);
-       
-       rp->node[rp->cur_node].tex_end++;
-}
+       if (rp->cur_node == 0)
+               rp->first_node_has_tex = 1;
 
-static void emit_arith(struct r300_fragment_program *rp, int op,
-                               pfs_reg_t dest, int mask,
-                               pfs_reg_t src0, pfs_reg_t src1, pfs_reg_t src2,
-                               int flags)
-{
-       pfs_reg_t src[3] = { src0, src1, src2 };
-       int hwdest, hwsrc;
-       int argc;
-       int v_idx = rp->v_pos, s_idx = rp->s_pos;
-       GLuint inst[4] = { 0, 0, 0, 0 }; 
-       int vop, sop;
-       int i;
+       rp->tex.inst[rp->tex.length++] = 0
+               | (hwsrc << R300_FPITX_SRC_SHIFT)
+               | (hwdest << R300_FPITX_DST_SHIFT)
+               | (unit << R300_FPITX_IMAGE_SHIFT)
+               /* not entirely sure about this */
+               | (opcode << R300_FPITX_OPCODE_SHIFT);
 
-#define ARG_NEG        (1<<5)
-#define ARG_ABS (1<<6)
-#define ARG_STRIDE 7
-#define SRC_CONST (1<<5)
-#define SRC_STRIDE 6
+       cs->dest_in_node |= (1 << hwdest); 
+       if (REG_GET_TYPE(coord) != REG_TYPE_CONST)
+               cs->used_in_node |= (1 << hwsrc);
 
-       if (!dest.valid || !src0.valid || !src1.valid || !src2.valid) {
-               ERROR("invalid register.  dest/src0/src1/src2 valid = %d/%d/%d/%d\n",
-                                               dest.valid, src0.valid, src1.valid, src2.valid);
-               return;
-       }
+       rp->node[rp->cur_node].tex_end++;
 
-       /* check opcode */
-       if (op > MAX_PFS_OP) {
-               ERROR("unknown opcode!\n");
-               return;
+       /* Copy from temp to output if needed */
+       if (REG_GET_VALID(rdest)) {
+               emit_arith(rp, PFS_OP_MAD, rdest, WRITEMASK_XYZW, dest,
+                          pfs_one, pfs_zero, 0);
+               free_temp(rp, dest);
        }
-       argc = r300_fpop[op].argc;
-       vop = r300_fpop[op].v_op;
-       sop = r300_fpop[op].s_op;
+}
 
-       /* grab hwregs of dest */
-       switch (dest.type) {
-       case REG_TYPE_TEMP:
-               hwdest = rp->temps[dest.index];
-               rp->dest_in_node |= (1 << hwdest);
-               rp->used_in_node |= (1 << hwdest);
-               break;
-       case REG_TYPE_OUTPUT:
-               hwdest = 0;
-               break;
-       default:
-               ERROR("invalid dest reg type %d\n", dest.type);
-               return;
-       }
 
-       /* grab hwregs of sources */
-       for (i=0;i<3;i++) {
-               if (i<argc) {
-                       /* Decide on hardware source index */
-                       switch (src[i].type) {
-                       case REG_TYPE_INPUT:
-                               hwsrc = rp->inputs[src[i].index];
-                               rp->used_in_node |= (1 << hwsrc);
-
-                               inst[1] |= hwsrc << (i * SRC_STRIDE);
-                               inst[3] |= hwsrc << (i * SRC_STRIDE);
-                               break;
-                       case REG_TYPE_TEMP:
-                               /* make sure insn ordering is right... */
-                               if ((v_swiz[src[i].v_swz].dep_sca && v_idx < s_idx) ||
-                                       (s_swiz[src[i].s_swz].dep_vec && s_idx < v_idx)) {
-                                       sync_streams(rp);
-                                       v_idx = s_idx = rp->v_pos;
-                               }
-               
-                               hwsrc = rp->temps[src[i].index];
-                               rp->used_in_node |= (1 << hwsrc);
+/**
+ * Returns the first slot where we could possibly allow writing to dest,
+ * according to register allocation.
+ */
+static int get_earliest_allowed_write(
+               struct r300_fragment_program* rp,
+               GLuint dest, int mask)
+{
+       COMPILE_STATE;
+       int idx;
+       int pos;
+       GLuint index = REG_GET_INDEX(dest);
+       assert(REG_GET_VALID(dest));
+
+       switch(REG_GET_TYPE(dest)) {
+               case REG_TYPE_TEMP:
+                       if (cs->temps[index].reg == -1)
+                               return 0;
+                       
+                       idx = cs->temps[index].reg;
+                       break;
+               case REG_TYPE_OUTPUT:
+                       return 0;
+               default:
+                       ERROR("invalid dest reg type %d\n", REG_GET_TYPE(dest));
+                       return 0;
+       }
+       
+       pos = cs->hwtemps[idx].reserved;
+       if (mask & WRITEMASK_XYZ) {
+               if (pos < cs->hwtemps[idx].vector_lastread)
+                       pos = cs->hwtemps[idx].vector_lastread;
+       }
+       if (mask & WRITEMASK_W) {
+               if (pos < cs->hwtemps[idx].scalar_lastread)
+                       pos = cs->hwtemps[idx].scalar_lastread;
+       }
+       
+       return pos;
+}
 
-                               inst[1] |= hwsrc << (i * SRC_STRIDE);
-                               inst[3] |= hwsrc << (i * SRC_STRIDE);
-                               break;
-                       case REG_TYPE_CONST:
-                               hwsrc = src[i].index;
 
-                               inst[1] |= ((hwsrc | SRC_CONST) << (i * SRC_STRIDE));
-                               inst[3] |= ((hwsrc | SRC_CONST) << (i * SRC_STRIDE));
-                               break;
-                       default:
-                               ERROR("invalid source reg\n");
-                               return;
+/**
+ * Allocates a slot for an ALU instruction that can consist of
+ * a vertex part or a scalar part or both.
+ *
+ * Sources from src (src[0] to src[argc-1]) are added to the slot in the
+ * appropriate position (vector and/or scalar), and their positions are
+ * recorded in the srcpos array.
+ *
+ * This function emits instruction code for the source fetch and the
+ * argument selection. It does not emit instruction code for the
+ * opcode or the destination selection.
+ *
+ * @return the index of the slot
+ */
+static int find_and_prepare_slot(struct r300_fragment_program* rp,
+               GLboolean emit_vop,
+               GLboolean emit_sop,
+               int argc,
+               GLuint* src,
+               GLuint dest,
+               int mask)
+{
+       COMPILE_STATE;
+       int hwsrc[3];
+       int srcpos[3];
+       unsigned int used;
+       int tempused;
+       int tempvsrc[3];
+       int tempssrc[3];
+       int pos;
+       int regnr;
+       int i,j;
+       
+       // Determine instruction slots, whether sources are required on
+       // vector or scalar side, and the smallest slot number where
+       // all source registers are available
+       used = 0;
+       if (emit_vop)
+               used |= SLOT_OP_VECTOR;
+       if (emit_sop)
+               used |= SLOT_OP_SCALAR;
+       
+       pos = get_earliest_allowed_write(rp, dest, mask);
+       
+       if (rp->node[rp->cur_node].alu_offset > pos)
+               pos = rp->node[rp->cur_node].alu_offset;
+       for(i = 0; i < argc; ++i) {
+               if (!REG_GET_BUILTIN(src[i])) {
+                       if (emit_vop)
+                               used |= v_swiz[REG_GET_VSWZ(src[i])].flags << i;
+                       if (emit_sop)
+                               used |= s_swiz[REG_GET_SSWZ(src[i])].flags << i;
+               }
+               
+               hwsrc[i] = t_hw_src(rp, src[i], GL_FALSE); /* Note: sideeffects wrt refcounting! */
+               regnr = hwsrc[i] & 31;
+               
+               if (REG_GET_TYPE(src[i]) == REG_TYPE_TEMP) {
+                       if (used & (SLOT_SRC_VECTOR << i)) {
+                               if (cs->hwtemps[regnr].vector_valid > pos)
+                                       pos = cs->hwtemps[regnr].vector_valid;
+                       }
+                       if (used & (SLOT_SRC_SCALAR << i)) {
+                               if (cs->hwtemps[regnr].scalar_valid > pos)
+                                       pos = cs->hwtemps[regnr].scalar_valid;
+                       }
+               }
+       }
+       
+       // Find a slot that fits
+       for(; ; ++pos) {
+               if (cs->slot[pos].used & used & SLOT_OP_BOTH)
+                       continue;
+               
+               if (pos >= cs->nrslots) {
+                       if (cs->nrslots >= PFS_MAX_ALU_INST) {
+                               ERROR("Out of ALU instruction slots\n");
+                               return -1;
                        }
 
-                       /* Swizzling/Negation */
-                       if (vop == R300_FPI0_OUTC_REPL_ALPHA)
-                               inst[0] |= R300_FPI0_ARGC_ZERO << (i * ARG_STRIDE);
-                       else
-                               inst[0] |= (v_swiz[src[i].v_swz].base + (i * v_swiz[src[i].v_swz].stride)) << (i*ARG_STRIDE);
-                       inst[2] |= (s_swiz[src[i].s_swz].base + (i * s_swiz[src[i].s_swz].stride)) << (i*ARG_STRIDE);
+                       rp->alu.inst[pos].inst0 = NOP_INST0;
+                       rp->alu.inst[pos].inst2 = NOP_INST2;
 
-                       if (src[i].negate) {
-                               inst[0] |= ARG_NEG << (i * ARG_STRIDE);
-                               inst[2] |= ARG_NEG << (i * ARG_STRIDE);
+                       cs->nrslots++;
+               }
+               
+               // Note: When we need both parts (vector and scalar) of a source,
+               // we always try to put them into the same position. This makes the
+               // code easier to read, and it is optimal (i.e. one doesn't gain
+               // anything by splitting the parts).
+               // It also avoids headaches with swizzles that access both parts (i.e WXY)
+               tempused = cs->slot[pos].used;
+               for(i = 0; i < 3; ++i) {
+                       tempvsrc[i] = cs->slot[pos].vsrc[i];
+                       tempssrc[i] = cs->slot[pos].ssrc[i];
+               }
+               
+               for(i = 0; i < argc; ++i) {
+                       int flags = (used >> i) & SLOT_SRC_BOTH;
+                       
+                       if (!flags) {
+                               srcpos[i] = 0;
+                               continue;
                        }
                        
-                       if (flags & PFS_FLAG_ABS) {
-                               inst[0] |= ARG_ABS << (i * ARG_STRIDE);
-                               inst[2] |= ARG_ABS << (i * ARG_STRIDE); 
+                       for(j = 0; j < 3; ++j) {
+                               if ((tempused >> j) & flags & SLOT_SRC_VECTOR) {
+                                       if (tempvsrc[j] != hwsrc[i])
+                                               continue;
+                               }
+                       
+                               if ((tempused >> j) & flags & SLOT_SRC_SCALAR) {
+                                       if (tempssrc[j] != hwsrc[i])
+                                               continue;
+                               }
+                               
+                               break;
                        }
+                       
+                       if (j == 3)
+                               break;
+                       
+                       srcpos[i] = j;
+                       tempused |= flags << j;
+                       if (flags & SLOT_SRC_VECTOR)
+                               tempvsrc[j] = hwsrc[i];
+                       if (flags & SLOT_SRC_SCALAR)
+                               tempssrc[j] = hwsrc[i];
+               }
+               
+               if (i == argc)
+                       break;
+       }
+       
+       // Found a slot, reserve it
+       cs->slot[pos].used = tempused | (used & SLOT_OP_BOTH);
+       for(i = 0; i < 3; ++i) {
+               cs->slot[pos].vsrc[i] = tempvsrc[i];
+               cs->slot[pos].ssrc[i] = tempssrc[i];
+       }
+       
+       for(i = 0; i < argc; ++i) {
+               if (REG_GET_TYPE(src[i]) == REG_TYPE_TEMP) {
+                       int regnr = hwsrc[i] & 31;
+                       
+                       if (used & (SLOT_SRC_VECTOR << i)) {
+                               if (cs->hwtemps[regnr].vector_lastread < pos)
+                                       cs->hwtemps[regnr].vector_lastread = pos;
+                       }
+                       if (used & (SLOT_SRC_SCALAR << i)) {
+                               if (cs->hwtemps[regnr].scalar_lastread < pos)
+                                       cs->hwtemps[regnr].scalar_lastread = pos;
+                       }
+               }
+       }
+       
+       // Emit the source fetch code
+       rp->alu.inst[pos].inst1 &= ~R300_FPI1_SRC_MASK;
+       rp->alu.inst[pos].inst1 |=
+                       ((cs->slot[pos].vsrc[0] << R300_FPI1_SRC0C_SHIFT) |
+                        (cs->slot[pos].vsrc[1] << R300_FPI1_SRC1C_SHIFT) |
+                        (cs->slot[pos].vsrc[2] << R300_FPI1_SRC2C_SHIFT));
+       
+       rp->alu.inst[pos].inst3 &= ~R300_FPI3_SRC_MASK;
+       rp->alu.inst[pos].inst3 |=
+                       ((cs->slot[pos].ssrc[0] << R300_FPI3_SRC0A_SHIFT) |
+                        (cs->slot[pos].ssrc[1] << R300_FPI3_SRC1A_SHIFT) |
+                        (cs->slot[pos].ssrc[2] << R300_FPI3_SRC2A_SHIFT));
+       
+       // Emit the argument selection code
+       if (emit_vop) {
+               int swz[3];
+               
+               for(i = 0; i < 3; ++i) {
+                       if (i < argc) {
+                               swz[i] = (v_swiz[REG_GET_VSWZ(src[i])].base +
+                                           (srcpos[i] * v_swiz[REG_GET_VSWZ(src[i])].stride)) |
+                                       ((src[i] & REG_NEGV_MASK) ? ARG_NEG : 0) |
+                                       ((src[i] & REG_ABS_MASK) ? ARG_ABS : 0);
+                       } else {
+                               swz[i] = R300_FPI0_ARGC_ZERO;
+                       }
+               }
+               
+               rp->alu.inst[pos].inst0 &=
+                               ~(R300_FPI0_ARG0C_MASK|R300_FPI0_ARG1C_MASK|R300_FPI0_ARG2C_MASK);
+               rp->alu.inst[pos].inst0 |=
+                               (swz[0] << R300_FPI0_ARG0C_SHIFT) |
+                               (swz[1] << R300_FPI0_ARG1C_SHIFT) |
+                               (swz[2] << R300_FPI0_ARG2C_SHIFT);
+       }
+       
+       if (emit_sop) {
+               int swz[3];
+               
+               for(i = 0; i < 3; ++i) {
+                       if (i < argc) {
+                               swz[i] = (s_swiz[REG_GET_SSWZ(src[i])].base +
+                                               (srcpos[i] * s_swiz[REG_GET_SSWZ(src[i])].stride)) |
+                                               ((src[i] & REG_NEGV_MASK) ? ARG_NEG : 0) |
+                                               ((src[i] & REG_ABS_MASK) ? ARG_ABS : 0);
+                       } else {
+                               swz[i] = R300_FPI2_ARGA_ZERO;
+                       }
+               }
+               
+               rp->alu.inst[pos].inst2 &=
+                               ~(R300_FPI2_ARG0A_MASK|R300_FPI2_ARG1A_MASK|R300_FPI2_ARG2A_MASK);
+               rp->alu.inst[pos].inst2 |=
+                               (swz[0] << R300_FPI2_ARG0A_SHIFT) |
+                               (swz[1] << R300_FPI2_ARG1A_SHIFT) |
+                               (swz[2] << R300_FPI2_ARG2A_SHIFT);
+       }
+
+       return pos;
+}
+
+
+/**
+ * Append an ALU instruction to the instruction list.
+ */
+static void emit_arith(struct r300_fragment_program *rp,
+                      int op,
+                      GLuint dest,
+                      int mask,
+                      GLuint src0,
+                      GLuint src1,
+                      GLuint src2,
+                      int flags)
+{
+       COMPILE_STATE;
+       GLuint src[3] = { src0, src1, src2 };
+       int hwdest;
+       GLboolean emit_vop, emit_sop;
+       int vop, sop, argc;
+       int pos;
+
+       vop = r300_fpop[op].v_op;
+       sop = r300_fpop[op].s_op;
+       argc = r300_fpop[op].argc;
+
+       if (REG_GET_TYPE(dest) == REG_TYPE_OUTPUT &&
+           REG_GET_INDEX(dest) == FRAG_RESULT_DEPR) {
+               if (mask & WRITEMASK_Z) {
+                       mask = WRITEMASK_W;
                } else {
-                       /* read constant 0, use zero swizzle aswell */
-                       inst[0] |= R300_FPI0_ARGC_ZERO << (i*ARG_STRIDE);
-                       inst[1] |= SRC_CONST << (i*SRC_STRIDE);
-                       inst[2] |= R300_FPI2_ARGA_ZERO << (i*ARG_STRIDE);
-                       inst[3] |= SRC_CONST << (i*SRC_STRIDE);
+                       return;
                }
        }
 
+       emit_vop = GL_FALSE;
+       emit_sop = GL_FALSE;
+       if ((mask & WRITEMASK_XYZ) || vop == R300_FPI0_OUTC_DP3)
+               emit_vop = GL_TRUE;
+       if ((mask & WRITEMASK_W) || vop == R300_FPI0_OUTC_REPL_ALPHA)
+               emit_sop = GL_TRUE;
+
+       pos = find_and_prepare_slot(rp, emit_vop, emit_sop, argc, src, dest, mask);
+       if (pos < 0)
+               return;
+       
+       hwdest = t_hw_dst(rp, dest, GL_FALSE, pos); /* Note: Side effects wrt register allocation */
+       
        if (flags & PFS_FLAG_SAT) {
                vop |= R300_FPI0_OUTC_SAT;
                sop |= R300_FPI2_OUTA_SAT;
        }
+
+       /* Throw the pieces together and get FPI0/1 */
+       if (emit_vop) {
+               rp->alu.inst[pos].inst0 |= vop;
+
+               rp->alu.inst[pos].inst1 |= hwdest << R300_FPI1_DSTC_SHIFT;
                
-       if (mask & WRITEMASK_XYZ) {
-               if (r300_fpop[op].v_op == R300_FPI0_OUTC_REPL_ALPHA) {
-                       sync_streams(rp);
-                       s_idx = v_idx = rp->v_pos;
+               if (REG_GET_TYPE(dest) == REG_TYPE_OUTPUT) {
+                       if (REG_GET_INDEX(dest) == FRAG_RESULT_COLR) {
+                               rp->alu.inst[pos].inst1 |=
+                                       (mask & WRITEMASK_XYZ) << R300_FPI1_DSTC_OUTPUT_MASK_SHIFT;
+                       } else assert(0);
+               } else {
+                       rp->alu.inst[pos].inst1 |=
+                                       (mask & WRITEMASK_XYZ) << R300_FPI1_DSTC_REG_MASK_SHIFT;
+                       
+                       cs->hwtemps[hwdest].vector_valid = pos+1;
+               }
+       }
+
+       /* And now FPI2/3 */
+       if (emit_sop) {
+               rp->alu.inst[pos].inst2 |= sop;
+
+               if (mask & WRITEMASK_W) {
+                       if (REG_GET_TYPE(dest) == REG_TYPE_OUTPUT) {
+                               if (REG_GET_INDEX(dest) == FRAG_RESULT_COLR) {
+                                       rp->alu.inst[pos].inst3 |= 
+                                                       (hwdest << R300_FPI3_DSTA_SHIFT) | R300_FPI3_DSTA_OUTPUT;
+                               } else if (REG_GET_INDEX(dest) == FRAG_RESULT_DEPR) {
+                                       rp->alu.inst[pos].inst3 |= R300_FPI3_DSTA_DEPTH;
+                               } else assert(0);
+                       } else {
+                               rp->alu.inst[pos].inst3 |=
+                                               (hwdest << R300_FPI3_DSTA_SHIFT) | R300_FPI3_DSTA_REG;
+                       
+                               cs->hwtemps[hwdest].scalar_valid = pos+1;
+                       }
                }
-               rp->alu.inst[v_idx].inst0 = inst[0] | vop;
-               rp->alu.inst[v_idx].inst1 = inst[1] |
-                               (hwdest << R300_FPI1_DSTC_SHIFT) |
-                               ((mask & WRITEMASK_XYZ) << (dest.type == REG_TYPE_OUTPUT ? 26 : 23));
-               rp->v_pos = v_idx + 1;
        }
        
-       if ((mask & WRITEMASK_W) || r300_fpop[op].v_op == R300_FPI0_OUTC_REPL_ALPHA) {
-               rp->alu.inst[s_idx].inst2 = inst[2] | sop;
-               rp->alu.inst[s_idx].inst3 = inst[3] |
-                               (hwdest << R300_FPI3_DSTA_SHIFT) |
-                               (((mask & WRITEMASK_W)?1:0) << (dest.type == REG_TYPE_OUTPUT ? 24 : 23));
-               rp->s_pos = s_idx + 1;
+       return;
+}
+
+#if 0
+static GLuint get_attrib(struct r300_fragment_program *rp, GLuint attr)
+{
+       struct gl_fragment_program *mp = &rp->mesa_program;
+       GLuint r = undef;
+
+       if (!(mp->Base.InputsRead & (1<<attr))) {
+               ERROR("Attribute %d was not provided!\n", attr);
+               return undef;
        }
 
-/* Force this for now */
-       sync_streams(rp);
-       return;
-};
+       REG_SET_TYPE(r, REG_TYPE_INPUT);
+       REG_SET_INDEX(r, attr);
+       REG_SET_VALID(r, GL_TRUE);
+       return r;
+}
+#endif
+
+static void make_sin_const(struct r300_fragment_program *rp)
+{
+       if(rp->const_sin[0] == -1){
+           GLfloat cnstv[4];
+
+           cnstv[0] = 1.273239545; // 4/PI
+           cnstv[1] =-0.405284735; // -4/(PI*PI)
+           cnstv[2] = 3.141592654; // PI
+           cnstv[3] = 0.2225;      // weight
+           rp->const_sin[0] = emit_const4fv(rp, cnstv);
+
+           cnstv[0] = 0.75;
+           cnstv[1] = 0.0;
+           cnstv[2] = 0.159154943; // 1/(2*PI)
+           cnstv[3] = 6.283185307; // 2*PI
+           rp->const_sin[1] = emit_const4fv(rp, cnstv);
+       }
+}
+
+/**
+ * Emit a LIT instruction.
+ * \p flags may be PFS_FLAG_SAT
+ *
+ * Definition of LIT (from ARB_fragment_program):
+ * tmp = VectorLoad(op0);
+ * if (tmp.x < 0) tmp.x = 0;
+ * if (tmp.y < 0) tmp.y = 0;
+ * if (tmp.w < -(128.0-epsilon)) tmp.w = -(128.0-epsilon);
+ * else if (tmp.w > 128-epsilon) tmp.w = 128-epsilon;
+ * result.x = 1.0;
+ * result.y = tmp.x;
+ * result.z = (tmp.x > 0) ? RoughApproxPower(tmp.y, tmp.w) : 0.0;
+ * result.w = 1.0;
+ *
+ * The longest path of computation is the one leading to result.z,
+ * consisting of 5 operations. This implementation of LIT takes
+ * 5 slots. So unless there's some special undocumented opcode,
+ * this implementation is potentially optimal. Unfortunately,
+ * emit_arith is a bit too conservative because it doesn't understand
+ * partial writes to the vector component.
+ */
+static void emit_lit(struct r300_fragment_program *rp,
+               GLuint dest,
+               int mask,
+               GLuint src,
+               int flags)
+{
+       COMPILE_STATE;
+       static const GLfloat cnstv[4] = { 127.999999, 127.999999, 127.999999, -127.999999 };
+       GLuint cnst;
+       int needTemporary;
+       GLuint temp;
+       
+       cnst = emit_const4fv(rp, cnstv);
+       
+       needTemporary = 0;
+       if ((mask & WRITEMASK_XYZW) != WRITEMASK_XYZW) {
+               needTemporary = 1;
+       } else if (REG_GET_TYPE(dest) == REG_TYPE_OUTPUT) {
+               // LIT is typically followed by DP3/DP4, so there's no point
+               // in creating special code for this case
+               needTemporary = 1;
+       }
+       
+       if (needTemporary) {
+               temp = keep(get_temp_reg(rp));
+       } else {
+               temp = keep(dest);
+       }
+       
+       // Npte: The order of emit_arith inside the slots is relevant,
+       // because emit_arith only looks at scalar vs. vector when resolving
+       // dependencies, and it does not consider individual vector components,
+       // so swizzling between the two parts can create fake dependencies.
        
+       // First slot
+       emit_arith(rp, PFS_OP_MAX, temp, WRITEMASK_XY,
+                  keep(src), pfs_zero, undef, 0);
+       emit_arith(rp, PFS_OP_MAX, temp, WRITEMASK_W,
+                  src, cnst, undef, 0);
+       
+       // Second slot
+       emit_arith(rp, PFS_OP_MIN, temp, WRITEMASK_Z,
+                  swizzle(temp, W, W, W, W), cnst, undef, 0);
+       emit_arith(rp, PFS_OP_LG2, temp, WRITEMASK_W,
+                  swizzle(temp, Y, Y, Y, Y), undef, undef, 0);
+       
+       // Third slot
+       // If desired, we saturate the y result here.
+       // This does not affect the use as a condition variable in the CMP later
+       emit_arith(rp, PFS_OP_MAD, temp, WRITEMASK_W,
+                  temp, swizzle(temp, Z, Z, Z, Z), pfs_zero, 0);
+       emit_arith(rp, PFS_OP_MAD, temp, WRITEMASK_Y,
+                  swizzle(temp, X, X, X, X), pfs_one, pfs_zero, flags);
+       
+       // Fourth slot
+       emit_arith(rp, PFS_OP_MAD, temp, WRITEMASK_X,
+                  pfs_one, pfs_one, pfs_zero, 0);
+       emit_arith(rp, PFS_OP_EX2, temp, WRITEMASK_W,
+                  temp, undef, undef, 0);
+       
+       // Fifth slot
+       emit_arith(rp, PFS_OP_CMP, temp, WRITEMASK_Z,
+                  swizzle(temp, W, W, W, W), pfs_zero, swizzle(temp, Y, Y, Y, Y), flags);
+       emit_arith(rp, PFS_OP_MAD, temp, WRITEMASK_W,
+                  pfs_one, pfs_one, pfs_zero, 0);
+       
+       if (needTemporary) {
+               emit_arith(rp, PFS_OP_MAD, dest, mask,
+                                  temp, pfs_one, pfs_zero, flags);
+               free_temp(rp, temp);
+       } else {
+               // Decrease refcount of the destination
+               t_hw_dst(rp, dest, GL_FALSE, cs->nrslots);
+       }
+}
+
+
 static GLboolean parse_program(struct r300_fragment_program *rp)
 {      
-       struct fragment_program *mp = &rp->mesa_program;
-       const struct fp_instruction *inst = mp->Instructions;
-       struct fp_instruction *fpi;
-       pfs_reg_t src0, src1, src2, dest, temp;
-       int flags = 0;
+       struct gl_fragment_program *mp = &rp->mesa_program;
+       const struct prog_instruction *inst = mp->Base.Instructions;
+       struct prog_instruction *fpi;
+       GLuint src[3], dest, temp[2];
+       int flags, mask = 0;
 
-       if (!inst || inst[0].Opcode == FP_OPCODE_END) {
+       if (!inst || inst[0].Opcode == OPCODE_END) {
                ERROR("empty program?\n");
                return GL_FALSE;
        }
 
-       for (fpi=mp->Instructions; fpi->Opcode != FP_OPCODE_END; fpi++) {
-               if (fpi->Saturate) {
+       for (fpi=mp->Base.Instructions; fpi->Opcode != OPCODE_END; fpi++) {
+               if (fpi->SaturateMode == SATURATE_ZERO_ONE)
                        flags = PFS_FLAG_SAT;
+               else
+                       flags = 0;
+
+               if (fpi->Opcode != OPCODE_KIL) {
+                       dest = t_dst(rp, fpi->DstReg);
+                       mask = fpi->DstReg.WriteMask;
                }
-               
+
                switch (fpi->Opcode) {
-               case FP_OPCODE_ABS:
-                       ERROR("unknown fpi->Opcode %d\n", fpi->Opcode);
+               case OPCODE_ABS:
+                       src[0] = t_src(rp, fpi->SrcReg[0]);
+                       emit_arith(rp, PFS_OP_MAD, dest, mask,
+                                  absolute(src[0]), pfs_one, pfs_zero,
+                                  flags);
                        break;
-               case FP_OPCODE_ADD:
-                       emit_arith(rp, PFS_OP_MAD, t_dst(rp, fpi->DstReg), fpi->DstReg.WriteMask,
-                                                       t_src(rp, fpi->SrcReg[0]),
-                                                       pfs_one,
-                                                       t_src(rp, fpi->SrcReg[1]),
-                                                       flags);
+               case OPCODE_ADD:
+                       src[0] = t_src(rp, fpi->SrcReg[0]);
+                       src[1] = t_src(rp, fpi->SrcReg[1]);
+                       emit_arith(rp, PFS_OP_MAD, dest, mask,
+                                  src[0], pfs_one, src[1],
+                                  flags);
                        break;
-               case FP_OPCODE_CMP:
-               case FP_OPCODE_COS:
-                       ERROR("unknown fpi->Opcode %d\n", fpi->Opcode);
+               case OPCODE_CMP:
+                       src[0] = t_src(rp, fpi->SrcReg[0]);
+                       src[1] = t_src(rp, fpi->SrcReg[1]);
+                       src[2] = t_src(rp, fpi->SrcReg[2]);
+                       /* ARB_f_p - if src0.c < 0.0 ? src1.c : src2.c
+                        *    r300 - if src2.c < 0.0 ? src1.c : src0.c
+                        */
+                       emit_arith(rp, PFS_OP_CMP, dest, mask,
+                                  src[2], src[1], src[0],
+                                  flags);
                        break;
-               case FP_OPCODE_DP3:
-                       dest = t_dst(rp, fpi->DstReg);
-                       if (fpi->DstReg.WriteMask & WRITEMASK_W) {
-                               /* I assume these need to share the same alu slot */
-                               sync_streams(rp);
-                               emit_arith(rp, PFS_OP_DP4, dest, WRITEMASK_W, 
-                                                               pfs_zero, pfs_zero, pfs_zero,
-                                                               flags);
+               case OPCODE_COS:
+                       /*
+                        * cos using a parabola (see SIN):
+                        * cos(x):
+                        *   x = (x/(2*PI))+0.75
+                        *   x = frac(x)
+                        *   x = (x*2*PI)-PI
+                        *   result = sin(x)
+                        */
+                       temp[0] = get_temp_reg(rp);
+                       make_sin_const(rp);
+                       src[0] = t_scalar_src(rp, fpi->SrcReg[0]);
+
+                       /* add 0.5*PI and do range reduction */
+
+                       emit_arith(rp, PFS_OP_MAD, temp[0], WRITEMASK_X,
+                                  swizzle(src[0], X, X, X, X),
+                                  swizzle(rp->const_sin[1], Z, Z, Z, Z),
+                                  swizzle(rp->const_sin[1], X, X, X, X),
+                                  0);
+
+                       emit_arith(rp, PFS_OP_FRC, temp[0], WRITEMASK_X,
+                                  swizzle(temp[0], X, X, X, X),
+                                  undef,
+                                  undef,
+                                  0);
+
+                       emit_arith(rp, PFS_OP_MAD, temp[0], WRITEMASK_Z,
+                                  swizzle(temp[0], X, X, X, X),
+                                  swizzle(rp->const_sin[1], W, W, W, W), //2*PI
+                                  negate(swizzle(rp->const_sin[0], Z, Z, Z, Z)), //-PI
+                                  0);
+
+                       /* SIN */
+
+                       emit_arith(rp, PFS_OP_MAD, temp[0], WRITEMASK_X | WRITEMASK_Y,
+                                  swizzle(temp[0], Z, Z, Z, Z),
+                                  rp->const_sin[0],
+                                  pfs_zero,
+                                  0);
+
+                       emit_arith(rp, PFS_OP_MAD, temp[0], WRITEMASK_X,
+                                  swizzle(temp[0], Y, Y, Y, Y),
+                                  absolute(swizzle(temp[0], Z, Z, Z, Z)),
+                                  swizzle(temp[0], X, X, X, X),
+                                  0);
+                       
+                       emit_arith(rp, PFS_OP_MAD, temp[0], WRITEMASK_Y,
+                                  swizzle(temp[0], X, X, X, X),
+                                  absolute(swizzle(temp[0], X, X, X, X)),
+                                  negate(swizzle(temp[0], X, X, X, X)),
+                                  0);
+
+
+                       emit_arith(rp, PFS_OP_MAD, dest, mask,
+                                  swizzle(temp[0], Y, Y, Y, Y),
+                                  swizzle(rp->const_sin[0], W, W, W, W),
+                                  swizzle(temp[0], X, X, X, X),
+                                  flags);
+
+                       free_temp(rp, temp[0]);
+                       break;
+               case OPCODE_DP3:
+                       src[0] = t_src(rp, fpi->SrcReg[0]);
+                       src[1] = t_src(rp, fpi->SrcReg[1]);
+                       emit_arith(rp, PFS_OP_DP3, dest, mask,
+                                  src[0], src[1], undef,
+                                  flags);
+                       break;
+               case OPCODE_DP4:
+                       src[0] = t_src(rp, fpi->SrcReg[0]);
+                       src[1] = t_src(rp, fpi->SrcReg[1]);
+                       emit_arith(rp, PFS_OP_DP4, dest, mask,
+                                  src[0], src[1], undef,
+                                  flags);
+                       break;
+               case OPCODE_DPH:
+                       src[0] = t_src(rp, fpi->SrcReg[0]);
+                       src[1] = t_src(rp, fpi->SrcReg[1]);
+                       /* src0.xyz1 -> temp
+                        * DP4 dest, temp, src1
+                        */
+#if 0
+                       temp[0] = get_temp_reg(rp);
+                       src[0].s_swz = SWIZZLE_ONE;
+                       emit_arith(rp, PFS_OP_MAD, temp[0], mask,
+                                  src[0], pfs_one, pfs_zero,
+                                  0);
+                       emit_arith(rp, PFS_OP_DP4, dest, mask,
+                                  temp[0], src[1], undef,
+                                  flags);      
+                       free_temp(rp, temp[0]);
+#else
+                       emit_arith(rp, PFS_OP_DP4, dest, mask,
+                                  swizzle(src[0], X, Y, Z, ONE), src[1],
+                                  undef, flags);       
+#endif
+                       break;
+               case OPCODE_DST:
+                       src[0] = t_src(rp, fpi->SrcReg[0]);
+                       src[1] = t_src(rp, fpi->SrcReg[1]);
+                       /* dest.y = src0.y * src1.y */
+                       if (mask & WRITEMASK_Y)
+                               emit_arith(rp, PFS_OP_MAD, dest, WRITEMASK_Y,
+                                          keep(src[0]), keep(src[1]),
+                                          pfs_zero, flags);
+                       /* dest.z = src0.z */
+                       if (mask & WRITEMASK_Z)
+                               emit_arith(rp, PFS_OP_MAD, dest, WRITEMASK_Z,
+                                          src[0], pfs_one, pfs_zero, flags);
+                       /* result.x = 1.0
+                        * result.w = src1.w */
+                       if (mask & WRITEMASK_XW) {
+                               REG_SET_VSWZ(src[1], SWIZZLE_111); /*Cheat*/
+                               emit_arith(rp, PFS_OP_MAD, dest,
+                                          mask & WRITEMASK_XW,
+                                          src[1], pfs_one, pfs_zero,
+                                          flags);
                        }
-                       emit_arith(rp, PFS_OP_DP3, t_dst(rp, fpi->DstReg),
-                                                       fpi->DstReg.WriteMask & WRITEMASK_XYZ,
-                                                       t_src(rp, fpi->SrcReg[0]),
-                                                       t_src(rp, fpi->SrcReg[1]),
-                                                       pfs_zero, flags);
                        break;
-               case FP_OPCODE_DP4:
-               case FP_OPCODE_DPH:
-               case FP_OPCODE_DST:
-               case FP_OPCODE_EX2:
-               case FP_OPCODE_FLR:
-               case FP_OPCODE_FRC:
-               case FP_OPCODE_KIL:
-               case FP_OPCODE_LG2:
-               case FP_OPCODE_LIT:
-                       ERROR("unknown fpi->Opcode %d\n", fpi->Opcode);
+               case OPCODE_EX2:
+                       src[0] = t_scalar_src(rp, fpi->SrcReg[0]);
+                       emit_arith(rp, PFS_OP_EX2, dest, mask,
+                                  src[0], undef, undef,
+                                  flags);
+                       break;
+               case OPCODE_FLR:                
+                       src[0] = t_src(rp, fpi->SrcReg[0]);
+                       temp[0] = get_temp_reg(rp);
+                       /* FRC temp, src0
+                        * MAD dest, src0, 1.0, -temp
+                        */
+                       emit_arith(rp, PFS_OP_FRC, temp[0], mask,
+                                  keep(src[0]), undef, undef,
+                                  0);
+                       emit_arith(rp, PFS_OP_MAD, dest, mask,
+                                  src[0], pfs_one, negate(temp[0]),
+                                  flags);
+                       free_temp(rp, temp[0]);
+                       break;
+               case OPCODE_FRC:
+                       src[0] = t_src(rp, fpi->SrcReg[0]);
+                       emit_arith(rp, PFS_OP_FRC, dest, mask,
+                                  src[0], undef, undef,
+                                  flags);
+                       break;
+               case OPCODE_KIL:
+                       emit_tex(rp, fpi, R300_FPITX_OP_KIL);
+                       break;
+               case OPCODE_LG2:
+                       src[0] = t_scalar_src(rp, fpi->SrcReg[0]);
+                       emit_arith(rp, PFS_OP_LG2, dest, mask,
+                                  src[0], undef, undef,
+                                  flags);
                        break;
-               case FP_OPCODE_LRP:
-                       /* TODO: use the special LRP form if possible */
-                       src0 = t_src(rp, fpi->SrcReg[0]);
-                       src1 = t_src(rp, fpi->SrcReg[1]);
-                       src2 = t_src(rp, fpi->SrcReg[2]);
-                       // result = tmp0tmp1 + (1 - tmp0)tmp2
-                       //        = tmp0tmp1 + tmp2 + (-tmp0)tmp2
-                       //     MAD temp, -tmp0, tmp2, tmp2
-                       //     MAD result, tmp0, tmp1, temp
-                       temp = get_temp_reg(rp);
-                       emit_arith(rp, PFS_OP_MAD, temp, WRITEMASK_XYZW,
-                                                       negate(src0), src2, src2, 0);
-                       emit_arith(rp, PFS_OP_MAD, t_dst(rp, fpi->DstReg), fpi->DstReg.WriteMask,
-                                                       src0, src1, temp, flags);
-                       free_temp(rp, temp);
+               case OPCODE_LIT:
+                       src[0] = t_src(rp, fpi->SrcReg[0]);
+                       emit_lit(rp, dest, mask, src[0], flags);
+                       break;
+               case OPCODE_LRP:
+                       src[0] = t_src(rp, fpi->SrcReg[0]);
+                       src[1] = t_src(rp, fpi->SrcReg[1]);
+                       src[2] = t_src(rp, fpi->SrcReg[2]);
+                       /* result = tmp0tmp1 + (1 - tmp0)tmp2
+                        *        = tmp0tmp1 + tmp2 + (-tmp0)tmp2
+                        *     MAD temp, -tmp0, tmp2, tmp2
+                        *     MAD result, tmp0, tmp1, temp
+                        */
+                       temp[0] = get_temp_reg(rp);
+                       emit_arith(rp, PFS_OP_MAD, temp[0], mask,
+                                  negate(keep(src[0])), keep(src[2]), src[2],
+                                  0);
+                       emit_arith(rp, PFS_OP_MAD, dest, mask,
+                                  src[0], src[1], temp[0],
+                                  flags);
+                       free_temp(rp, temp[0]);
                        break;                  
-               case FP_OPCODE_MAD:
-                       emit_arith(rp, PFS_OP_MAD, t_dst(rp, fpi->DstReg), fpi->DstReg.WriteMask,
-                                                       t_src(rp, fpi->SrcReg[0]),
-                                                       t_src(rp, fpi->SrcReg[1]),
-                                                       t_src(rp, fpi->SrcReg[2]),
-                                                       flags);
+               case OPCODE_MAD:
+                       src[0] = t_src(rp, fpi->SrcReg[0]);
+                       src[1] = t_src(rp, fpi->SrcReg[1]);
+                       src[2] = t_src(rp, fpi->SrcReg[2]);
+                       emit_arith(rp, PFS_OP_MAD, dest, mask,
+                                  src[0], src[1], src[2],
+                                  flags);
                        break;
-               case FP_OPCODE_MAX:
-               case FP_OPCODE_MIN:
-                       ERROR("unknown fpi->Opcode %d\n", fpi->Opcode);
+               case OPCODE_MAX:
+                       src[0] = t_src(rp, fpi->SrcReg[0]);
+                       src[1] = t_src(rp, fpi->SrcReg[1]);
+                       emit_arith(rp, PFS_OP_MAX, dest, mask,
+                                  src[0], src[1], undef,
+                                  flags);
                        break;
-               case FP_OPCODE_MOV:
-               case FP_OPCODE_SWZ:
-                       emit_arith(rp, PFS_OP_MAD, t_dst(rp, fpi->DstReg), fpi->DstReg.WriteMask,
-                                                       t_src(rp, fpi->SrcReg[0]), pfs_one, pfs_zero, 
-                                                       flags);
+               case OPCODE_MIN:
+                       src[0] = t_src(rp, fpi->SrcReg[0]);
+                       src[1] = t_src(rp, fpi->SrcReg[1]);
+                       emit_arith(rp, PFS_OP_MIN, dest, mask,
+                                  src[0], src[1], undef,
+                                  flags);
                        break;
-               case FP_OPCODE_MUL:
-                       emit_arith(rp, PFS_OP_MAD, t_dst(rp, fpi->DstReg), fpi->DstReg.WriteMask,
-                                                       t_src(rp, fpi->SrcReg[0]),
-                                                       t_src(rp, fpi->SrcReg[1]),
-                                                       pfs_zero,
-                                                       flags);
+               case OPCODE_MOV:
+               case OPCODE_SWZ:
+                       src[0] = t_src(rp, fpi->SrcReg[0]);
+                       emit_arith(rp, PFS_OP_MAD, dest, mask,
+                                  src[0], pfs_one, pfs_zero, 
+                                  flags);
                        break;
-               case FP_OPCODE_POW:
-                       /* I don't like this, and it's probably wrong in some
-                        * circumstances... Needs checking */
-                       src0 = t_src(rp, fpi->SrcReg[0]);
-                       src1 = t_src(rp, fpi->SrcReg[1]);
-                       dest = t_dst(rp, fpi->DstReg);
-                       temp = get_temp_reg(rp);
-                       temp.s_swz = SWIZZLE_X; /* cheat, bypass swizzle code */
-
-                       emit_arith(rp, PFS_OP_LG2, temp, WRITEMASK_X,
-                                                       src0, pfs_zero, pfs_zero, 0);
-                       emit_arith(rp, PFS_OP_MAD, temp, WRITEMASK_X,
-                                                       temp, src1, pfs_zero, 0);
+               case OPCODE_MUL:
+                       src[0] = t_src(rp, fpi->SrcReg[0]);
+                       src[1] = t_src(rp, fpi->SrcReg[1]);
+                       emit_arith(rp, PFS_OP_MAD, dest, mask,
+                                  src[0], src[1], pfs_zero,
+                                  flags);
+                       break;
+               case OPCODE_POW:
+                       src[0] = t_scalar_src(rp, fpi->SrcReg[0]);
+                       src[1] = t_scalar_src(rp, fpi->SrcReg[1]);
+                       temp[0] = get_temp_reg(rp);     
+                       emit_arith(rp, PFS_OP_LG2, temp[0], WRITEMASK_W,
+                                  src[0], undef, undef,
+                                  0);
+                       emit_arith(rp, PFS_OP_MAD, temp[0], WRITEMASK_W,
+                                  temp[0], src[1], pfs_zero,
+                                  0);
                        emit_arith(rp, PFS_OP_EX2, dest, fpi->DstReg.WriteMask,
-                                                       temp, pfs_zero, pfs_zero, 0);
-                       free_temp(rp, temp);
+                                  temp[0], undef, undef,
+                                  0);
+                       free_temp(rp, temp[0]);
                        break;
-               case FP_OPCODE_RCP:
-                       ERROR("unknown fpi->Opcode %d\n", fpi->Opcode);
+               case OPCODE_RCP:
+                       src[0] = t_scalar_src(rp, fpi->SrcReg[0]);
+                       emit_arith(rp, PFS_OP_RCP, dest, mask,
+                                  src[0], undef, undef,
+                                  flags);
                        break;
-               case FP_OPCODE_RSQ:
-                       emit_arith(rp, PFS_OP_RSQ, t_dst(rp, fpi->DstReg),
-                                                       fpi->DstReg.WriteMask,
-                                                       t_src(rp, fpi->SrcReg[0]), pfs_zero, pfs_zero,
-                                                       flags | PFS_FLAG_ABS);
+               case OPCODE_RSQ:
+                       src[0] = t_scalar_src(rp, fpi->SrcReg[0]);
+                       emit_arith(rp, PFS_OP_RSQ, dest, mask,
+                                  absolute(src[0]), pfs_zero, pfs_zero,
+                                  flags);
                        break;
-               case FP_OPCODE_SCS:
-               case FP_OPCODE_SGE:
-               case FP_OPCODE_SIN:
-               case FP_OPCODE_SLT:
-                       ERROR("unknown fpi->Opcode %d\n", fpi->Opcode);
+               case OPCODE_SCS:
+                       /*
+                        * scs using a parabola :
+                        * scs(x):
+                        *   result.x = sin(-abs(x)+0.5*PI)  (cos)
+                        *   result.y = sin(x)               (sin)
+                        *
+                        */
+                       temp[0] = get_temp_reg(rp);
+                       temp[1] = get_temp_reg(rp);
+                       make_sin_const(rp);
+                       src[0] = t_scalar_src(rp, fpi->SrcReg[0]);
+
+                       /* x = -abs(x)+0.5*PI */
+                       emit_arith(rp, PFS_OP_MAD, temp[0], WRITEMASK_Z,
+                                  swizzle(rp->const_sin[0], Z, Z, Z, Z), //PI
+                                  pfs_half,
+                                  negate(abs(swizzle(keep(src[0]), X, X, X, X))),
+                                  0);
+
+                       /* C*x (sin) */
+                       emit_arith(rp, PFS_OP_MAD, temp[0], WRITEMASK_W,
+                                  swizzle(rp->const_sin[0], Y, Y, Y, Y),
+                                  swizzle(keep(src[0]), X, X, X, X),
+                                  pfs_zero,
+                                  0);
+
+                       /* B*x, C*x (cos) */
+                       emit_arith(rp, PFS_OP_MAD, temp[0], WRITEMASK_X | WRITEMASK_Y,
+                                  swizzle(temp[0], Z, Z, Z, Z),
+                                  rp->const_sin[0],
+                                  pfs_zero,
+                                  0);
+
+                       /* B*x (sin) */
+                       emit_arith(rp, PFS_OP_MAD, temp[1], WRITEMASK_W,
+                                  swizzle(rp->const_sin[0], X, X, X, X),
+                                  keep(src[0]),
+                                  pfs_zero,
+                                  0);
+
+                       /* y = B*x + C*x*abs(x) (sin)*/
+                       emit_arith(rp, PFS_OP_MAD, temp[1], WRITEMASK_Z,
+                                  absolute(src[0]),
+                                  swizzle(temp[0], W, W, W, W),
+                                  swizzle(temp[1], W, W, W, W),
+                                  0);
+
+                       /* y = B*x + C*x*abs(x) (cos)*/
+                       emit_arith(rp, PFS_OP_MAD, temp[1], WRITEMASK_W,
+                                  swizzle(temp[0], Y, Y, Y, Y),
+                                  absolute(swizzle(temp[0], Z, Z, Z, Z)),
+                                  swizzle(temp[0], X, X, X, X),
+                                  0);
+
+                       /* y*abs(y) - y (cos), y*abs(y) - y (sin) */
+                       emit_arith(rp, PFS_OP_MAD, temp[0], WRITEMASK_X | WRITEMASK_Y,
+                                  swizzle(temp[1], W, Z, Y, X),
+                                  absolute(swizzle(temp[1], W, Z, Y, X)),
+                                  negate(swizzle(temp[1], W, Z, Y, X)),
+
+                                  0);
+
+                       /* dest.xy = mad(temp.xy, P, temp2.wz) */
+                       emit_arith(rp, PFS_OP_MAD, dest, mask & (WRITEMASK_X | WRITEMASK_Y),
+                                  temp[0],
+                                  swizzle(rp->const_sin[0], W, W, W, W),
+                                  swizzle(temp[1], W, Z, Y, X),
+                                  flags);
+
+                       free_temp(rp, temp[0]);
+                       free_temp(rp, temp[1]);
                        break;
-               case FP_OPCODE_SUB:
-                       emit_arith(rp, PFS_OP_MAD, t_dst(rp, fpi->DstReg), fpi->DstReg.WriteMask,
-                                                       t_src(rp, fpi->SrcReg[0]),
-                                                       pfs_one,
-                                                       negate(t_src(rp, fpi->SrcReg[1])),
-                                                       flags);
+               case OPCODE_SGE:
+                       src[0] = t_src(rp, fpi->SrcReg[0]);
+                       src[1] = t_src(rp, fpi->SrcReg[1]);
+                       temp[0] = get_temp_reg(rp);
+                       /* temp = src0 - src1
+                        * dest.c = (temp.c < 0.0) ? 0 : 1
+                        */
+                       emit_arith(rp, PFS_OP_MAD, temp[0], mask,
+                                  src[0], pfs_one, negate(src[1]),
+                                  0);
+                       emit_arith(rp, PFS_OP_CMP, dest, mask,
+                                  pfs_one, pfs_zero, temp[0],
+                                  0);
+                       free_temp(rp, temp[0]);
                        break;
-               case FP_OPCODE_TEX:
+               case OPCODE_SIN:
+                       /*
+                        *  using a parabola:
+                        * sin(x) = 4/pi * x + -4/(pi*pi) * x * abs(x)
+                        * extra precision is obtained by weighting against
+                        * itself squared.
+                        */
+
+                       temp[0] = get_temp_reg(rp);
+                       make_sin_const(rp);
+                       src[0] = t_scalar_src(rp, fpi->SrcReg[0]);
+
+
+                       /* do range reduction */
+
+                       emit_arith(rp, PFS_OP_MAD, temp[0], WRITEMASK_X,
+                                  swizzle(keep(src[0]), X, X, X, X),
+                                  swizzle(rp->const_sin[1], Z, Z, Z, Z),
+                                  pfs_half,
+                                  0);
+
+                       emit_arith(rp, PFS_OP_FRC, temp[0], WRITEMASK_X,
+                                  swizzle(temp[0], X, X, X, X),
+                                  undef,
+                                  undef,
+                                  0);
+
+                       emit_arith(rp, PFS_OP_MAD, temp[0], WRITEMASK_Z,
+                                  swizzle(temp[0], X, X, X, X),
+                                  swizzle(rp->const_sin[1], W, W, W, W), //2*PI
+                                  negate(swizzle(rp->const_sin[0], Z, Z, Z, Z)), //PI
+                                  0);
+
+                       /* SIN */
+
+                       emit_arith(rp, PFS_OP_MAD, temp[0], WRITEMASK_X | WRITEMASK_Y,
+                                  swizzle(temp[0], Z, Z, Z, Z),
+                                  rp->const_sin[0],
+                                  pfs_zero,
+                                  0);
+
+                       emit_arith(rp, PFS_OP_MAD, temp[0], WRITEMASK_X,
+                                  swizzle(temp[0], Y, Y, Y, Y),
+                                  absolute(swizzle(temp[0], Z, Z, Z, Z)),
+                                  swizzle(temp[0], X, X, X, X),
+                                  0);
+                       
+                       emit_arith(rp, PFS_OP_MAD, temp[0], WRITEMASK_Y,
+                                  swizzle(temp[0], X, X, X, X),
+                                  absolute(swizzle(temp[0], X, X, X, X)),
+                                  negate(swizzle(temp[0], X, X, X, X)),
+                                  0);
+
+
+                       emit_arith(rp, PFS_OP_MAD, dest, mask,
+                                  swizzle(temp[0], Y, Y, Y, Y),
+                                  swizzle(rp->const_sin[0], W, W, W, W),
+                                  swizzle(temp[0], X, X, X, X),
+                                  flags);
+
+                       free_temp(rp, temp[0]);
+                       break;
+               case OPCODE_SLT:
+                       src[0] = t_src(rp, fpi->SrcReg[0]);
+                       src[1] = t_src(rp, fpi->SrcReg[1]);
+                       temp[0] = get_temp_reg(rp);
+                       /* temp = src0 - src1
+                        * dest.c = (temp.c < 0.0) ? 1 : 0
+                        */
+                       emit_arith(rp, PFS_OP_MAD, temp[0], mask,
+                                  src[0], pfs_one, negate(src[1]),
+                                  0);
+                       emit_arith(rp, PFS_OP_CMP, dest, mask,
+                                  pfs_zero, pfs_one, temp[0],
+                                  0);
+                       free_temp(rp, temp[0]);
+                       break;
+               case OPCODE_SUB:
+                       src[0] = t_src(rp, fpi->SrcReg[0]);
+                       src[1] = t_src(rp, fpi->SrcReg[1]);
+                       emit_arith(rp, PFS_OP_MAD, dest, mask,
+                                  src[0], pfs_one, negate(src[1]),
+                                  flags);
+                       break;
+               case OPCODE_TEX:
                        emit_tex(rp, fpi, R300_FPITX_OP_TEX);
                        break;
-               case FP_OPCODE_TXB:
+               case OPCODE_TXB:
                        emit_tex(rp, fpi, R300_FPITX_OP_TXB);
                        break;
-               case FP_OPCODE_TXP:
+               case OPCODE_TXP:
                        emit_tex(rp, fpi, R300_FPITX_OP_TXP);
                        break;
-               case FP_OPCODE_XPD:
-                       ERROR("unknown fpi->Opcode %d\n", fpi->Opcode);
+               case OPCODE_XPD: {
+                       src[0] = t_src(rp, fpi->SrcReg[0]);
+                       src[1] = t_src(rp, fpi->SrcReg[1]);
+                       temp[0] = get_temp_reg(rp);
+                       /* temp = src0.zxy * src1.yzx */
+                       emit_arith(rp, PFS_OP_MAD, temp[0], WRITEMASK_XYZ,
+                                  swizzle(keep(src[0]), Z, X, Y, W),
+                                  swizzle(keep(src[1]), Y, Z, X, W),
+                                  pfs_zero,
+                                  0);
+                       /* dest.xyz = src0.yzx * src1.zxy - temp 
+                        * dest.w       = undefined
+                        * */
+                       emit_arith(rp, PFS_OP_MAD, dest, mask & WRITEMASK_XYZ,
+                                  swizzle(src[0], Y, Z, X, W),
+                                  swizzle(src[1], Z, X, Y, W),
+                                  negate(temp[0]),
+                                  flags);
+                       /* cleanup */
+                       free_temp(rp, temp[0]);
                        break;
+               }
                default:
                        ERROR("unknown fpi->Opcode %d\n", fpi->Opcode);
                        break;
@@ -848,114 +2008,232 @@ static GLboolean parse_program(struct r300_fragment_program *rp)
 
                if (rp->error)
                        return GL_FALSE;
+
        }
 
        return GL_TRUE;
 }
 
+static void insert_wpos(struct gl_program *prog)
+{
+       GLint tokens[6] = { STATE_INTERNAL, STATE_R300_WINDOW_DIMENSION, 0, 0, 0, 0 };
+       struct prog_instruction *fpi;
+       GLuint window_index;
+       int i = 0;
+       GLuint tempregi = prog->NumTemporaries;
+       /* should do something else if no temps left... */
+       prog->NumTemporaries++;
+
+       fpi = _mesa_alloc_instructions (prog->NumInstructions + 3);
+       _mesa_init_instructions (fpi, prog->NumInstructions + 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(prog->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++;
+
+       _mesa_copy_instructions (&fpi[i], prog->Instructions, prog->NumInstructions);
+
+       free(prog->Instructions);
+
+       prog->Instructions = fpi;
+
+       prog->NumInstructions += i;
+       fpi = &prog->Instructions[prog->NumInstructions-1];
+
+       assert(fpi->Opcode == OPCODE_END);
+       
+       for(fpi = &prog->Instructions[3]; fpi->Opcode != OPCODE_END; fpi++){
+               for(i=0; i<3; i++)
+                   if( fpi->SrcReg[i].File == PROGRAM_INPUT &&
+                       fpi->SrcReg[i].Index == FRAG_ATTRIB_WPOS ){
+                           fpi->SrcReg[i].File = PROGRAM_TEMPORARY;
+                           fpi->SrcReg[i].Index = tempregi;
+                   }
+       }
+}
+
 /* - Init structures
  * - Determine what hwregs each input corresponds to
  */
-void init_program(struct r300_fragment_program *rp)
+static void init_program(r300ContextPtr r300, struct r300_fragment_program *rp)
 {
-       struct fragment_program *mp = &rp->mesa_program;        
-       struct fp_instruction *fpi;
-       GLuint InputsRead = mp->InputsRead;
-       GLuint fp_reg = 0;
+       struct r300_pfs_compile_state *cs = NULL;
+       struct gl_fragment_program *mp = &rp->mesa_program;     
+       struct prog_instruction *fpi;
+       GLuint InputsRead = mp->Base.InputsRead;
        GLuint temps_used = 0; /* for rp->temps[] */
-       int i;
+       int i,j;
 
+       /* New compile, reset tracking data */
+       rp->optimization = driQueryOptioni(&r300->radeon.optionCache, "fp_optimization");
        rp->translated = GL_FALSE;
-       rp->error = GL_FALSE;
-
-       rp->v_pos = 0;
-       rp->s_pos = 0;
-       
+       rp->error      = GL_FALSE;
+       rp->cs = cs        = &(R300_CONTEXT(rp->ctx)->state.pfs_compile);
        rp->tex.length = 0;
-       rp->node[0].alu_offset = 0;
-       rp->node[0].alu_end = -1;
-       rp->node[0].tex_offset = 0;
-       rp->node[0].tex_end = -1;
-       rp->cur_node = 0;
+       rp->cur_node   = 0;
        rp->first_node_has_tex = 0;
-       rp->used_in_node = 0;
-       rp->dest_in_node = 0;
-
-       rp->const_nr = 0;
-       rp->param_nr = 0;
+       rp->const_nr   = 0;
+       rp->param_nr   = 0;
        rp->params_uptodate = GL_FALSE;
-
-       rp->temp_in_use = 0;
-       rp->hwreg_in_use = 0;
        rp->max_temp_idx = 0;
+       rp->node[0].alu_end = -1;
+       rp->node[0].tex_end = -1;
+       rp->const_sin[0] = -1;
+       
+       _mesa_memset(cs, 0, sizeof(*rp->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;
+               }
+       }
        
        /* 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.
         */
 
        /* Texcoords come first */
        for (i=0;i<rp->ctx->Const.MaxTextureUnits;i++) {
                if (InputsRead & (FRAG_BIT_TEX0 << i)) {
-                       rp->hwreg_in_use |= (1<<fp_reg);
-                       rp->inputs[FRAG_ATTRIB_TEX0+i] = fp_reg++;
+                       cs->inputs[FRAG_ATTRIB_TEX0+i].refcount = 0;
+                       cs->inputs[FRAG_ATTRIB_TEX0+i].reg = get_hw_temp(rp, 0);
                }
        }
        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 = get_hw_temp(rp, 0);
+               insert_wpos(&mp->Base);
+       }
+       InputsRead &= ~FRAG_BIT_WPOS;
+
        /* Then primary colour */
        if (InputsRead & FRAG_BIT_COL0) {
-               rp->hwreg_in_use |= (1<<fp_reg);
-               rp->inputs[FRAG_ATTRIB_COL0] = fp_reg++;
+               cs->inputs[FRAG_ATTRIB_COL0].refcount = 0;
+               cs->inputs[FRAG_ATTRIB_COL0].reg = get_hw_temp(rp, 0);
        }
        InputsRead &= ~FRAG_BIT_COL0;
        
+       /* Secondary color */
+       if (InputsRead & FRAG_BIT_COL1) {
+               cs->inputs[FRAG_ATTRIB_COL1].refcount = 0;
+               cs->inputs[FRAG_ATTRIB_COL1].reg = get_hw_temp(rp, 0);
+       }
+       InputsRead &= ~FRAG_BIT_COL1;
+
        /* Anything else */
        if (InputsRead) {
-               WARN_ONCE("Don't know how to handle inputs 0x%x\n", 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)) rp->inputs[i] = 0;
+                       if (InputsRead & (1<<i)) cs->inputs[i].reg = 0;
        }
 
-       /* Possibly the worst part of how I went about this... Find out what
-        * temps are used by the mesa program so we don't clobber something
-        * when we need a temp for other reasons.
-        *
-        * Possibly not too bad actually, as we could add to this later and
-        * find out when inputs are last used so we can reuse them as temps.
+       /* 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->Instructions) {
+       if (!mp->Base.Instructions) {
                ERROR("No instructions found in program\n");
                return;
-       }       
-       for (fpi=mp->Instructions;fpi->Opcode != FP_OPCODE_END; fpi++) {
+       }
+
+       for (fpi=mp->Base.Instructions;fpi->Opcode != OPCODE_END; fpi++) {
+               int idx;
+               
                for (i=0;i<3;i++) {
-                       if (fpi->SrcReg[i].File == PROGRAM_TEMPORARY) {
-                               if (!(temps_used & (1 << fpi->SrcReg[i].Index))) {
-                                       temps_used |= (1 << fpi->SrcReg[i].Index);
-                                       rp->temps[fpi->SrcReg[i].Index] = get_hw_temp(rp);
-                               }
+                       idx = fpi->SrcReg[i].Index;
+                       switch (fpi->SrcReg[i].File) {
+                       case PROGRAM_TEMPORARY:
+                               if (!(temps_used & (1<<idx))) {
+                                       cs->temps[idx].reg = -1;
+                                       cs->temps[idx].refcount = 1;
+                                       temps_used |= (1 << idx);
+                               } else
+                                       cs->temps[idx].refcount++;
+                               break;
+                       case PROGRAM_INPUT:
+                               cs->inputs[idx].refcount++;
+                               break;
+                       default: break;
                        }
                }
-               /* needed? surely if a program writes a temp it'll read it again */
+
+               idx = fpi->DstReg.Index;
                if (fpi->DstReg.File == PROGRAM_TEMPORARY) {
-                       if (!(temps_used & (1 << fpi->DstReg.Index))) {
-                               temps_used |= (1 << fpi->DstReg.Index);
-                               rp->temps[fpi->DstReg.Index] = get_hw_temp(rp);
-                       }
+                       if (!(temps_used & (1<<idx))) {
+                               cs->temps[idx].reg = -1;
+                               cs->temps[idx].refcount = 1;
+                               temps_used |= (1 << idx);
+                       } else
+                               cs->temps[idx].refcount++;
                }
        }
-       rp->temp_in_use = temps_used;
+       cs->temp_in_use = temps_used;
 }
 
-void update_params(struct r300_fragment_program *rp) {
-       struct fragment_program *mp = &rp->mesa_program;
+static void update_params(struct r300_fragment_program *rp)
+{
+       struct gl_fragment_program *mp = &rp->mesa_program;
        int i;
 
        /* Ask Mesa nicely to fill in ParameterValues for us */
        if (rp->param_nr)
-               _mesa_load_state_parameters(rp->ctx, mp->Parameters);
+               _mesa_load_state_parameters(rp->ctx, mp->Base.Parameters);
 
        for (i=0;i<rp->param_nr;i++)
                COPY_4V(rp->constant[rp->param[i].idx], rp->param[i].values);
@@ -963,28 +2241,35 @@ void update_params(struct r300_fragment_program *rp) {
        rp->params_uptodate = GL_TRUE;
 }
 
-void translate_fragment_shader(struct r300_fragment_program *rp)
+void r300_translate_fragment_shader(r300ContextPtr r300, struct r300_fragment_program *rp)
 {
-       int i;
+       struct r300_pfs_compile_state *cs = NULL;
 
        if (!rp->translated) {
-               init_program(rp);
-       
+               
+               init_program(r300, rp);
+               cs = rp->cs;
+
                if (parse_program(rp) == GL_FALSE) {
                        dump_program(rp);
                        return;
                }
-
+               
                /* Finish off */
-               sync_streams(rp);
-               rp->node[rp->cur_node].alu_end  = rp->v_pos - 1;
-               rp->alu_offset                                  = 0;
-               rp->alu_end                                             = rp->v_pos - 1;
-               rp->tex_offset                                  = 0;
-               rp->tex_end                                             = rp->tex.length - 1;
+               rp->node[rp->cur_node].alu_end =
+                               cs->nrslots - rp->node[rp->cur_node].alu_offset - 1;
+               if (rp->node[rp->cur_node].tex_end < 0)
+                       rp->node[rp->cur_node].tex_end = 0;
+               rp->alu_offset = 0;
+               rp->alu_end    = cs->nrslots - 1;
+               rp->tex_offset = 0;
+               rp->tex_end    = rp->tex.length ? rp->tex.length - 1 : 0;
+               assert(rp->node[rp->cur_node].alu_end >= 0);
+               assert(rp->alu_end >= 0);
        
                rp->translated = GL_TRUE;
                if (0) dump_program(rp);
+               r300UpdateStateParameters(rp->ctx, _NEW_PROGRAM);
        }
 
        update_params(rp);
@@ -993,42 +2278,192 @@ void translate_fragment_shader(struct r300_fragment_program *rp)
 /* just some random things... */
 static void dump_program(struct r300_fragment_program *rp)
 {
-       int i;
+       int n, i, j;
        static int pc = 0;
 
        fprintf(stderr, "pc=%d*************************************\n", pc++);
                        
        fprintf(stderr, "Mesa program:\n");
        fprintf(stderr, "-------------\n");
-               _mesa_debug_fp_inst(rp->mesa_program.NumTexInstructions +
-                                               rp->mesa_program.NumAluInstructions,
-                               rp->mesa_program.Instructions);
+               _mesa_print_program(&rp->mesa_program.Base);
        fflush(stdout);
 
        fprintf(stderr, "Hardware program\n");
-       fprintf(stderr, "----------------\n");  
-       for (i=0;i<(rp->cur_node+1);i++) {
-               fprintf(stderr, "NODE %d: alu_offset: %d, tex_offset: %d, alu_end: %d, tex_end: %d\n", i,
-                                               rp->node[i].alu_offset,
-                                               rp->node[i].tex_offset,
-                                               rp->node[i].alu_end,
-                                               rp->node[i].tex_end);
-       }
-       
-/* dump program in pretty_print_command_stream.tcl-readable format */
-    fprintf(stderr, "%08x\n", ((rp->alu_end << 16) | (R300_PFS_INSTR0_0 >> 2)));
-    for (i=0;i<=rp->alu_end;i++)
-        fprintf(stderr, "%08x\n", rp->alu.inst[i].inst0);
-    fprintf(stderr, "%08x\n", ((rp->alu_end << 16) | (R300_PFS_INSTR1_0 >> 2)));
-    for (i=0;i<=rp->alu_end;i++)
-        fprintf(stderr, "%08x\n", rp->alu.inst[i].inst1);
-    fprintf(stderr, "%08x\n", ((rp->alu_end << 16) | (R300_PFS_INSTR2_0 >> 2)));
-    for (i=0;i<=rp->alu_end;i++)
-        fprintf(stderr, "%08x\n", rp->alu.inst[i].inst2);
-    fprintf(stderr, "%08x\n", ((rp->alu_end << 16) | (R300_PFS_INSTR3_0 >> 2)));
-    for (i=0;i<=rp->alu_end;i++)
-        fprintf(stderr, "%08x\n", rp->alu.inst[i].inst3);
-    fprintf(stderr, "00000000\n");
+       fprintf(stderr, "----------------\n");
        
+       for (n = 0; n < (rp->cur_node+1); n++) {
+               fprintf(stderr, "NODE %d: alu_offset: %d, tex_offset: %d, "\
+                       "alu_end: %d, tex_end: %d\n", n,
+                       rp->node[n].alu_offset,
+                       rp->node[n].tex_offset,
+                       rp->node[n].alu_end,
+                       rp->node[n].tex_end);
+               
+               if (rp->tex.length) {
+                       fprintf(stderr, "  TEX:\n");
+                       for(i = rp->node[n].tex_offset; i <= rp->node[n].tex_offset+rp->node[n].tex_end; ++i) {
+                               const char* instr;
+                               
+                               switch((rp->tex.inst[i] >> R300_FPITX_OPCODE_SHIFT) & 15) {
+                               case R300_FPITX_OP_TEX:
+                                       instr = "TEX";
+                                       break;
+                               case R300_FPITX_OP_KIL:
+                                       instr = "KIL";
+                                       break;
+                               case R300_FPITX_OP_TXP:
+                                       instr = "TXP";
+                                       break;
+                               case R300_FPITX_OP_TXB:
+                                       instr = "TXB";
+                                       break;
+                               default:
+                                       instr = "UNKNOWN";
+                               }
+                               
+                               fprintf(stderr, "    %s t%i, %c%i, texture[%i]   (%08x)\n",
+                                               instr,
+                                               (rp->tex.inst[i] >> R300_FPITX_DST_SHIFT) & 31,
+                                               (rp->tex.inst[i] & R300_FPITX_SRC_CONST) ? 'c': 't',
+                                               (rp->tex.inst[i] >> R300_FPITX_SRC_SHIFT) & 31,
+                                               (rp->tex.inst[i] & R300_FPITX_IMAGE_MASK) >> R300_FPITX_IMAGE_SHIFT,
+                                               rp->tex.inst[i]);
+                       }
+               }
+               
+               for(i = rp->node[n].alu_offset; i <= rp->node[n].alu_offset+rp->node[n].alu_end; ++i) {
+                       char srcc[3][10], dstc[20];
+                       char srca[3][10], dsta[20];
+                       char argc[3][20];
+                       char arga[3][20];
+                       char flags[5], tmp[10];
+                       
+                       for(j = 0; j < 3; ++j) {
+                               int regc = rp->alu.inst[i].inst1 >> (j*6);
+                               int rega = rp->alu.inst[i].inst3 >> (j*6);
+                               
+                               sprintf(srcc[j], "%c%i", (regc & 32) ? 'c' : 't', regc & 31);
+                               sprintf(srca[j], "%c%i", (rega & 32) ? 'c' : 't', rega & 31);
+                       }
+                       
+                       dstc[0] = 0;
+                       sprintf(flags, "%s%s%s",
+                                       (rp->alu.inst[i].inst1 & R300_FPI1_DSTC_REG_X) ? "x" : "",
+                                       (rp->alu.inst[i].inst1 & R300_FPI1_DSTC_REG_Y) ? "y" : "",
+                                       (rp->alu.inst[i].inst1 & R300_FPI1_DSTC_REG_Z) ? "z" : "");
+                       if (flags[0] != 0) {
+                               sprintf(dstc, "t%i.%s ",
+                                               (rp->alu.inst[i].inst1 >> R300_FPI1_DSTC_SHIFT) & 31,
+                                               flags);
+                       }
+                       sprintf(flags, "%s%s%s",
+                                       (rp->alu.inst[i].inst1 & R300_FPI1_DSTC_OUTPUT_X) ? "x" : "",
+                                       (rp->alu.inst[i].inst1 & R300_FPI1_DSTC_OUTPUT_Y) ? "y" : "",
+                                       (rp->alu.inst[i].inst1 & R300_FPI1_DSTC_OUTPUT_Z) ? "z" : "");
+                       if (flags[0] != 0) {
+                               sprintf(tmp, "o%i.%s",
+                                               (rp->alu.inst[i].inst1 >> R300_FPI1_DSTC_SHIFT) & 31,
+                                               flags);
+                               strcat(dstc, tmp);
+                       }
+                       
+                       dsta[0] = 0;
+                       if (rp->alu.inst[i].inst3 & R300_FPI3_DSTA_REG) {
+                               sprintf(dsta, "t%i.w ", (rp->alu.inst[i].inst3 >> R300_FPI3_DSTA_SHIFT) & 31);
+                       }
+                       if (rp->alu.inst[i].inst3 & R300_FPI3_DSTA_OUTPUT) {
+                               sprintf(tmp, "o%i.w ", (rp->alu.inst[i].inst3 >> R300_FPI3_DSTA_SHIFT) & 31);
+                               strcat(dsta, tmp);
+                       }
+                       if (rp->alu.inst[i].inst3 & R300_FPI3_DSTA_DEPTH) {
+                               strcat(dsta, "Z");
+                       }
+                       
+                       fprintf(stderr, "%3i: xyz: %3s %3s %3s -> %-20s (%08x)\n"
+                                       "       w: %3s %3s %3s -> %-20s (%08x)\n",
+                                       i,
+                                       srcc[0], srcc[1], srcc[2], dstc, rp->alu.inst[i].inst1,
+                                       srca[0], srca[1], srca[2], dsta, rp->alu.inst[i].inst3);
+                       
+                       for(j = 0; j < 3; ++j) {
+                               int regc = rp->alu.inst[i].inst0 >> (j*7);
+                               int rega = rp->alu.inst[i].inst2 >> (j*7);
+                               int d;
+                               char buf[20];
+
+                               d = regc & 31;
+                               if (d < 12) {
+                                       switch(d % 4) {
+                                               case R300_FPI0_ARGC_SRC0C_XYZ:
+                                                       sprintf(buf, "%s.xyz", srcc[d / 4]);
+                                                       break;
+                                               case R300_FPI0_ARGC_SRC0C_XXX:
+                                                       sprintf(buf, "%s.xxx", srcc[d / 4]);
+                                                       break;
+                                               case R300_FPI0_ARGC_SRC0C_YYY:
+                                                       sprintf(buf, "%s.yyy", srcc[d / 4]);
+                                                       break;
+                                               case R300_FPI0_ARGC_SRC0C_ZZZ:
+                                                       sprintf(buf, "%s.zzz", srcc[d / 4]);
+                                                       break;
+                                       }
+                               } else if (d < 15) {
+                                       sprintf(buf, "%s.www", srca[d-12]);
+                               } else if (d == 20) {
+                                       sprintf(buf, "0.0");
+                               } else if (d == 21) {
+                                       sprintf(buf, "1.0");
+                               } else if (d == 22) {
+                                       sprintf(buf, "0.5");
+                               } else if (d >= 23 && d < 32) {
+                                       d -= 23;
+                                       switch(d/3) {
+                                               case 0:
+                                                       sprintf(buf, "%s.yzx", srcc[d % 3]);
+                                                       break;
+                                               case 1:
+                                                       sprintf(buf, "%s.zxy", srcc[d % 3]);
+                                                       break;
+                                               case 2:
+                                                       sprintf(buf, "%s.Wzy", srcc[d % 3]);
+                                                       break;
+                                       }
+                               } else {
+                                       sprintf(buf, "%i", d);
+                               }
+                               
+                               sprintf(argc[j], "%s%s%s%s",
+                                               (regc & 32) ? "-" : "",
+                                               (regc & 64) ? "|" : "",
+                                               buf,
+                                               (regc & 64) ? "|" : "");
+                       
+                               d = rega & 31;
+                               if (d < 9) {
+                                       sprintf(buf, "%s.%c", srcc[d / 3], 'x' + (char)(d%3));
+                               } else if (d < 12) {
+                                       sprintf(buf, "%s.w", srca[d-9]);
+                               } else if (d == 16) {
+                                       sprintf(buf, "0.0");
+                               } else if (d == 17) {
+                                       sprintf(buf, "1.0");
+                               } else if (d == 18) {
+                                       sprintf(buf, "0.5");
+                               } else {
+                                       sprintf(buf, "%i", d);
+                               }
+                               
+                               sprintf(arga[j], "%s%s%s%s",
+                                               (rega & 32) ? "-" : "",
+                                               (rega & 64) ? "|" : "",
+                                               buf,
+                                               (rega & 64) ? "|" : "");
+                       }
+                       
+                       fprintf(stderr, "     xyz: %8s %8s %8s    op: %08x\n"
+                                       "       w: %8s %8s %8s    op: %08x\n",
+                                       argc[0], argc[1], argc[2], rp->alu.inst[i].inst0,
+                                       arga[0], arga[1], arga[2], rp->alu.inst[i].inst2);
+               }
+       }
 }
-#endif // USE_ARB_F_P == 1