diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2007-12-12 23:37:52 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2007-12-12 23:37:52 +1100 |
| commit | 805c5993a3d442c6b87733416654677e61fa36a2 (patch) | |
| tree | 82e3b5f437823023b6eff53ed66c96904825b183 /src/mesa/pipe/nv40 | |
| parent | 9114324b0b27d9d66f2acfb6e072f027bc216406 (diff) | |
nv40: Fix bug in vtxprog + a few tweaks
Diffstat (limited to 'src/mesa/pipe/nv40')
| -rw-r--r-- | src/mesa/pipe/nv40/nv40_vertprog.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mesa/pipe/nv40/nv40_vertprog.c b/src/mesa/pipe/nv40/nv40_vertprog.c index 66722bafa5..b6ebaee2f2 100644 --- a/src/mesa/pipe/nv40/nv40_vertprog.c +++ b/src/mesa/pipe/nv40/nv40_vertprog.c @@ -184,7 +184,7 @@ emit_dst(struct nv40_vpc *vpc, uint32_t *hw, int slot, struct nv40_sreg dst) hw[3] |= (dst.index << NV40_VP_INST_DEST_SHIFT); if (slot == 0) { hw[0] |= NV40_VP_INST_VEC_RESULT; - hw[0] |= NV40_VP_INST_VEC_DEST_TEMP_MASK; + hw[0] |= NV40_VP_INST_VEC_DEST_TEMP_MASK | (1<<20); } else { hw[3] |= NV40_VP_INST_SCA_RESULT; hw[3] |= NV40_VP_INST_SCA_DEST_TEMP_MASK; @@ -212,12 +212,11 @@ nv40_vp_arith(struct nv40_vpc *vpc, int slot, int op, if (slot == 0) { hw[1] |= (op << NV40_VP_INST_VEC_OPCODE_SHIFT); - hw[3] |= (NV40_VP_INST_SCA_RESULT | - NV40_VP_INST_SCA_DEST_TEMP_MASK); + hw[3] |= NV40_VP_INST_SCA_DEST_TEMP_MASK; hw[3] |= (mask << NV40_VP_INST_VEC_WRITEMASK_SHIFT); } else { hw[1] |= (op << NV40_VP_INST_SCA_OPCODE_SHIFT); - hw[1] |= (NV40_VP_INST_VEC_DEST_TEMP_MASK | (1 << 20)); + hw[0] |= (NV40_VP_INST_VEC_DEST_TEMP_MASK | (1 << 20)); hw[3] |= (mask << NV40_VP_INST_SCA_WRITEMASK_SHIFT); } |