diff options
Diffstat (limited to 'src/gallium/drivers/nv30/nv30_fragprog.c')
| -rw-r--r-- | src/gallium/drivers/nv30/nv30_fragprog.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/drivers/nv30/nv30_fragprog.c b/src/gallium/drivers/nv30/nv30_fragprog.c index 84674a38d0..2d565cb631 100644 --- a/src/gallium/drivers/nv30/nv30_fragprog.c +++ b/src/gallium/drivers/nv30/nv30_fragprog.c @@ -412,7 +412,7 @@ nv30_fragprog_parse_instruction(struct nv30_fpc *fpc, case TGSI_FILE_TEMPORARY: /* handled above */ break; - case TGSI_FILE_RESOURCE: + case TGSI_FILE_SAMPLER: unit = fsrc->Register.Index; break; case TGSI_FILE_OUTPUT: @@ -558,13 +558,13 @@ nv30_fragprog_parse_instruction(struct nv30_fpc *fpc, arith(fpc, sat, ADD, dst, mask, src[0], neg(src[1]), none); break; case TGSI_OPCODE_TEX: - tex(fpc, sat, TEX, unit, dst, mask, src[1], none, none); + tex(fpc, sat, TEX, unit, dst, mask, src[0], none, none); break; case TGSI_OPCODE_TXB: - tex(fpc, sat, TXB, unit, dst, mask, src[1], none, none); + tex(fpc, sat, TXB, unit, dst, mask, src[0], none, none); break; case TGSI_OPCODE_TXP: - tex(fpc, sat, TXP, unit, dst, mask, src[1], none, none); + tex(fpc, sat, TXP, unit, dst, mask, src[0], none, none); break; case TGSI_OPCODE_XPD: tmp = temp(fpc); |