From: Vadim Girlin Date: Tue, 26 Feb 2013 16:50:25 +0000 (+0400) Subject: r600g: fix check_and_set_bank_swizzle for cayman X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=138b5b9a12b7e1537494aac556589ac9981b557b;p=mesa.git r600g: fix check_and_set_bank_swizzle for cayman Tested-by: Vincent Lejeune Reviewed-by: Vincent Lejeune --- diff --git a/src/gallium/drivers/r600/r600_asm.c b/src/gallium/drivers/r600/r600_asm.c index 3632aa5763c..b5a29cbb003 100644 --- a/src/gallium/drivers/r600/r600_asm.c +++ b/src/gallium/drivers/r600/r600_asm.c @@ -475,12 +475,6 @@ static int check_and_set_bank_swizzle(struct r600_bytecode *bc, bank_swizzle[4] = SQ_ALU_SCL_210; while(bank_swizzle[4] <= SQ_ALU_SCL_221) { - if (max_slots == 4) { - for (i = 0; i < max_slots; i++) { - if (bank_swizzle[i] == SQ_ALU_VEC_210) - return -1; - } - } init_bank_swizzle(&bs); if (scalar_only == false) { for (i = 0; i < 4; i++) { @@ -512,8 +506,10 @@ static int check_and_set_bank_swizzle(struct r600_bytecode *bc, bank_swizzle[i]++; if (bank_swizzle[i] <= SQ_ALU_VEC_210) break; - else + else if (i < max_slots - 1) bank_swizzle[i] = SQ_ALU_VEC_012; + else + return -1; } } }