diff options
author | Ben Skeggs <skeggsb@gmail.com> | 2007-12-23 16:05:02 +1100 |
---|---|---|
committer | Ben Skeggs <skeggsb@gmail.com> | 2007-12-23 16:05:02 +1100 |
commit | b4b002661e8a1f9a37201796c996503c33b8c96f (patch) | |
tree | 571860fc0f503ea1a08a0a80dfb11e5443fc58ed /src/mesa/pipe/nv40/nv40_fragprog.c | |
parent | 6c14cf58343135491068e96575bf4e61a6d34c87 (diff) |
nouveau: match gallium changes
Diffstat (limited to 'src/mesa/pipe/nv40/nv40_fragprog.c')
-rw-r--r-- | src/mesa/pipe/nv40/nv40_fragprog.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mesa/pipe/nv40/nv40_fragprog.c b/src/mesa/pipe/nv40/nv40_fragprog.c index c95f31e143..480c4c967b 100644 --- a/src/mesa/pipe/nv40/nv40_fragprog.c +++ b/src/mesa/pipe/nv40/nv40_fragprog.c @@ -378,7 +378,7 @@ nv40_fragprog_parse_instruction(struct nv40_fpc *fpc, int ai = -1, ci = -1; int i; - if (finst->Instruction.Opcode == TGSI_OPCODE_RET) + if (finst->Instruction.Opcode == TGSI_OPCODE_END) return TRUE; fpc->temp_temp_count = 0; @@ -537,6 +537,9 @@ nv40_fragprog_parse_instruction(struct nv40_fpc *fpc, case TGSI_OPCODE_RCP: arith(fpc, sat, RCP, dst, mask, src[0], none, none); break; + case TGSI_OPCODE_RET: + assert(0); + break; case TGSI_OPCODE_RFL: tmp = temp(fpc); arith(fpc, 0, DP3, tmp, MASK_X, src[0], src[0], none); |