re-apply shader fix.

appears to have been reverted by mistake.

diff --git a/src/mesa/drivers/dri/r300/r300_fragprog.c b/src/mesa/drivers/dri/r300/r300_fragprog.c
index 4a13b36e6467481e3603a1cd1bc79622ea84fc17..2d947dea3af159ea29544deb34aaf4f9f3d8a163 100644 (file)
--- 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,