From: Rune Petersen <rune@megahurts.dk>
Date: Thu, 31 Aug 2006 18:19:50 +0000 (+0000)
Subject: re-apply shader fix.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=934a2dcf0fcbc0e1f422453b50ae60ad8f0d8d12;p=mesa.git

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 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,