From: Marek Olšák <maraeo@gmail.com>
Date: Fri, 5 Apr 2013 12:22:42 +0000 (+0200)
Subject: r600g: fix valgrind warning on Cayman
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=34c3f986419340ae695d75103bcc7907a97d0f13;p=mesa.git

r600g: fix valgrind warning on Cayman

Warning: "Conditional jump or move depends on uninitialised value(s)".
---

diff --git a/src/gallium/drivers/r600/r600_asm.c b/src/gallium/drivers/r600/r600_asm.c
index 26a848ad1aa..64e052b6fca 100644
--- a/src/gallium/drivers/r600/r600_asm.c
+++ b/src/gallium/drivers/r600/r600_asm.c
@@ -524,7 +524,7 @@ static int check_and_set_bank_swizzle(struct r600_bytecode *bc,
 		} else
 			r = 0;
 
-		if (!r && slots[4] && max_slots == 5) {
+		if (!r && max_slots == 5 && slots[4]) {
 			r = check_scalar(bc, slots[4], &bs, bank_swizzle[4]);
 		}
 		if (!r) {