diff options
| author | Dave Airlie <airlied@redhat.com> | 2007-10-12 11:02:46 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2007-10-12 11:02:46 +1000 |
| commit | bf805d3bf5bf191aa669b6155316a78917cf9b0e (patch) | |
| tree | d76223fb22381485f7ecc8f6c7d026dcd88d80f3 /src/mesa/drivers/dri/r300 | |
| parent | 9e06cf00cfb24528653913fc90eded4d370c1149 (diff) | |
| parent | 72c888869f4e5074e57c349ec356798959be791e (diff) | |
Merge branch 'master' into i915-superioctl
Diffstat (limited to 'src/mesa/drivers/dri/r300')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_fragprog.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_fragprog.c b/src/mesa/drivers/dri/r300/r300_fragprog.c index cce8e68586..78ed44b09c 100644 --- a/src/mesa/drivers/dri/r300/r300_fragprog.c +++ b/src/mesa/drivers/dri/r300/r300_fragprog.c @@ -951,6 +951,10 @@ static void emit_tex(struct r300_fragment_program *fp, if (REG_GET_TYPE(dest) == REG_TYPE_OUTPUT) { rdest = dest; dest = get_temp_reg_tex(fp); + } else if (fpi->DstReg.WriteMask != WRITEMASK_XYZW) { + /* in case write mask isn't XYZW */ + rdest = dest; + dest = get_temp_reg_tex(fp); } hwdest = t_hw_dst(fp, dest, GL_TRUE, @@ -1016,7 +1020,7 @@ static void emit_tex(struct r300_fragment_program *fp, /* Copy from temp to output if needed */ if (REG_GET_VALID(rdest)) { - emit_arith(fp, PFS_OP_MAD, rdest, WRITEMASK_XYZW, dest, + emit_arith(fp, PFS_OP_MAD, rdest, fpi->DstReg.WriteMask, dest, pfs_one, pfs_zero, 0); free_temp(fp, dest); } |