summaryrefslogtreecommitdiff
path: root/src/gallium
diff options
context:
space:
mode:
authorChristoph Bumiller <christoph.bumiller@speed.at>2014-05-17 01:20:17 +0200
committerMarek Olšák <marek.olsak@amd.com>2014-06-02 12:49:03 +0200
commit476aaf8b8ee77d84c295e1429035e92ecf3a7349 (patch)
treefbd90b301588ab980f0f14798e9cd314ab1ee899 /src/gallium
parent6544a4a3425ffab6004918ee1299d4e63ed71755 (diff)
r600g: HW bug workaround for TGSI_OPCODE_BREAKC
Signed-off-by: Marek Olšák <marek.olsak@amd.com>
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/r600/r600_asm.c1
-rw-r--r--src/gallium/drivers/r600/r600_asm.h1
-rw-r--r--src/gallium/drivers/r600/r600_shader.c24
3 files changed, 22 insertions, 4 deletions
diff --git a/src/gallium/drivers/r600/r600_asm.c b/src/gallium/drivers/r600/r600_asm.c
index 67df2f2acd3..e75f7d622c6 100644
--- a/src/gallium/drivers/r600/r600_asm.c
+++ b/src/gallium/drivers/r600/r600_asm.c
@@ -143,6 +143,7 @@ void r600_bytecode_init(struct r600_bytecode *bc,
LIST_INITHEAD(&bc->cf);
bc->chip_class = chip_class;
+ bc->family = family;
bc->has_compressed_msaa_texturing = has_compressed_msaa_texturing;
bc->stack.entry_size = stack_entry_size(family);
}
diff --git a/src/gallium/drivers/r600/r600_asm.h b/src/gallium/drivers/r600/r600_asm.h
index 4fb0ef06956..48ea3c4bc43 100644
--- a/src/gallium/drivers/r600/r600_asm.h
+++ b/src/gallium/drivers/r600/r600_asm.h
@@ -196,6 +196,7 @@ struct r600_stack_info {
struct r600_bytecode {
enum chip_class chip_class;
+ enum radeon_family family;
bool has_compressed_msaa_texturing;
int type;
struct list_head cf;
diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c
index 5823ba2e857..a4ed796b768 100644
--- a/src/gallium/drivers/r600/r600_shader.c
+++ b/src/gallium/drivers/r600/r600_shader.c
@@ -6280,10 +6280,26 @@ static int tgsi_loop_breakc(struct r600_shader_ctx *ctx)
return -EINVAL;
}
- r = emit_logic_pred(ctx, ALU_OP2_PRED_SETE_INT, CF_OP_ALU_BREAK);
- if (r)
- return r;
- fc_set_mid(ctx, fscp);
+ if (ctx->bc->chip_class == EVERGREEN &&
+ ctx->bc->family != CHIP_CYPRESS &&
+ ctx->bc->family != CHIP_JUNIPER) {
+ /* HW bug: ALU_BREAK does not save the active mask correctly */
+ r = tgsi_uif(ctx);
+ if (r)
+ return r;
+
+ r = r600_bytecode_add_cfinst(ctx->bc, CF_OP_LOOP_BREAK);
+ if (r)
+ return r;
+ fc_set_mid(ctx, fscp);
+
+ return tgsi_endif(ctx);
+ } else {
+ r = emit_logic_pred(ctx, ALU_OP2_PRED_SETE_INT, CF_OP_ALU_BREAK);
+ if (r)
+ return r;
+ fc_set_mid(ctx, fscp);
+ }
return 0;
}