summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Skeggs <[email protected]>2008-08-14 00:22:49 +1000
committerBen Skeggs <[email protected]>2008-08-14 00:22:49 +1000
commitdbec107c2549c00120ca6d67282f2a1a4bd8bdbd (patch)
treeab0e2b6f7b3a1ff8b646c1d2fc02504e26872e5e
parent56f5c0c001c476b813c94d071ac880fbe8d9768b (diff)
nv30/nv40: KIL/KILP swapped meanings
-rw-r--r--src/gallium/drivers/nv30/nv30_fragprog.c4
-rw-r--r--src/gallium/drivers/nv40/nv40_fragprog.c4
2 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 68058264e39..d3693fdf567 100644
--- a/src/gallium/drivers/nv30/nv30_fragprog.c
+++ b/src/gallium/drivers/nv30/nv30_fragprog.c
@@ -494,10 +494,10 @@ nv30_fragprog_parse_instruction(struct nv30_fpc *fpc,
case TGSI_OPCODE_FRC:
arith(fpc, sat, FRC, dst, mask, src[0], none, none);
break;
- case TGSI_OPCODE_KIL:
+ case TGSI_OPCODE_KILP:
arith(fpc, 0, KIL, none, 0, none, none, none);
break;
- case TGSI_OPCODE_KILP:
+ case TGSI_OPCODE_KIL:
dst = nv30_sr(NV30SR_NONE, 0);
dst.cc_update = 1;
arith(fpc, 0, MOV, dst, MASK_ALL, src[0], none, none);
diff --git a/src/gallium/drivers/nv40/nv40_fragprog.c b/src/gallium/drivers/nv40/nv40_fragprog.c
index a361509e8f1..91dcbebda0d 100644
--- a/src/gallium/drivers/nv40/nv40_fragprog.c
+++ b/src/gallium/drivers/nv40/nv40_fragprog.c
@@ -533,10 +533,10 @@ nv40_fragprog_parse_instruction(struct nv40_fpc *fpc,
case TGSI_OPCODE_FRC:
arith(fpc, sat, FRC, dst, mask, src[0], none, none);
break;
- case TGSI_OPCODE_KIL:
+ case TGSI_OPCODE_KILP:
arith(fpc, 0, KIL, none, 0, none, none, none);
break;
- case TGSI_OPCODE_KILP:
+ case TGSI_OPCODE_KIL:
dst = nv40_sr(NV40SR_NONE, 0);
dst.cc_update = 1;
arith(fpc, 0, MOV, dst, MASK_ALL, src[0], none, none);