summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRune Petersen <[email protected]>2006-08-31 18:19:50 +0000
committerRune Petersen <[email protected]>2006-08-31 18:19:50 +0000
commit934a2dcf0fcbc0e1f422453b50ae60ad8f0d8d12 (patch)
tree07d73f1222c22b30ade3b74959896a9f38355738
parentd9cb0fc44ded2441c07e7a64f8f811e62fc50524 (diff)
re-apply shader fix.
appears to have been reverted by mistake.
-rw-r--r--src/mesa/drivers/dri/r300/r300_fragprog.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_fragprog.c b/src/mesa/drivers/dri/r300/r300_fragprog.c
index 4a13b36e646..2d947dea3af 100644
--- a/src/mesa/drivers/dri/r300/r300_fragprog.c
+++ b/src/mesa/drivers/dri/r300/r300_fragprog.c
@@ -529,7 +529,7 @@ static pfs_reg_t t_src(struct r300_fragment_program *rp,
}
/* no point swizzling ONE/ZERO/HALF constants... */
- if (r.v_swz < SWIZZLE_111 && r.s_swz < SWIZZLE_ZERO)
+ if (r.v_swz < SWIZZLE_111 || r.s_swz < SWIZZLE_ZERO)
r = do_swizzle(rp, r, fpsrc.Swizzle, fpsrc.NegateBase);
#if 0
/* WRONG! Need to be able to do individual component negation,