summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/r300/r300_fragprog.c1081
-rw-r--r--src/mesa/drivers/dri/r300/r300_fragprog.h3
2 files changed, 528 insertions, 556 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_fragprog.c b/src/mesa/drivers/dri/r300/r300_fragprog.c
index 26b09b4db23..127aa12eb37 100644
--- a/src/mesa/drivers/dri/r300/r300_fragprog.c
+++ b/src/mesa/drivers/dri/r300/r300_fragprog.c
@@ -95,9 +95,9 @@
#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_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)
@@ -160,7 +160,6 @@
#define REG_NEGS(reg) \
reg = (reg | REG_NEGS_MASK)
-
/*
* Datas structures for fragment program generation
*/
@@ -172,22 +171,23 @@ static const struct {
int v_op;
int s_op;
} r300_fpop[] = {
- { "MAD", 3, R300_FPI0_OUTC_MAD, R300_FPI2_OUTA_MAD },
- { "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 },
- { "CMP", 3, R300_FPI0_OUTC_CMP, R300_FPI2_OUTA_CMP },
- { "FRC", 1, R300_FPI0_OUTC_FRC, R300_FPI2_OUTA_FRC },
- { "EX2", 1, R300_FPI0_OUTC_REPL_ALPHA, R300_FPI2_OUTA_EX2 },
- { "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 },
- { "CMPH", 3, R300_FPI0_OUTC_CMPH, PFS_INVAL },
+ /* *INDENT-OFF* */
+ {"MAD", 3, R300_FPI0_OUTC_MAD, R300_FPI2_OUTA_MAD},
+ {"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},
+ {"CMP", 3, R300_FPI0_OUTC_CMP, R300_FPI2_OUTA_CMP},
+ {"FRC", 1, R300_FPI0_OUTC_FRC, R300_FPI2_OUTA_FRC},
+ {"EX2", 1, R300_FPI0_OUTC_REPL_ALPHA, R300_FPI2_OUTA_EX2},
+ {"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},
+ {"CMPH", 3, R300_FPI0_OUTC_CMPH, PFS_INVAL},
+ /* *INDENT-ON* */
};
-
/* vector swizzles r300 can support natively, with a couple of
* cases we handle specially
*
@@ -201,25 +201,27 @@ static const struct {
SWIZZLE_##y, \
SWIZZLE_##z, \
SWIZZLE_ZERO))
+/* native swizzles */
static const struct r300_pfs_swizzle {
- GLuint hash; /* swizzle value this matches */
- GLuint base; /* base value for hw swizzle */
- GLuint stride; /* difference in base between arg0/1/2 */
+ GLuint hash; /* swizzle value this matches */
+ GLuint base; /* base value for hw swizzle */
+ GLuint stride; /* difference in base between arg0/1/2 */
GLuint flags;
} v_swiz[] = {
-/* native swizzles */
- { 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},
+ /* *INDENT-OFF* */
+ {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},
+ /* *INDENT-ON* */
};
/* used during matching of non-native swizzles */
@@ -232,28 +234,32 @@ static const struct {
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}
+ /* *INDENT-OFF* */
+ {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}
+ /* *INDENT-ON* */
};
static const struct {
- int base; /* hw value of swizzle */
- int stride; /* difference between SRC0/1/2 */
+ int base; /* hw value of swizzle */
+ int stride; /* difference between SRC0/1/2 */
GLuint flags;
} s_swiz[] = {
- { 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 }
+ /* *INDENT-OFF* */
+ {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}
+ /* *INDENT-ON* */
};
/* boiler-plate reg, for convenience */
@@ -297,9 +303,8 @@ static const GLuint pfs_zero = REG(REG_TYPE_CONST,
*/
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);
+ GLuint dest, int mask,
+ GLuint src0, GLuint src1, GLuint src2, int flags);
/**
* Get an R300 temporary that can be written to in the given slot.
@@ -309,7 +314,7 @@ static int get_hw_temp(struct r300_fragment_program *rp, int slot)
COMPILE_STATE;
int r;
- for(r = 0; r < PFS_NUM_TEMP_REGS; ++r) {
+ for (r = 0; r < PFS_NUM_TEMP_REGS; ++r) {
if (cs->hwtemps[r].free >= 0 && cs->hwtemps[r].free <= slot)
break;
}
@@ -318,7 +323,6 @@ static int get_hw_temp(struct r300_fragment_program *rp, int slot)
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
@@ -349,7 +353,7 @@ static int get_hw_temp_tex(struct r300_fragment_program *rp)
COMPILE_STATE;
int r;
- for(r = 0; r < PFS_NUM_TEMP_REGS; ++r) {
+ for (r = 0; r < PFS_NUM_TEMP_REGS; ++r) {
if (cs->used_in_node & (1 << r))
continue;
@@ -359,7 +363,7 @@ static int get_hw_temp_tex(struct r300_fragment_program *rp)
}
if (r >= PFS_NUM_TEMP_REGS)
- return get_hw_temp(rp, 0); /* Will cause an indirection */
+ return get_hw_temp(rp, 0); /* Will cause an indirection */
cs->hwtemps[r].reserved = cs->hwtemps[r].free;
cs->hwtemps[r].free = -1;
@@ -393,10 +397,9 @@ static void free_hw_temp(struct r300_fragment_program *rp, int idx)
// 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;
+ cs->hwtemps[idx].free = cs->nrslots + 1;
}
-
/**
* Create a new Mesa temporary register.
*/
@@ -478,12 +481,13 @@ static void free_temp(struct r300_fragment_program *rp, GLuint r)
* of the fragment program (actually, up until the next time the fragment
* program is translated).
*/
-static GLuint emit_const4fv(struct r300_fragment_program *rp, const GLfloat* cp)
+static GLuint emit_const4fv(struct r300_fragment_program *rp,
+ const GLfloat * cp)
{
GLuint reg = undef;
int index;
- for(index = 0; index < rp->const_nr; ++index) {
+ for (index = 0; index < rp->const_nr; ++index) {
if (rp->constant[index] == cp)
break;
}
@@ -527,13 +531,10 @@ static inline GLuint absolute(GLuint r)
}
static int swz_native(struct r300_fragment_program *rp,
- GLuint src,
- GLuint *r,
- GLuint arbneg)
+ GLuint src, GLuint * r, GLuint arbneg)
{
/* Native swizzle, handle negation */
- src = (src & ~REG_NEGS_MASK) |
- (((arbneg >> 3) & 1) << REG_NEGS_SHIFT);
+ src = (src & ~REG_NEGS_MASK) | (((arbneg >> 3) & 1) << REG_NEGS_SHIFT);
if ((arbneg & 0x7) == 0x0) {
src = src & ~REG_NEGV_MASK;
@@ -547,21 +548,13 @@ static int swz_native(struct r300_fragment_program *rp,
src |= REG_NEGV_MASK;
emit_arith(rp,
PFS_OP_MAD,
- *r,
- arbneg & 0x7,
- keep(src),
- pfs_one,
- pfs_zero,
- 0);
+ *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);
+ src, pfs_one, pfs_zero, 0);
}
return 3;
@@ -569,10 +562,7 @@ static int swz_native(struct r300_fragment_program *rp,
static int swz_emit_partial(struct r300_fragment_program *rp,
GLuint src,
- GLuint *r,
- int mask,
- int mc,
- GLuint arbneg)
+ GLuint * r, int mask, int mc, GLuint arbneg)
{
GLuint tmp;
GLuint wmask = 0;
@@ -597,9 +587,7 @@ static int swz_emit_partial(struct r300_fragment_program *rp,
*r,
arbneg & s_mask[mask].mask,
keep(src) | REG_NEGV_MASK,
- pfs_one,
- pfs_zero,
- 0);
+ pfs_one, pfs_zero, 0);
if (!wmask) {
REG_SET_NO_USE(src, GL_TRUE);
} else {
@@ -607,12 +595,7 @@ static int swz_emit_partial(struct r300_fragment_program *rp,
}
emit_arith(rp,
PFS_OP_MAD,
- *r,
- tmp | wmask,
- src,
- pfs_one,
- pfs_zero,
- 0);
+ *r, tmp | wmask, src, pfs_one, pfs_zero, 0);
} else {
if (!wmask) {
REG_SET_NO_USE(src, GL_TRUE);
@@ -623,10 +606,7 @@ static int swz_emit_partial(struct r300_fragment_program *rp,
PFS_OP_MAD,
*r,
(arbneg & s_mask[mask].mask) | wmask,
- src | REG_NEGV_MASK,
- pfs_one,
- pfs_zero,
- 0);
+ src | REG_NEGV_MASK, pfs_one, pfs_zero, 0);
}
} else {
if (!wmask) {
@@ -637,19 +617,14 @@ static int swz_emit_partial(struct r300_fragment_program *rp,
emit_arith(rp, PFS_OP_MAD,
*r,
s_mask[mask].mask | wmask,
- src,
- pfs_one,
- pfs_zero,
- 0);
+ src, pfs_one, pfs_zero, 0);
}
return s_mask[mask].count;
}
static GLuint do_swizzle(struct r300_fragment_program *rp,
- GLuint src,
- GLuint arbswz,
- GLuint arbneg)
+ GLuint src, GLuint arbswz, GLuint arbneg)
{
GLuint r = undef;
GLuint vswz;
@@ -660,41 +635,38 @@ static GLuint do_swizzle(struct r300_fragment_program *rp,
* 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) {
+ 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);
+ 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;
- }
+ 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));
+ 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 {
@@ -704,14 +676,12 @@ static GLuint do_swizzle(struct r300_fragment_program *rp,
REG_SET_VSWZ(src, vswz);
chash = v_swiz[REG_GET_VSWZ(src)].hash &
- s_mask[c_mask].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);
+ src, &r, arbneg);
} else {
v_match += swz_emit_partial(rp,
src,
@@ -730,7 +700,7 @@ static GLuint do_swizzle(struct r300_fragment_program *rp,
*/
arbswz |= (PFS_INVAL & s_mask[c_mask].hash);
}
- } while(v_swiz[++vswz].hash != PFS_INVAL);
+ } while (v_swiz[++vswz].hash != PFS_INVAL);
REG_SET_VSWZ(src, SWIZZLE_XYZ);
} while (s_mask[++c_mask].hash != PFS_INVAL);
@@ -756,16 +726,19 @@ static GLuint t_src(struct r300_fragment_program *rp,
break;
case PROGRAM_LOCAL_PARAM:
r = emit_const4fv(rp,
- rp->mesa_program.Base.LocalParams[fpsrc.Index]);
+ rp->mesa_program.Base.LocalParams[fpsrc.
+ Index]);
break;
case PROGRAM_ENV_PARAM:
r = emit_const4fv(rp,
- rp->ctx->FragmentProgram.Parameters[fpsrc.Index]);
+ rp->ctx->FragmentProgram.Parameters[fpsrc.
+ Index]);
break;
case PROGRAM_STATE_VAR:
case PROGRAM_NAMED_PARAM:
r = emit_const4fv(rp,
- rp->mesa_program.Base.Parameters->ParameterValues[fpsrc.Index]);
+ rp->mesa_program.Base.Parameters->
+ ParameterValues[fpsrc.Index]);
break;
default:
ERROR("unknown SrcReg->File %x\n", fpsrc.File);
@@ -782,15 +755,15 @@ 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 */
+ int sc = GET_SWZ(fpsrc.Swizzle, 0); /* X */
- src.Swizzle = ((sc<<0)|(sc<<3)|(sc<<6)|(sc<<9));
+ 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)
+ struct prog_dst_register dest)
{
GLuint r = undef;
@@ -818,33 +791,29 @@ static GLuint t_dst(struct r300_fragment_program *rp,
}
}
-static int t_hw_src(struct r300_fragment_program *rp,
- GLuint src,
- GLboolean tex)
+static int t_hw_src(struct r300_fragment_program *rp, GLuint src, GLboolean tex)
{
COMPILE_STATE;
int idx;
int index = REG_GET_INDEX(src);
- switch(REG_GET_TYPE(src)) {
+ switch (REG_GET_TYPE(src)) {
case REG_TYPE_TEMP:
/* NOTE: if reg==-1 here, a source is being read that
- * hasn't been written to. Undefined results.
+ * 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))
+ if (!REG_GET_NO_USE(src) && (--cs->temps[index].refcount == 0))
free_temp(rp, src);
break;
case REG_TYPE_INPUT:
idx = cs->inputs[index].reg;
- if (!REG_GET_NO_USE(src) &&
- (--cs->inputs[index].refcount == 0))
+ if (!REG_GET_NO_USE(src) && (--cs->inputs[index].refcount == 0))
free_hw_temp(rp, cs->inputs[index].reg);
break;
case REG_TYPE_CONST:
@@ -861,16 +830,14 @@ static int t_hw_src(struct r300_fragment_program *rp,
}
static int t_hw_dst(struct r300_fragment_program *rp,
- GLuint dest,
- GLboolean tex,
- int slot)
+ 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)) {
+ switch (REG_GET_TYPE(dest)) {
case REG_TYPE_TEMP:
if (cs->temps[REG_GET_INDEX(dest)].reg == -1) {
if (!tex) {
@@ -881,20 +848,21 @@ static int t_hw_dst(struct r300_fragment_program *rp,
}
idx = cs->temps[index].reg;
- if (!REG_GET_NO_USE(dest) &&
- (--cs->temps[index].refcount == 0))
+ 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) {
+ switch (index) {
case FRAG_RESULT_COLR:
- rp->node[rp->cur_node].flags |= R300_PFS_NODE_OUTPUT_COLOR;
+ 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;
+ rp->node[rp->cur_node].flags |=
+ R300_PFS_NODE_OUTPUT_DEPTH;
break;
}
return index;
@@ -924,8 +892,7 @@ static void emit_nop(struct r300_fragment_program *rp)
}
static void emit_tex(struct r300_fragment_program *rp,
- struct prog_instruction *fpi,
- int opcode)
+ struct prog_instruction *fpi, int opcode)
{
COMPILE_STATE;
GLuint coord = t_src(rp, fpi->SrcReg[0]);
@@ -950,19 +917,24 @@ static void emit_tex(struct r300_fragment_program *rp,
* support for programs.
*/
gl_state_index tokens[STATE_LENGTH] = {
- STATE_INTERNAL, STATE_R300_TEXRECT_FACTOR, 0, 0, 0
+ STATE_INTERNAL, STATE_R300_TEXRECT_FACTOR, 0, 0,
+ 0
};
int factor_index;
GLuint factorreg;
tokens[2] = unit;
- factor_index = _mesa_add_state_reference(rp->mesa_program.Base.Parameters, tokens);
- factorreg = emit_const4fv(rp,
- rp->mesa_program.Base.Parameters->ParameterValues[factor_index]);
+ factor_index =
+ _mesa_add_state_reference(rp->mesa_program.Base.
+ Parameters, tokens);
+ factorreg =
+ emit_const4fv(rp,
+ rp->mesa_program.Base.Parameters->
+ ParameterValues[factor_index]);
tempreg = keep(get_temp_reg(rp));
emit_arith(rp, PFS_OP_MAD, tempreg, WRITEMASK_XYZW,
- coord, factorreg, pfs_zero, 0);
+ coord, factorreg, pfs_zero, 0);
/* Ensure correct node indirection */
uin = cs->used_in_node;
@@ -980,7 +952,9 @@ static void emit_tex(struct r300_fragment_program *rp,
rdest = dest;
dest = get_temp_reg_tex(rp);
}
- hwdest = t_hw_dst(rp, dest, GL_TRUE, rp->node[rp->cur_node].alu_offset);
+ 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
@@ -996,19 +970,18 @@ static void emit_tex(struct r300_fragment_program *rp,
hwsrc = t_hw_src(rp, coord, GL_TRUE);
}
-
/* Indirection if source has been written in this node, or if the
* dest has been read/written in this node
*/
if ((REG_GET_TYPE(coord) != REG_TYPE_CONST &&
- (din & (1<<hwsrc))) || (uin & (1<<hwdest))) {
+ (din & (1 << hwsrc))) || (uin & (1 << hwdest))) {
/* 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;
+ 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) {
@@ -1029,12 +1002,11 @@ static void emit_tex(struct r300_fragment_program *rp,
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)
- /* not entirely sure about this */
- | (opcode << R300_FPITX_OPCODE_SHIFT);
+ 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);
cs->dest_in_node |= (1 << hwdest);
if (REG_GET_TYPE(coord) != REG_TYPE_CONST)
@@ -1054,14 +1026,12 @@ static void emit_tex(struct r300_fragment_program *rp,
free_temp(rp, tempreg);
}
-
/**
* 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)
+static int get_earliest_allowed_write(struct r300_fragment_program *rp,
+ GLuint dest, int mask)
{
COMPILE_STATE;
int idx;
@@ -1069,18 +1039,18 @@ static int get_earliest_allowed_write(
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));
+ 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;
@@ -1096,7 +1066,6 @@ static int get_earliest_allowed_write(
return pos;
}
-
/**
* Allocates a slot for an ALU instruction that can consist of
* a vertex part or a scalar part or both.
@@ -1111,13 +1080,10 @@ static int get_earliest_allowed_write(
*
* @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)
+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];
@@ -1128,7 +1094,7 @@ static int find_and_prepare_slot(struct r300_fragment_program* rp,
int tempssrc[3];
int pos;
int regnr;
- int i,j;
+ int i, j;
// Determine instruction slots, whether sources are required on
// vector or scalar side, and the smallest slot number where
@@ -1143,7 +1109,7 @@ static int find_and_prepare_slot(struct r300_fragment_program* rp,
if (rp->node[rp->cur_node].alu_offset > pos)
pos = rp->node[rp->cur_node].alu_offset;
- for(i = 0; i < argc; ++i) {
+ 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;
@@ -1151,7 +1117,7 @@ static int find_and_prepare_slot(struct r300_fragment_program* rp,
used |= s_swiz[REG_GET_SSWZ(src[i])].flags << i;
}
- hwsrc[i] = t_hw_src(rp, src[i], GL_FALSE); /* Note: sideeffects wrt refcounting! */
+ 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) {
@@ -1167,7 +1133,7 @@ static int find_and_prepare_slot(struct r300_fragment_program* rp,
}
// Find a slot that fits
- for(; ; ++pos) {
+ for (;; ++pos) {
if (cs->slot[pos].used & used & SLOT_OP_BOTH)
continue;
@@ -1184,19 +1150,18 @@ static int find_and_prepare_slot(struct r300_fragment_program* rp,
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) {
+ 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) {
+ for (i = 0; i < argc; ++i) {
int flags = (used >> i) & SLOT_SRC_BOTH;
if (!flags) {
@@ -1204,7 +1169,7 @@ static int find_and_prepare_slot(struct r300_fragment_program* rp,
continue;
}
- for(j = 0; j < 3; ++j) {
+ for (j = 0; j < 3; ++j) {
if ((tempused >> j) & flags & SLOT_SRC_VECTOR) {
if (tempvsrc[j] != hwsrc[i])
continue;
@@ -1235,22 +1200,24 @@ static int find_and_prepare_slot(struct r300_fragment_program* rp,
// Found a slot, reserve it
cs->slot[pos].used = tempused | (used & SLOT_OP_BOTH);
- for(i = 0; i < 3; ++i) {
+ 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) {
+ 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;
+ 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;
+ cs->hwtemps[regnr].scalar_lastread =
+ pos;
}
}
}
@@ -1258,65 +1225,78 @@ static int find_and_prepare_slot(struct r300_fragment_program* rp,
// 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));
+ ((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));
+ ((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) {
+ 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);
+ (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);
+ ~(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);
+ (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) {
+ 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);
+ (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);
+ ~(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);
+ (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.
*/
@@ -1324,10 +1304,7 @@ static void emit_arith(struct r300_fragment_program *rp,
int op,
GLuint dest,
int mask,
- GLuint src0,
- GLuint src1,
- GLuint src2,
- int flags)
+ GLuint src0, GLuint src1, GLuint src2, int flags)
{
COMPILE_STATE;
GLuint src[3] = { src0, src1, src2 };
@@ -1356,11 +1333,13 @@ static void emit_arith(struct r300_fragment_program *rp,
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);
+ 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 */
+ 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;
@@ -1376,13 +1355,16 @@ static void emit_arith(struct r300_fragment_program *rp,
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);
+ (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;
+ (mask & WRITEMASK_XYZ) <<
+ R300_FPI1_DSTC_REG_MASK_SHIFT;
- cs->hwtemps[hwdest].vector_valid = pos+1;
+ cs->hwtemps[hwdest].vector_valid = pos + 1;
}
}
@@ -1394,15 +1376,20 @@ static void emit_arith(struct r300_fragment_program *rp,
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);
+ (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;
+ (hwdest << R300_FPI3_DSTA_SHIFT) |
+ R300_FPI3_DSTA_REG;
- cs->hwtemps[hwdest].scalar_valid = pos+1;
+ cs->hwtemps[hwdest].scalar_valid = pos + 1;
}
}
}
@@ -1416,7 +1403,7 @@ 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))) {
+ if (!(mp->Base.InputsRead & (1 << attr))) {
ERROR("Attribute %d was not provided!\n", attr);
return undef;
}
@@ -1430,20 +1417,19 @@ static GLuint get_attrib(struct r300_fragment_program *rp, GLuint attr)
static GLfloat SinCosConsts[2][4] = {
{
- 1.273239545, // 4/PI
- -0.405284735, // -4/(PI*PI)
- 3.141592654, // PI
- 0.2225 // weight
- },
+ 1.273239545, // 4/PI
+ -0.405284735, // -4/(PI*PI)
+ 3.141592654, // PI
+ 0.2225 // weight
+ },
{
- 0.75,
- 0.0,
- 0.159154943, // 1/(2*PI)
- 6.283185307 // 2*PI
- }
+ 0.75,
+ 0.0,
+ 0.159154943, // 1/(2*PI)
+ 6.283185307 // 2*PI
+ }
};
-
/**
* Emit a LIT instruction.
* \p flags may be PFS_FLAG_SAT
@@ -1466,13 +1452,11 @@ static GLfloat SinCosConsts[2][4] = {
* emit_arith is a bit too conservative because it doesn't understand
* partial writes to the vector component.
*/
-static const GLfloat LitConst[4] = { 127.999999, 127.999999, 127.999999, -127.999999 };
+static const GLfloat LitConst[4] =
+ { 127.999999, 127.999999, 127.999999, -127.999999 };
static void emit_lit(struct r300_fragment_program *rp,
- GLuint dest,
- int mask,
- GLuint src,
- int flags)
+ GLuint dest, int mask, GLuint src, int flags)
{
COMPILE_STATE;
GLuint cnst;
@@ -1503,39 +1487,38 @@ static void emit_lit(struct r300_fragment_program *rp,
// 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);
+ 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);
+ 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);
+ 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);
+ 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);
+ 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);
+ 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,
- pfs_zero, swizzle(temp, W, W, W, W), negate(swizzle(temp, Y, Y, Y, Y)), flags);
- emit_arith(rp, PFS_OP_MAD, temp, WRITEMASK_W,
- pfs_one, pfs_one, pfs_zero, 0);
+ pfs_zero, swizzle(temp, W, W, W, W),
+ negate(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);
+ temp, pfs_one, pfs_zero, flags);
free_temp(rp, temp);
} else {
// Decrease refcount of the destination
@@ -1543,7 +1526,6 @@ static void emit_lit(struct r300_fragment_program *rp,
}
}
-
static GLboolean parse_program(struct r300_fragment_program *rp)
{
struct gl_fragment_program *mp = &rp->mesa_program;
@@ -1558,7 +1540,7 @@ static GLboolean parse_program(struct r300_fragment_program *rp)
return GL_FALSE;
}
- for (fpi=mp->Base.Instructions; fpi->Opcode != OPCODE_END; fpi++) {
+ for (fpi = mp->Base.Instructions; fpi->Opcode != OPCODE_END; fpi++) {
if (fpi->SaturateMode == SATURATE_ZERO_ONE)
flags = PFS_FLAG_SAT;
else
@@ -1573,15 +1555,13 @@ static GLboolean parse_program(struct r300_fragment_program *rp)
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);
+ absolute(src[0]), pfs_one, pfs_zero, flags);
break;
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);
+ src[0], pfs_one, src[1], flags);
break;
case OPCODE_CMP:
src[0] = t_src(rp, fpi->SrcReg[0]);
@@ -1591,8 +1571,7 @@ static GLboolean parse_program(struct r300_fragment_program *rp)
* 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);
+ src[2], src[1], src[0], flags);
break;
case OPCODE_COS:
/*
@@ -1613,47 +1592,38 @@ static GLboolean parse_program(struct r300_fragment_program *rp)
emit_arith(rp, PFS_OP_MAD, temp[0], WRITEMASK_X,
swizzle(src[0], X, X, X, X),
swizzle(const_sin[1], Z, Z, Z, Z),
- swizzle(const_sin[1], X, X, X, X),
- 0);
+ swizzle(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);
+ undef, undef, 0);
- emit_arith(rp, PFS_OP_MAD, temp[0], WRITEMASK_Z,
- swizzle(temp[0], X, X, X, X),
- swizzle(const_sin[1], W, W, W, W), //2*PI
- negate(swizzle(const_sin[0], Z, Z, Z, Z)), //-PI
+ emit_arith(rp, PFS_OP_MAD, temp[0], WRITEMASK_Z, swizzle(temp[0], X, X, X, X), swizzle(const_sin[1], W, W, W, W), //2*PI
+ negate(swizzle(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),
- const_sin[0],
- pfs_zero,
- 0);
+ emit_arith(rp, PFS_OP_MAD, temp[0],
+ WRITEMASK_X | WRITEMASK_Y, swizzle(temp[0],
+ Z, Z, Z,
+ Z),
+ 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);
+ 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);
-
+ negate(swizzle(temp[0], X, X, X, X)), 0);
- emit_arith(rp, PFS_OP_MAD, dest, mask,
+ emit_arith(rp, PFS_OP_MAD, dest, mask,
swizzle(temp[0], Y, Y, Y, Y),
swizzle(const_sin[0], W, W, W, W),
- swizzle(temp[0], X, X, X, X),
- flags);
+ swizzle(temp[0], X, X, X, X), flags);
free_temp(rp, temp[0]);
break;
@@ -1661,15 +1631,13 @@ static GLboolean parse_program(struct r300_fragment_program *rp)
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);
+ 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);
+ src[0], src[1], undef, flags);
break;
case OPCODE_DPH:
src[0] = t_src(rp, fpi->SrcReg[0]);
@@ -1681,11 +1649,9 @@ static GLboolean parse_program(struct r300_fragment_program *rp)
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);
+ src[0], pfs_one, pfs_zero, 0);
emit_arith(rp, PFS_OP_DP4, dest, mask,
- temp[0], src[1], undef,
- flags);
+ temp[0], src[1], undef, flags);
free_temp(rp, temp[0]);
#else
emit_arith(rp, PFS_OP_DP4, dest, mask,
@@ -1708,18 +1674,16 @@ static GLboolean parse_program(struct r300_fragment_program *rp)
/* result.x = 1.0
* result.w = src1.w */
if (mask & WRITEMASK_XW) {
- REG_SET_VSWZ(src[1], SWIZZLE_111); /*Cheat*/
+ 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);
+ src[1], pfs_one, pfs_zero, flags);
}
break;
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);
+ src[0], undef, undef, flags);
break;
case OPCODE_FLR:
src[0] = t_src(rp, fpi->SrcReg[0]);
@@ -1728,18 +1692,15 @@ static GLboolean parse_program(struct r300_fragment_program *rp)
* MAD dest, src0, 1.0, -temp
*/
emit_arith(rp, PFS_OP_FRC, temp[0], mask,
- keep(src[0]), undef, undef,
- 0);
+ keep(src[0]), undef, undef, 0);
emit_arith(rp, PFS_OP_MAD, dest, mask,
- src[0], pfs_one, negate(temp[0]),
- flags);
+ 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);
+ src[0], undef, undef, flags);
break;
case OPCODE_KIL:
emit_tex(rp, fpi, R300_FPITX_OP_KIL);
@@ -1747,8 +1708,7 @@ static GLboolean parse_program(struct r300_fragment_program *rp)
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);
+ src[0], undef, undef, flags);
break;
case OPCODE_LIT:
src[0] = t_src(rp, fpi->SrcReg[0]);
@@ -1768,8 +1728,7 @@ static GLboolean parse_program(struct r300_fragment_program *rp)
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);
+ src[0], src[1], temp[0], flags);
free_temp(rp, temp[0]);
break;
case OPCODE_MAD:
@@ -1777,63 +1736,53 @@ static GLboolean parse_program(struct r300_fragment_program *rp)
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);
+ src[0], src[1], src[2], flags);
break;
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);
+ src[0], src[1], undef, flags);
break;
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);
+ src[0], src[1], undef, flags);
break;
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);
+ src[0], pfs_one, pfs_zero, flags);
break;
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);
+ 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);
+ src[0], undef, undef, 0);
emit_arith(rp, PFS_OP_MAD, temp[0], WRITEMASK_W,
- temp[0], src[1], pfs_zero,
- 0);
+ temp[0], src[1], pfs_zero, 0);
emit_arith(rp, PFS_OP_EX2, dest, fpi->DstReg.WriteMask,
- temp[0], undef, undef,
- 0);
+ temp[0], undef, undef, 0);
free_temp(rp, temp[0]);
break;
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);
+ src[0], undef, undef, flags);
break;
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);
+ absolute(src[0]), pfs_zero, pfs_zero, flags);
break;
case OPCODE_SCS:
/*
@@ -1850,61 +1799,55 @@ static GLboolean parse_program(struct r300_fragment_program *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(const_sin[0], Z, Z, Z, Z), //PI
+ emit_arith(rp, PFS_OP_MAD, temp[0], WRITEMASK_Z, swizzle(const_sin[0], Z, Z, Z, Z), //PI
pfs_half,
- negate(abs(swizzle(keep(src[0]), X, X, X, X))),
+ 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(const_sin[0], Y, Y, Y, Y),
swizzle(keep(src[0]), X, X, X, X),
- pfs_zero,
- 0);
+ 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),
- const_sin[0],
- pfs_zero,
- 0);
+ emit_arith(rp, PFS_OP_MAD, temp[0],
+ WRITEMASK_X | WRITEMASK_Y, swizzle(temp[0],
+ Z, Z, Z,
+ Z),
+ const_sin[0], pfs_zero, 0);
/* B*x (sin) */
emit_arith(rp, PFS_OP_MAD, temp[1], WRITEMASK_W,
swizzle(const_sin[0], X, X, X, X),
- keep(src[0]),
- pfs_zero,
- 0);
+ keep(src[0]), pfs_zero, 0);
- /* y = B*x + C*x*abs(x) (sin)*/
- emit_arith(rp, PFS_OP_MAD, temp[1], WRITEMASK_Z,
+ /* 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);
+ swizzle(temp[1], W, W, W, W), 0);
- /* y = B*x + C*x*abs(x) (cos)*/
+ /* 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);
+ 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),
+ 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);
+ 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],
+ emit_arith(rp, PFS_OP_MAD, dest,
+ mask & (WRITEMASK_X | WRITEMASK_Y), temp[0],
swizzle(const_sin[0], W, W, W, W),
- swizzle(temp[1], W, Z, Y, X),
- flags);
+ swizzle(temp[1], W, Z, Y, X), flags);
free_temp(rp, temp[0]);
free_temp(rp, temp[1]);
@@ -1917,11 +1860,9 @@ static GLboolean parse_program(struct r300_fragment_program *rp)
* 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);
+ src[0], pfs_one, negate(src[1]), 0);
emit_arith(rp, PFS_OP_CMP, dest, mask,
- pfs_one, pfs_zero, temp[0],
- 0);
+ pfs_one, pfs_zero, temp[0], 0);
free_temp(rp, temp[0]);
break;
case OPCODE_SIN:
@@ -1937,53 +1878,43 @@ static GLboolean parse_program(struct r300_fragment_program *rp)
const_sin[1] = emit_const4fv(rp, SinCosConsts[1]);
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(const_sin[1], Z, Z, Z, Z),
- pfs_half,
- 0);
+ pfs_half, 0);
emit_arith(rp, PFS_OP_FRC, temp[0], WRITEMASK_X,
swizzle(temp[0], X, X, X, X),
- undef,
- undef,
- 0);
+ undef, undef, 0);
- emit_arith(rp, PFS_OP_MAD, temp[0], WRITEMASK_Z,
- swizzle(temp[0], X, X, X, X),
- swizzle(const_sin[1], W, W, W, W), //2*PI
- negate(swizzle(const_sin[0], Z, Z, Z, Z)), //PI
+ emit_arith(rp, PFS_OP_MAD, temp[0], WRITEMASK_Z, swizzle(temp[0], X, X, X, X), swizzle(const_sin[1], W, W, W, W), //2*PI
+ negate(swizzle(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),
- const_sin[0],
- pfs_zero,
- 0);
+ emit_arith(rp, PFS_OP_MAD, temp[0],
+ WRITEMASK_X | WRITEMASK_Y, swizzle(temp[0],
+ Z, Z, Z,
+ Z),
+ 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);
+ 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);
-
+ negate(swizzle(temp[0], X, X, X, X)), 0);
- emit_arith(rp, PFS_OP_MAD, dest, mask,
+ emit_arith(rp, PFS_OP_MAD, dest, mask,
swizzle(temp[0], Y, Y, Y, Y),
swizzle(const_sin[0], W, W, W, W),
- swizzle(temp[0], X, X, X, X),
- flags);
+ swizzle(temp[0], X, X, X, X), flags);
free_temp(rp, temp[0]);
break;
@@ -1995,19 +1926,16 @@ static GLboolean parse_program(struct r300_fragment_program *rp)
* 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);
+ src[0], pfs_one, negate(src[1]), 0);
emit_arith(rp, PFS_OP_CMP, dest, mask,
- pfs_zero, pfs_one, temp[0],
- 0);
+ 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);
+ src[0], pfs_one, negate(src[1]), flags);
break;
case OPCODE_TEX:
emit_tex(rp, fpi, R300_FPITX_OP_TEX);
@@ -2018,28 +1946,29 @@ static GLboolean parse_program(struct r300_fragment_program *rp)
case OPCODE_TXP:
emit_tex(rp, fpi, R300_FPITX_OP_TXP);
break;
- 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;
- }
+ 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;
@@ -2065,8 +1994,8 @@ static void insert_wpos(struct gl_program *prog)
/* should do something else if no temps left... */
prog->NumTemporaries++;
- fpi = _mesa_alloc_instructions (prog->NumInstructions + 3);
- _mesa_init_instructions (fpi, prog->NumInstructions + 3);
+ fpi = _mesa_alloc_instructions(prog->NumInstructions + 3);
+ _mesa_init_instructions(fpi, prog->NumInstructions + 3);
/* perspective divide */
fpi[i].Opcode = OPCODE_RCP;
@@ -2109,35 +2038,39 @@ static void insert_wpos(struct gl_program *prog)
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[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[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);
+ 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);
+ _mesa_copy_instructions(&fpi[i], prog->Instructions,
+ prog->NumInstructions);
free(prog->Instructions);
prog->Instructions = fpi;
prog->NumInstructions += i;
- fpi = &prog->Instructions[prog->NumInstructions-1];
+ 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;
- }
+ 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;
+ }
}
}
@@ -2150,25 +2083,26 @@ static void init_program(r300ContextPtr r300, struct r300_fragment_program *rp)
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,j;
+ GLuint temps_used = 0; /* for rp->temps[] */
+ int i, j;
/* New compile, reset tracking data */
- rp->optimization = driQueryOptioni(&r300->radeon.optionCache, "fp_optimization");
+ rp->optimization =
+ driQueryOptioni(&r300->radeon.optionCache, "fp_optimization");
rp->translated = GL_FALSE;
- rp->error = GL_FALSE;
- rp->cs = cs = &(R300_CONTEXT(rp->ctx)->state.pfs_compile);
+ rp->error = GL_FALSE;
+ rp->cs = cs = &(R300_CONTEXT(rp->ctx)->state.pfs_compile);
rp->tex.length = 0;
- rp->cur_node = 0;
+ rp->cur_node = 0;
rp->first_node_has_tex = 0;
- rp->const_nr = 0;
+ rp->const_nr = 0;
rp->max_temp_idx = 0;
rp->node[0].alu_end = -1;
rp->node[0].tex_end = -1;
_mesa_memset(cs, 0, sizeof(*rp->cs));
- for (i=0;i<PFS_MAX_ALU_INST;i++) {
- for (j=0;j<3;j++) {
+ 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;
}
@@ -2183,10 +2117,11 @@ static void init_program(r300ContextPtr r300, struct r300_fragment_program *rp)
*/
/* Texcoords come first */
- for (i=0;i<rp->ctx->Const.MaxTextureUnits;i++) {
+ for (i = 0; i < rp->ctx->Const.MaxTextureUnits; i++) {
if (InputsRead & (FRAG_BIT_TEX0 << i)) {
- cs->inputs[FRAG_ATTRIB_TEX0+i].refcount = 0;
- cs->inputs[FRAG_ATTRIB_TEX0+i].reg = get_hw_temp(rp, 0);
+ 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;
@@ -2215,11 +2150,11 @@ static void init_program(r300ContextPtr r300, struct r300_fragment_program *rp)
/* 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)) cs->inputs[i].reg = 0;
+ for (i = 0; i < 32; i++)
+ if (InputsRead & (1 << i))
+ cs->inputs[i].reg = 0;
}
/* Pre-parse the mesa program, grabbing refcounts on input/temp regs.
@@ -2230,14 +2165,14 @@ static void init_program(r300ContextPtr r300, struct r300_fragment_program *rp)
return;
}
- for (fpi=mp->Base.Instructions;fpi->Opcode != OPCODE_END; fpi++) {
+ for (fpi = mp->Base.Instructions; fpi->Opcode != OPCODE_END; fpi++) {
int idx;
- for (i=0;i<3;i++) {
+ for (i = 0; i < 3; i++) {
idx = fpi->SrcReg[i].Index;
switch (fpi->SrcReg[i].File) {
case PROGRAM_TEMPORARY:
- if (!(temps_used & (1<<idx))) {
+ if (!(temps_used & (1 << idx))) {
cs->temps[idx].reg = -1;
cs->temps[idx].refcount = 1;
temps_used |= (1 << idx);
@@ -2247,13 +2182,14 @@ static void init_program(r300ContextPtr r300, struct r300_fragment_program *rp)
case PROGRAM_INPUT:
cs->inputs[idx].refcount++;
break;
- default: break;
+ default:
+ break;
}
}
idx = fpi->DstReg.Index;
if (fpi->DstReg.File == PROGRAM_TEMPORARY) {
- if (!(temps_used & (1<<idx))) {
+ if (!(temps_used & (1 << idx))) {
cs->temps[idx].reg = -1;
cs->temps[idx].refcount = 1;
temps_used |= (1 << idx);
@@ -2273,7 +2209,8 @@ static void update_params(struct r300_fragment_program *rp)
_mesa_load_state_parameters(rp->ctx, mp->Base.Parameters);
}
-void r300_translate_fragment_shader(r300ContextPtr r300, struct r300_fragment_program *rp)
+void r300_translate_fragment_shader(r300ContextPtr r300,
+ struct r300_fragment_program *rp)
{
struct r300_pfs_compile_state *cs = NULL;
@@ -2289,18 +2226,19 @@ void r300_translate_fragment_shader(r300ContextPtr r300, struct r300_fragment_pr
/* Finish off */
rp->node[rp->cur_node].alu_end =
- cs->nrslots - rp->node[rp->cur_node].alu_offset - 1;
+ 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->alu_end = cs->nrslots - 1;
rp->tex_offset = 0;
- rp->tex_end = rp->tex.length ? rp->tex.length - 1 : 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 (RADEON_DEBUG & DEBUG_PIXEL) dump_program(rp);
+ if (RADEON_DEBUG & DEBUG_PIXEL)
+ dump_program(rp);
r300UpdateStateParameters(rp->ctx, _NEW_PROGRAM);
}
@@ -2317,26 +2255,29 @@ static void dump_program(struct r300_fragment_program *rp)
fprintf(stderr, "Mesa program:\n");
fprintf(stderr, "-------------\n");
- _mesa_print_program(&rp->mesa_program.Base);
+ _mesa_print_program(&rp->mesa_program.Base);
fflush(stdout);
fprintf(stderr, "Hardware program\n");
fprintf(stderr, "----------------\n");
- for (n = 0; n < (rp->cur_node+1); n++) {
- fprintf(stderr, "NODE %d: alu_offset: %d, tex_offset: %d, "\
+ 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);
+ 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) {
+ 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;
@@ -2353,94 +2294,121 @@ static void dump_program(struct r300_fragment_program *rp)
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]);
+ 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) {
+ 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);
+ 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);
+ 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" : "");
+ (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);
+ (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" : "");
+ (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);
+ (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);
+ 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);
+ 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);
+ 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);
+ 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;
+ 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]);
+ sprintf(buf, "%s.www", srca[d - 12]);
} else if (d == 20) {
sprintf(buf, "0.0");
} else if (d == 21) {
@@ -2449,32 +2417,35 @@ static void dump_program(struct r300_fragment_program *rp)
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;
+ 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) ? "|" : "");
+ (regc & 32) ? "-" : "",
+ (regc & 64) ? "|" : "",
+ buf, (regc & 64) ? "|" : "");
d = rega & 31;
if (d < 9) {
- sprintf(buf, "%s.%c", srcc[d / 3], 'x' + (char)(d%3));
+ sprintf(buf, "%s.%c", srcc[d / 3],
+ 'x' + (char)(d % 3));
} else if (d < 12) {
- sprintf(buf, "%s.w", srca[d-9]);
+ sprintf(buf, "%s.w", srca[d - 9]);
} else if (d == 16) {
sprintf(buf, "0.0");
} else if (d == 17) {
@@ -2486,16 +2457,16 @@ static void dump_program(struct r300_fragment_program *rp)
}
sprintf(arga[j], "%s%s%s%s",
- (rega & 32) ? "-" : "",
- (rega & 64) ? "|" : "",
- buf,
- (rega & 64) ? "|" : "");
+ (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);
+ " 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);
}
}
}
diff --git a/src/mesa/drivers/dri/r300/r300_fragprog.h b/src/mesa/drivers/dri/r300/r300_fragprog.h
index 1d683acdd92..79f3e70fa63 100644
--- a/src/mesa/drivers/dri/r300/r300_fragprog.h
+++ b/src/mesa/drivers/dri/r300/r300_fragprog.h
@@ -98,6 +98,7 @@ typedef struct r300_fragment_program_swizzle {
struct r300_fragment_program;
-extern void r300_translate_fragment_shader(r300ContextPtr r300, struct r300_fragment_program *rp);
+extern void r300_translate_fragment_shader(r300ContextPtr r300,
+ struct r300_fragment_program *rp);
#endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 01:52:05 +0000