diff options
| author | Edward O'Callaghan <eocallaghan@alterapraxis.com> | 2015-11-30 15:58:18 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-12-04 04:04:00 +0000 |
| commit | 672958a04f77c915a86deab6629a48dc16d5e41c (patch) | |
| tree | b3e46c7bb8999e99dfbb8d21366295d8b5866d0c | |
| parent | c237b33e1b1eb4f1f394952fe04a61cd76aebeab (diff) | |
r600: handle barrier opcode.
This handles the barrier opcode for EG/CM.
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | src/gallium/drivers/r600/r600_shader.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c index d128718245f..00fbef64909 100644 --- a/src/gallium/drivers/r600/r600_shader.c +++ b/src/gallium/drivers/r600/r600_shader.c @@ -840,6 +840,21 @@ static int vs_add_primid_output(struct r600_shader_ctx *ctx, int prim_id_sid) return 0; } +static int tgsi_barrier(struct r600_shader_ctx *ctx) +{ + struct r600_bytecode_alu alu; + int r; + + memset(&alu, 0, sizeof(struct r600_bytecode_alu)); + alu.op = ctx->inst_info->op; + alu.last = 1; + + r = r600_bytecode_add_alu(ctx->bc, &alu); + if (r) + return r; + return 0; +} + static int tgsi_declaration(struct r600_shader_ctx *ctx) { struct tgsi_full_declaration *d = &ctx->parse.FullToken.FullDeclaration; @@ -9273,7 +9288,7 @@ static const struct r600_shader_tgsi_instruction eg_shader_tgsi_instruction[] = [TGSI_OPCODE_MFENCE] = { ALU_OP0_NOP, tgsi_unsupported}, [TGSI_OPCODE_LFENCE] = { ALU_OP0_NOP, tgsi_unsupported}, [TGSI_OPCODE_SFENCE] = { ALU_OP0_NOP, tgsi_unsupported}, - [TGSI_OPCODE_BARRIER] = { ALU_OP0_NOP, tgsi_unsupported}, + [TGSI_OPCODE_BARRIER] = { ALU_OP0_GROUP_BARRIER, tgsi_barrier}, [TGSI_OPCODE_ATOMUADD] = { ALU_OP0_NOP, tgsi_unsupported}, [TGSI_OPCODE_ATOMXCHG] = { ALU_OP0_NOP, tgsi_unsupported}, [TGSI_OPCODE_ATOMCAS] = { ALU_OP0_NOP, tgsi_unsupported}, @@ -9495,7 +9510,7 @@ static const struct r600_shader_tgsi_instruction cm_shader_tgsi_instruction[] = [TGSI_OPCODE_MFENCE] = { ALU_OP0_NOP, tgsi_unsupported}, [TGSI_OPCODE_LFENCE] = { ALU_OP0_NOP, tgsi_unsupported}, [TGSI_OPCODE_SFENCE] = { ALU_OP0_NOP, tgsi_unsupported}, - [TGSI_OPCODE_BARRIER] = { ALU_OP0_NOP, tgsi_unsupported}, + [TGSI_OPCODE_BARRIER] = { ALU_OP0_GROUP_BARRIER, tgsi_barrier}, [TGSI_OPCODE_ATOMUADD] = { ALU_OP0_NOP, tgsi_unsupported}, [TGSI_OPCODE_ATOMXCHG] = { ALU_OP0_NOP, tgsi_unsupported}, [TGSI_OPCODE_ATOMCAS] = { ALU_OP0_NOP, tgsi_unsupported}, |