projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gallium: remove the swizzling parts of ExtSwizzle
[mesa.git]
/
src
/
gallium
/
drivers
/
cell
/
spu
/
spu_exec.c
diff --git
a/src/gallium/drivers/cell/spu/spu_exec.c
b/src/gallium/drivers/cell/spu/spu_exec.c
index 89c61136a4c2b753d9b843fc63219accf43e6c96..4c32b2d06d78bb5ecd22015a9e46f0bfc3f0841b 100644
(file)
--- a/
src/gallium/drivers/cell/spu/spu_exec.c
+++ b/
src/gallium/drivers/cell/spu/spu_exec.c
@@
-346,10
+346,10
@@
fetch_src_file_channel(
union spu_exec_channel *chan )
{
switch( swizzle ) {
union spu_exec_channel *chan )
{
switch( swizzle ) {
- case TGSI_
EXT
SWIZZLE_X:
- case TGSI_
EXT
SWIZZLE_Y:
- case TGSI_
EXT
SWIZZLE_Z:
- case TGSI_
EXT
SWIZZLE_W:
+ case TGSI_SWIZZLE_X:
+ case TGSI_SWIZZLE_Y:
+ case TGSI_SWIZZLE_Z:
+ case TGSI_SWIZZLE_W:
switch( file ) {
case TGSI_FILE_CONSTANT: {
unsigned i;
switch( file ) {
case TGSI_FILE_CONSTANT: {
unsigned i;
@@
-382,10
+382,10
@@
fetch_src_file_channel(
break;
case TGSI_FILE_IMMEDIATE:
break;
case TGSI_FILE_IMMEDIATE:
-
assert
( index->i[0] < (int) mach->ImmLimit );
-
assert
( index->i[1] < (int) mach->ImmLimit );
-
assert
( index->i[2] < (int) mach->ImmLimit );
-
assert
( index->i[3] < (int) mach->ImmLimit );
+
ASSERT
( index->i[0] < (int) mach->ImmLimit );
+
ASSERT
( index->i[1] < (int) mach->ImmLimit );
+
ASSERT
( index->i[2] < (int) mach->ImmLimit );
+
ASSERT
( index->i[3] < (int) mach->ImmLimit );
chan->f[0] = mach->Imms[index->i[0]][swizzle];
chan->f[1] = mach->Imms[index->i[1]][swizzle];
chan->f[0] = mach->Imms[index->i[0]][swizzle];
chan->f[1] = mach->Imms[index->i[1]][swizzle];
@@
-409,20
+409,12
@@
fetch_src_file_channel(
break;
default:
break;
default:
-
assert
( 0 );
+
ASSERT
( 0 );
}
break;
}
break;
- case TGSI_EXTSWIZZLE_ZERO:
- *chan = mach->Temps[TEMP_0_I].xyzw[TEMP_0_C];
- break;
-
- case TGSI_EXTSWIZZLE_ONE:
- *chan = mach->Temps[TEMP_1_I].xyzw[TEMP_1_C];
- break;
-
default:
default:
-
assert
( 0 );
+
ASSERT
( 0 );
}
}
}
}
@@
-471,7
+463,7
@@
fetch_source(
index.q = si_shli(index.q, 12);
break;
default:
index.q = si_shli(index.q, 12);
break;
default:
-
assert
( 0 );
+
ASSERT
( 0 );
}
index.i[0] += reg->SrcRegisterDim.Index;
}
index.i[0] += reg->SrcRegisterDim.Index;
@@
-500,7
+492,7
@@
fetch_source(
}
}
}
}
- swizzle = tgsi_util_get_full_src_register_
ext
swizzle( reg, chan_index );
+ swizzle = tgsi_util_get_full_src_register_swizzle( reg, chan_index );
fetch_src_file_channel(
mach,
reg->SrcRegister.File,
fetch_src_file_channel(
mach,
reg->SrcRegister.File,
@@
-558,7
+550,7
@@
store_dest(
break;
default:
break;
default:
-
assert
( 0 );
+
ASSERT
( 0 );
return;
}
return;
}
@@
-582,11
+574,11
@@
store_dest(
break;
case TGSI_SAT_MINUS_PLUS_ONE:
break;
case TGSI_SAT_MINUS_PLUS_ONE:
-
assert
( 0 );
+
ASSERT
( 0 );
break;
default:
break;
default:
-
assert
( 0 );
+
ASSERT
( 0 );
}
}
}
}
@@
-610,10
+602,8
@@
exec_kil(struct spu_exec_machine *mach,
uint kilmask = 0; /* bit 0 = pixel 0, bit 1 = pixel 1, etc */
union spu_exec_channel r[1];
uint kilmask = 0; /* bit 0 = pixel 0, bit 1 = pixel 1, etc */
union spu_exec_channel r[1];
- /* This mask stores component bits that were already tested. Note that
- * we test if the value is less than zero, so 1.0 and 0.0 need not to be
- * tested. */
- uniquemask = (1 << TGSI_EXTSWIZZLE_ZERO) | (1 << TGSI_EXTSWIZZLE_ONE);
+ /* This mask stores component bits that were already tested. */
+ uniquemask = 0;
for (chan_index = 0; chan_index < 4; chan_index++)
{
for (chan_index = 0; chan_index < 4; chan_index++)
{
@@
-621,7
+611,7
@@
exec_kil(struct spu_exec_machine *mach,
uint i;
/* unswizzle channel */
uint i;
/* unswizzle channel */
- swizzle = tgsi_util_get_full_src_register_
ext
swizzle (
+ swizzle = tgsi_util_get_full_src_register_swizzle (
&inst->FullSrcRegisters[0],
chan_index);
&inst->FullSrcRegisters[0],
chan_index);
@@
-769,7
+759,7
@@
exec_tex(struct spu_exec_machine *mach,
break;
default:
break;
default:
-
assert
(0);
+
ASSERT
(0);
}
FOR_EACH_ENABLED_CHANNEL( *inst, chan_index ) {
}
FOR_EACH_ENABLED_CHANNEL( *inst, chan_index ) {
@@
-861,7
+851,7
@@
exec_declaration(struct spu_exec_machine *mach,
break;
default:
break;
default:
-
assert
( 0 );
+
ASSERT
( 0 );
}
if( mask == TGSI_WRITEMASK_XYZW ) {
}
if( mask == TGSI_WRITEMASK_XYZW ) {
@@
-909,7
+899,6
@@
exec_instruction(
break;
case TGSI_OPCODE_MOV:
break;
case TGSI_OPCODE_MOV:
- case TGSI_OPCODE_SWZ:
FOR_EACH_ENABLED_CHANNEL( *inst, chan_index ) {
FETCH( &r[0], 0, chan_index );
STORE( &r[0], 0, chan_index );
FOR_EACH_ENABLED_CHANNEL( *inst, chan_index ) {
FETCH( &r[0], 0, chan_index );
STORE( &r[0], 0, chan_index );
@@
-952,7
+941,6
@@
exec_instruction(
break;
case TGSI_OPCODE_RCP:
break;
case TGSI_OPCODE_RCP:
- /* TGSI_OPCODE_RECIP */
FETCH( &r[0], 0, CHAN_X );
r[0].q = micro_div(mach->Temps[TEMP_1_I].xyzw[TEMP_1_C].q, r[0].q);
FOR_EACH_ENABLED_CHANNEL( *inst, chan_index ) {
FETCH( &r[0], 0, CHAN_X );
r[0].q = micro_div(mach->Temps[TEMP_1_I].xyzw[TEMP_1_C].q, r[0].q);
FOR_EACH_ENABLED_CHANNEL( *inst, chan_index ) {
@@
-961,7
+949,6
@@
exec_instruction(
break;
case TGSI_OPCODE_RSQ:
break;
case TGSI_OPCODE_RSQ:
- /* TGSI_OPCODE_RECIPSQRT */
FETCH( &r[0], 0, CHAN_X );
r[0].q = micro_sqrt(r[0].q);
r[0].q = micro_div(mach->Temps[TEMP_1_I].xyzw[TEMP_1_C].q, r[0].q);
FETCH( &r[0], 0, CHAN_X );
r[0].q = micro_sqrt(r[0].q);
r[0].q = micro_div(mach->Temps[TEMP_1_I].xyzw[TEMP_1_C].q, r[0].q);
@@
-971,11
+958,11
@@
exec_instruction(
break;
case TGSI_OPCODE_EXP:
break;
case TGSI_OPCODE_EXP:
-
assert
(0);
+
ASSERT
(0);
break;
case TGSI_OPCODE_LOG:
break;
case TGSI_OPCODE_LOG:
-
assert
(0);
+
ASSERT
(0);
break;
case TGSI_OPCODE_MUL:
break;
case TGSI_OPCODE_MUL:
@@
-1115,7
+1102,6
@@
exec_instruction(
break;
case TGSI_OPCODE_MAD:
break;
case TGSI_OPCODE_MAD:
- /* TGSI_OPCODE_MADD */
FOR_EACH_ENABLED_CHANNEL( *inst, chan_index ) {
FETCH( &r[0], 0, chan_index );
FETCH( &r[1], 1, chan_index );
FOR_EACH_ENABLED_CHANNEL( *inst, chan_index ) {
FETCH( &r[0], 0, chan_index );
FETCH( &r[1], 1, chan_index );
@@
-1136,8
+1122,7
@@
exec_instruction(
}
break;
}
break;
- case TGSI_OPCODE_LERP:
- /* TGSI_OPCODE_LRP */
+ case TGSI_OPCODE_LRP:
FOR_EACH_ENABLED_CHANNEL( *inst, chan_index ) {
FETCH(&r[0], 0, chan_index);
FETCH(&r[1], 1, chan_index);
FOR_EACH_ENABLED_CHANNEL( *inst, chan_index ) {
FETCH(&r[0], 0, chan_index);
FETCH(&r[1], 1, chan_index);
@@
-1151,28
+1136,14
@@
exec_instruction(
break;
case TGSI_OPCODE_CND:
break;
case TGSI_OPCODE_CND:
- assert (0);
- break;
-
- case TGSI_OPCODE_CND0:
- assert (0);
+ ASSERT (0);
break;
break;
- case TGSI_OPCODE_DOT2ADD:
- /* TGSI_OPCODE_DP2A */
- assert (0);
+ case TGSI_OPCODE_DP2A:
+ ASSERT (0);
break;
break;
- case TGSI_OPCODE_INDEX:
- assert (0);
- break;
-
- case TGSI_OPCODE_NEGATE:
- assert (0);
- break;
-
- case TGSI_OPCODE_FRAC:
- /* TGSI_OPCODE_FRC */
+ case TGSI_OPCODE_FRC:
FOR_EACH_ENABLED_CHANNEL( *inst, chan_index ) {
FETCH( &r[0], 0, chan_index );
r[0].q = micro_frc(r[0].q);
FOR_EACH_ENABLED_CHANNEL( *inst, chan_index ) {
FETCH( &r[0], 0, chan_index );
r[0].q = micro_frc(r[0].q);
@@
-1181,11
+1152,10
@@
exec_instruction(
break;
case TGSI_OPCODE_CLAMP:
break;
case TGSI_OPCODE_CLAMP:
-
assert
(0);
+
ASSERT
(0);
break;
break;
- case TGSI_OPCODE_FLOOR:
- /* TGSI_OPCODE_FLR */
+ case TGSI_OPCODE_FLR:
FOR_EACH_ENABLED_CHANNEL( *inst, chan_index ) {
FETCH( &r[0], 0, chan_index );
r[0].q = micro_flr(r[0].q);
FOR_EACH_ENABLED_CHANNEL( *inst, chan_index ) {
FETCH( &r[0], 0, chan_index );
r[0].q = micro_flr(r[0].q);
@@
-1201,8
+1171,7
@@
exec_instruction(
}
break;
}
break;
- case TGSI_OPCODE_EXPBASE2:
- /* TGSI_OPCODE_EX2 */
+ case TGSI_OPCODE_EX2:
FETCH(&r[0], 0, CHAN_X);
r[0].q = micro_pow(mach->Temps[TEMP_2_I].xyzw[TEMP_2_C].q, r[0].q);
FETCH(&r[0], 0, CHAN_X);
r[0].q = micro_pow(mach->Temps[TEMP_2_I].xyzw[TEMP_2_C].q, r[0].q);
@@
-1212,8
+1181,7
@@
exec_instruction(
}
break;
}
break;
- case TGSI_OPCODE_LOGBASE2:
- /* TGSI_OPCODE_LG2 */
+ case TGSI_OPCODE_LG2:
FETCH( &r[0], 0, CHAN_X );
r[0].q = micro_lg2(r[0].q);
FOR_EACH_ENABLED_CHANNEL( *inst, chan_index ) {
FETCH( &r[0], 0, CHAN_X );
r[0].q = micro_lg2(r[0].q);
FOR_EACH_ENABLED_CHANNEL( *inst, chan_index ) {
@@
-1221,8
+1189,7
@@
exec_instruction(
}
break;
}
break;
- case TGSI_OPCODE_POWER:
- /* TGSI_OPCODE_POW */
+ case TGSI_OPCODE_POW:
FETCH(&r[0], 0, CHAN_X);
FETCH(&r[1], 1, CHAN_X);
FETCH(&r[0], 0, CHAN_X);
FETCH(&r[1], 1, CHAN_X);
@@
-1233,7
+1200,7
@@
exec_instruction(
}
break;
}
break;
- case TGSI_OPCODE_
CROSSPRODUCT
:
+ case TGSI_OPCODE_
XPD
:
/* TGSI_OPCODE_XPD */
FETCH(&r[0], 0, CHAN_Y);
FETCH(&r[1], 1, CHAN_Z);
/* TGSI_OPCODE_XPD */
FETCH(&r[0], 0, CHAN_Y);
FETCH(&r[1], 1, CHAN_Z);
@@
-1275,10
+1242,6
@@
exec_instruction(
}
break;
}
break;
- case TGSI_OPCODE_MULTIPLYMATRIX:
- assert (0);
- break;
-
case TGSI_OPCODE_ABS:
FOR_EACH_ENABLED_CHANNEL( *inst, chan_index ) {
FETCH(&r[0], 0, chan_index);
case TGSI_OPCODE_ABS:
FOR_EACH_ENABLED_CHANNEL( *inst, chan_index ) {
FETCH(&r[0], 0, chan_index);
@@
-1290,7
+1253,7
@@
exec_instruction(
break;
case TGSI_OPCODE_RCC:
break;
case TGSI_OPCODE_RCC:
-
assert
(0);
+
ASSERT
(0);
break;
case TGSI_OPCODE_DPH:
break;
case TGSI_OPCODE_DPH:
@@
-1353,23
+1316,23
@@
exec_instruction(
break;
case TGSI_OPCODE_PK2H:
break;
case TGSI_OPCODE_PK2H:
-
assert
(0);
+
ASSERT
(0);
break;
case TGSI_OPCODE_PK2US:
break;
case TGSI_OPCODE_PK2US:
-
assert
(0);
+
ASSERT
(0);
break;
case TGSI_OPCODE_PK4B:
break;
case TGSI_OPCODE_PK4B:
-
assert
(0);
+
ASSERT
(0);
break;
case TGSI_OPCODE_PK4UB:
break;
case TGSI_OPCODE_PK4UB:
-
assert
(0);
+
ASSERT
(0);
break;
case TGSI_OPCODE_RFL:
break;
case TGSI_OPCODE_RFL:
-
assert
(0);
+
ASSERT
(0);
break;
case TGSI_OPCODE_SEQ:
break;
case TGSI_OPCODE_SEQ:
@@
-1384,7
+1347,7
@@
exec_instruction(
break;
case TGSI_OPCODE_SFL:
break;
case TGSI_OPCODE_SFL:
-
assert
(0);
+
ASSERT
(0);
break;
case TGSI_OPCODE_SGT:
break;
case TGSI_OPCODE_SGT:
@@
-1429,7
+1392,7
@@
exec_instruction(
break;
case TGSI_OPCODE_STR:
break;
case TGSI_OPCODE_STR:
-
assert
(0);
+
ASSERT
(0);
break;
case TGSI_OPCODE_TEX:
break;
case TGSI_OPCODE_TEX:
@@
-1452,7
+1415,7
@@
exec_instruction(
/* src[1] = d[strq]/dx */
/* src[2] = d[strq]/dy */
/* src[3] = sampler unit */
/* src[1] = d[strq]/dx */
/* src[2] = d[strq]/dy */
/* src[3] = sampler unit */
-
assert
(0);
+
ASSERT
(0);
break;
case TGSI_OPCODE_TXL:
break;
case TGSI_OPCODE_TXL:
@@
-1470,35
+1433,35
@@
exec_instruction(
break;
case TGSI_OPCODE_UP2H:
break;
case TGSI_OPCODE_UP2H:
-
assert
(0);
+
ASSERT
(0);
break;
case TGSI_OPCODE_UP2US:
break;
case TGSI_OPCODE_UP2US:
-
assert
(0);
+
ASSERT
(0);
break;
case TGSI_OPCODE_UP4B:
break;
case TGSI_OPCODE_UP4B:
-
assert
(0);
+
ASSERT
(0);
break;
case TGSI_OPCODE_UP4UB:
break;
case TGSI_OPCODE_UP4UB:
-
assert
(0);
+
ASSERT
(0);
break;
case TGSI_OPCODE_X2D:
break;
case TGSI_OPCODE_X2D:
-
assert
(0);
+
ASSERT
(0);
break;
case TGSI_OPCODE_ARA:
break;
case TGSI_OPCODE_ARA:
-
assert
(0);
+
ASSERT
(0);
break;
case TGSI_OPCODE_ARR:
break;
case TGSI_OPCODE_ARR:
-
assert
(0);
+
ASSERT
(0);
break;
case TGSI_OPCODE_BRA:
break;
case TGSI_OPCODE_BRA:
-
assert
(0);
+
ASSERT
(0);
break;
case TGSI_OPCODE_CAL:
break;
case TGSI_OPCODE_CAL:
@@
-1507,14
+1470,14
@@
exec_instruction(
/* do the call */
/* push the Cond, Loop, Cont stacks */
/* do the call */
/* push the Cond, Loop, Cont stacks */
-
assert
(mach->CondStackTop < TGSI_EXEC_MAX_COND_NESTING);
+
ASSERT
(mach->CondStackTop < TGSI_EXEC_MAX_COND_NESTING);
mach->CondStack[mach->CondStackTop++] = mach->CondMask;
mach->CondStack[mach->CondStackTop++] = mach->CondMask;
-
assert
(mach->LoopStackTop < TGSI_EXEC_MAX_LOOP_NESTING);
+
ASSERT
(mach->LoopStackTop < TGSI_EXEC_MAX_LOOP_NESTING);
mach->LoopStack[mach->LoopStackTop++] = mach->LoopMask;
mach->LoopStack[mach->LoopStackTop++] = mach->LoopMask;
-
assert
(mach->ContStackTop < TGSI_EXEC_MAX_LOOP_NESTING);
+
ASSERT
(mach->ContStackTop < TGSI_EXEC_MAX_LOOP_NESTING);
mach->ContStack[mach->ContStackTop++] = mach->ContMask;
mach->ContStack[mach->ContStackTop++] = mach->ContMask;
-
assert
(mach->FuncStackTop < TGSI_EXEC_MAX_CALL_NESTING);
+
ASSERT
(mach->FuncStackTop < TGSI_EXEC_MAX_CALL_NESTING);
mach->FuncStack[mach->FuncStackTop++] = mach->FuncMask;
/* note that PC was already incremented above */
mach->FuncStack[mach->FuncStackTop++] = mach->FuncMask;
/* note that PC was already incremented above */
@@
-1538,13
+1501,13
@@
exec_instruction(
*pc = mach->CallStack[--mach->CallStackTop];
/* pop the Cond, Loop, Cont stacks */
*pc = mach->CallStack[--mach->CallStackTop];
/* pop the Cond, Loop, Cont stacks */
-
assert
(mach->CondStackTop > 0);
+
ASSERT
(mach->CondStackTop > 0);
mach->CondMask = mach->CondStack[--mach->CondStackTop];
mach->CondMask = mach->CondStack[--mach->CondStackTop];
-
assert
(mach->LoopStackTop > 0);
+
ASSERT
(mach->LoopStackTop > 0);
mach->LoopMask = mach->LoopStack[--mach->LoopStackTop];
mach->LoopMask = mach->LoopStack[--mach->LoopStackTop];
-
assert
(mach->ContStackTop > 0);
+
ASSERT
(mach->ContStackTop > 0);
mach->ContMask = mach->ContStack[--mach->ContStackTop];
mach->ContMask = mach->ContStack[--mach->ContStackTop];
-
assert
(mach->FuncStackTop > 0);
+
ASSERT
(mach->FuncStackTop > 0);
mach->FuncMask = mach->FuncStack[--mach->FuncStackTop];
UPDATE_EXEC_MASK(mach);
mach->FuncMask = mach->FuncStack[--mach->FuncStackTop];
UPDATE_EXEC_MASK(mach);
@@
-1552,7
+1515,7
@@
exec_instruction(
break;
case TGSI_OPCODE_SSG:
break;
case TGSI_OPCODE_SSG:
-
assert
(0);
+
ASSERT
(0);
break;
case TGSI_OPCODE_CMP:
break;
case TGSI_OPCODE_CMP:
@@
-1592,11
+1555,11
@@
exec_instruction(
break;
case TGSI_OPCODE_NRM:
break;
case TGSI_OPCODE_NRM:
-
assert
(0);
+
ASSERT
(0);
break;
case TGSI_OPCODE_DIV:
break;
case TGSI_OPCODE_DIV:
-
assert
( 0 );
+
ASSERT
( 0 );
break;
case TGSI_OPCODE_DP2:
break;
case TGSI_OPCODE_DP2:
@@
-1615,7
+1578,7
@@
exec_instruction(
case TGSI_OPCODE_IF:
/* push CondMask */
case TGSI_OPCODE_IF:
/* push CondMask */
-
assert
(mach->CondStackTop < TGSI_EXEC_MAX_COND_NESTING);
+
ASSERT
(mach->CondStackTop < TGSI_EXEC_MAX_COND_NESTING);
mach->CondStack[mach->CondStackTop++] = mach->CondMask;
FETCH( &r[0], 0, CHAN_X );
/* update CondMask */
mach->CondStack[mach->CondStackTop++] = mach->CondMask;
FETCH( &r[0], 0, CHAN_X );
/* update CondMask */
@@
-1639,7
+1602,7
@@
exec_instruction(
/* invert CondMask wrt previous mask */
{
uint prevMask;
/* invert CondMask wrt previous mask */
{
uint prevMask;
-
assert
(mach->CondStackTop > 0);
+
ASSERT
(mach->CondStackTop > 0);
prevMask = mach->CondStack[mach->CondStackTop - 1];
mach->CondMask = ~mach->CondMask & prevMask;
UPDATE_EXEC_MASK(mach);
prevMask = mach->CondStack[mach->CondStackTop - 1];
mach->CondMask = ~mach->CondMask & prevMask;
UPDATE_EXEC_MASK(mach);
@@
-1649,7
+1612,7
@@
exec_instruction(
case TGSI_OPCODE_ENDIF:
/* pop CondMask */
case TGSI_OPCODE_ENDIF:
/* pop CondMask */
-
assert
(mach->CondStackTop > 0);
+
ASSERT
(mach->CondStackTop > 0);
mach->CondMask = mach->CondStack[--mach->CondStackTop];
UPDATE_EXEC_MASK(mach);
break;
mach->CondMask = mach->CondStack[--mach->CondStackTop];
UPDATE_EXEC_MASK(mach);
break;
@@
-1660,19
+1623,19
@@
exec_instruction(
break;
case TGSI_OPCODE_REP:
break;
case TGSI_OPCODE_REP:
-
assert
(0);
+
ASSERT
(0);
break;
case TGSI_OPCODE_ENDREP:
break;
case TGSI_OPCODE_ENDREP:
-
assert
(0);
+
ASSERT
(0);
break;
case TGSI_OPCODE_PUSHA:
break;
case TGSI_OPCODE_PUSHA:
-
assert
(0);
+
ASSERT
(0);
break;
case TGSI_OPCODE_POPA:
break;
case TGSI_OPCODE_POPA:
-
assert
(0);
+
ASSERT
(0);
break;
case TGSI_OPCODE_CEIL:
break;
case TGSI_OPCODE_CEIL:
@@
-1746,7
+1709,7
@@
exec_instruction(
break;
case TGSI_OPCODE_MOD:
break;
case TGSI_OPCODE_MOD:
-
assert
(0);
+
ASSERT
(0);
break;
case TGSI_OPCODE_XOR:
break;
case TGSI_OPCODE_XOR:
@@
-1759,15
+1722,15
@@
exec_instruction(
break;
case TGSI_OPCODE_SAD:
break;
case TGSI_OPCODE_SAD:
-
assert
(0);
+
ASSERT
(0);
break;
case TGSI_OPCODE_TXF:
break;
case TGSI_OPCODE_TXF:
-
assert
(0);
+
ASSERT
(0);
break;
case TGSI_OPCODE_TXQ:
break;
case TGSI_OPCODE_TXQ:
-
assert
(0);
+
ASSERT
(0);
break;
case TGSI_OPCODE_EMIT:
break;
case TGSI_OPCODE_EMIT:
@@
-1780,21
+1743,21
@@
exec_instruction(
mach->Primitives[mach->Temps[TEMP_PRIMITIVE_I].xyzw[TEMP_PRIMITIVE_C].u[0]] = 0;
break;
mach->Primitives[mach->Temps[TEMP_PRIMITIVE_I].xyzw[TEMP_PRIMITIVE_C].u[0]] = 0;
break;
- case TGSI_OPCODE_
LOOP
:
+ case TGSI_OPCODE_
BGNFOR
:
/* fall-through (for now) */
/* fall-through (for now) */
- case TGSI_OPCODE_BGNLOOP
2
:
+ case TGSI_OPCODE_BGNLOOP:
/* push LoopMask and ContMasks */
/* push LoopMask and ContMasks */
-
assert
(mach->LoopStackTop < TGSI_EXEC_MAX_LOOP_NESTING);
+
ASSERT
(mach->LoopStackTop < TGSI_EXEC_MAX_LOOP_NESTING);
mach->LoopStack[mach->LoopStackTop++] = mach->LoopMask;
mach->LoopStack[mach->LoopStackTop++] = mach->LoopMask;
-
assert
(mach->ContStackTop < TGSI_EXEC_MAX_LOOP_NESTING);
+
ASSERT
(mach->ContStackTop < TGSI_EXEC_MAX_LOOP_NESTING);
mach->ContStack[mach->ContStackTop++] = mach->ContMask;
break;
mach->ContStack[mach->ContStackTop++] = mach->ContMask;
break;
- case TGSI_OPCODE_END
LOOP
:
+ case TGSI_OPCODE_END
FOR
:
/* fall-through (for now at least) */
/* fall-through (for now at least) */
- case TGSI_OPCODE_ENDLOOP
2
:
+ case TGSI_OPCODE_ENDLOOP:
/* Restore ContMask, but don't pop */
/* Restore ContMask, but don't pop */
-
assert
(mach->ContStackTop > 0);
+
ASSERT
(mach->ContStackTop > 0);
mach->ContMask = mach->ContStack[mach->ContStackTop - 1];
if (mach->LoopMask) {
/* repeat loop: jump to instruction just past BGNLOOP */
mach->ContMask = mach->ContStack[mach->ContStackTop - 1];
if (mach->LoopMask) {
/* repeat loop: jump to instruction just past BGNLOOP */
@@
-1802,10
+1765,10
@@
exec_instruction(
}
else {
/* exit loop: pop LoopMask */
}
else {
/* exit loop: pop LoopMask */
-
assert
(mach->LoopStackTop > 0);
+
ASSERT
(mach->LoopStackTop > 0);
mach->LoopMask = mach->LoopStack[--mach->LoopStackTop];
/* pop ContMask */
mach->LoopMask = mach->LoopStack[--mach->LoopStackTop];
/* pop ContMask */
-
assert
(mach->ContStackTop > 0);
+
ASSERT
(mach->ContStackTop > 0);
mach->ContMask = mach->ContStack[--mach->ContStackTop];
}
UPDATE_EXEC_MASK(mach);
mach->ContMask = mach->ContStack[--mach->ContStackTop];
}
UPDATE_EXEC_MASK(mach);
@@
-1833,27
+1796,11
@@
exec_instruction(
/* no-op */
break;
/* no-op */
break;
- case TGSI_OPCODE_NOISE1:
- assert( 0 );
- break;
-
- case TGSI_OPCODE_NOISE2:
- assert( 0 );
- break;
-
- case TGSI_OPCODE_NOISE3:
- assert( 0 );
- break;
-
- case TGSI_OPCODE_NOISE4:
- assert( 0 );
- break;
-
case TGSI_OPCODE_NOP:
break;
default:
case TGSI_OPCODE_NOP:
break;
default:
-
assert
( 0 );
+
ASSERT
( 0 );
}
}
}
}
@@
-1874,11
+1821,11
@@
spu_exec_machine_run( struct spu_exec_machine *mach )
mach->FuncMask = 0xf;
mach->ExecMask = 0xf;
mach->FuncMask = 0xf;
mach->ExecMask = 0xf;
- mach->CondStackTop = 0; /* temporarily subvert this
assert
ion */
-
assert
(mach->CondStackTop == 0);
-
assert
(mach->LoopStackTop == 0);
-
assert
(mach->ContStackTop == 0);
-
assert
(mach->CallStackTop == 0);
+ mach->CondStackTop = 0; /* temporarily subvert this
ASSERT
ion */
+
ASSERT
(mach->CondStackTop == 0);
+
ASSERT
(mach->LoopStackTop == 0);
+
ASSERT
(mach->ContStackTop == 0);
+
ASSERT
(mach->CallStackTop == 0);
mach->Temps[TEMP_KILMASK_I].xyzw[TEMP_KILMASK_C].u[0] = 0;
mach->Temps[TEMP_OUTPUT_I].xyzw[TEMP_OUTPUT_C].u[0] = 0;
mach->Temps[TEMP_KILMASK_I].xyzw[TEMP_KILMASK_C].u[0] = 0;
mach->Temps[TEMP_OUTPUT_I].xyzw[TEMP_OUTPUT_C].u[0] = 0;