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 <vadimgir...@gmail.com> --- src/gallium/drivers/r600/r600_asm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/r600/r600_asm.c b/src/gallium/drivers/r600/r600_asm.c index 6fd3a91..93b0395 100644 --- a/src/gallium/drivers/r600/r600_asm.c +++ b/src/gallium/drivers/r600/r600_asm.c @@ -733,7 +733,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; } @@ -760,7 +760,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; } -- 1.7.7.5 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev