From: Vadim Girlin Date: Sat, 21 Jan 2012 21:49:46 +0000 (+0400) Subject: r600g: take into account kcache banks for bank swizzle check X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=840a342cd0ac4a9937798a2137122387c0d3d7f6;p=mesa.git r600g: take into account kcache banks for bank swizzle check Due to the changes for multiple kcache banks support, now we are assigning final SRCx_SEL values for kcache access at the later stage, when building the bytecode. So we need to take into account kcache banks to distinguish the constants with the same address but different bank index. Signed-off-by: Vadim Girlin Signed-off-by: Dave Airlie --- diff --git a/src/gallium/drivers/r600/r600_asm.c b/src/gallium/drivers/r600/r600_asm.c index 00ba8e09c6a..70efc14ca04 100644 --- a/src/gallium/drivers/r600/r600_asm.c +++ b/src/gallium/drivers/r600/r600_asm.c @@ -671,7 +671,7 @@ static int check_vector(struct r600_bytecode *bc, struct r600_bytecode_alu *alu, return r; } } else if (is_cfile(sel)) { - r = reserve_cfile(bc, bs, sel, elem); + r = reserve_cfile(bc, bs, (alu->src[src].kc_bank<<16) + sel, elem); if (r) return r; } @@ -698,7 +698,7 @@ static int check_scalar(struct r600_bytecode *bc, struct r600_bytecode_alu *alu, const_count++; } if (is_cfile(sel)) { - r = reserve_cfile(bc, bs, sel, elem); + r = reserve_cfile(bc, bs, (alu->src[src].kc_bank<<16) + sel, elem); if (r) return r; }