diff options
| author | Brian <brian@i915.localnet.net> | 2007-08-06 16:18:25 -0600 |
|---|---|---|
| committer | Brian <brian@i915.localnet.net> | 2007-08-06 16:18:25 -0600 |
| commit | 073d25eca0161e140115979e00649056527783b8 (patch) | |
| tree | a67b59e89c31534f85a419d892c979166e14fadd | |
| parent | 8929c90a7173262fa74f1efcdc639a644da514c6 (diff) | |
| parent | f79b90bc1962c6c40f806540c0bd1f867a9b80c7 (diff) | |
Merge branch 'softpipe_0_1_branch' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa into softpipe_0_1_branch
| -rw-r--r-- | src/mesa/pipe/tgsi/core/tgsi_token.h | 2 | ||||
| -rw-r--r-- | src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.c | 27 |
2 files changed, 28 insertions, 1 deletions
diff --git a/src/mesa/pipe/tgsi/core/tgsi_token.h b/src/mesa/pipe/tgsi/core/tgsi_token.h index 40297f2575..12fc6df2ee 100644 --- a/src/mesa/pipe/tgsi/core/tgsi_token.h +++ b/src/mesa/pipe/tgsi/core/tgsi_token.h @@ -683,7 +683,7 @@ struct tgsi_immediate_float32 #define TGSI_OPCODE_NOP 98 /* TGSI_OPCODE_ABS */ /* TGSI_OPCODE_ADD */ -#define TGSI_OPCODE_BGNLOOP 99 +#define TGSI_OPCODE_BGNLOOP2 99 #define TGSI_OPCODE_BGNSUB 100 /* TGSI_OPCODE_BRA */ /* TGSI_OPCODE_BRK */ diff --git a/src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.c b/src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.c index a9415ac15b..aa14577642 100644 --- a/src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.c +++ b/src/mesa/pipe/tgsi/mesa/mesa_to_tgsi.c @@ -369,6 +369,33 @@ compile_instruction( fullinst->Instruction.Opcode = TGSI_OPCODE_XPD;
fulldst->DstRegister.WriteMask &= TGSI_WRITEMASK_XYZ;
break;
+ case OPCODE_NOP:
+ fullinst->Instruction.Opcode = TGSI_OPCODE_NOP;
+ break;
+ case OPCODE_BGNLOOP:
+ fullinst->Instruction.Opcode = TGSI_OPCODE_BGNLOOP2;
+ break;
+ case OPCODE_BGNSUB:
+ fullinst->Instruction.Opcode = TGSI_OPCODE_BGNSUB;
+ break;
+ case OPCODE_ENDLOOP:
+ fullinst->Instruction.Opcode = TGSI_OPCODE_ENDLOOP2;
+ break;
+ case OPCODE_ENDSUB:
+ fullinst->Instruction.Opcode = TGSI_OPCODE_ENDSUB;
+ break;
+ case OPCODE_NOISE1:
+ fullinst->Instruction.Opcode = TGSI_OPCODE_NOISE1;
+ break;
+ case OPCODE_NOISE2:
+ fullinst->Instruction.Opcode = TGSI_OPCODE_NOISE2;
+ break;
+ case OPCODE_NOISE3:
+ fullinst->Instruction.Opcode = TGSI_OPCODE_NOISE3;
+ break;
+ case OPCODE_NOISE4:
+ fullinst->Instruction.Opcode = TGSI_OPCODE_NOISE4;
+ break;
case OPCODE_END:
return GL_TRUE;
default:
|