diff options
| author | Marek Olšák <[email protected]> | 2017-08-19 21:09:52 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2017-08-22 13:29:47 +0200 |
| commit | 068c3ad2cbef748783837ebbaa6cdca325d0475e (patch) | |
| tree | 202fb6f08553e26fe4cee0bf7a61927673c897a5 /src/gallium/drivers | |
| parent | 44716655e6e62ebb09941a763e774148e151574f (diff) | |
gallium: remove TGSI FENCE opcodes
use MEMBAR instead
Reviewed-by: Roland Scheidegger <[email protected]>
Diffstat (limited to 'src/gallium/drivers')
| -rw-r--r-- | src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp | 10 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_shader.c | 18 |
2 files changed, 9 insertions, 19 deletions
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp index 0b1f5503348..23c7d106e39 100644 --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp @@ -994,9 +994,6 @@ static nv50_ir::operation translateOpcode(uint opcode) static uint16_t opcodeToSubOp(uint opcode) { switch (opcode) { - case TGSI_OPCODE_LFENCE: return NV50_IR_SUBOP_MEMBAR(L, GL); - case TGSI_OPCODE_SFENCE: return NV50_IR_SUBOP_MEMBAR(S, GL); - case TGSI_OPCODE_MFENCE: return NV50_IR_SUBOP_MEMBAR(M, GL); case TGSI_OPCODE_ATOMUADD: return NV50_IR_SUBOP_ATOM_ADD; case TGSI_OPCODE_ATOMXCHG: return NV50_IR_SUBOP_ATOM_EXCH; case TGSI_OPCODE_ATOMCAS: return NV50_IR_SUBOP_ATOM_CAS; @@ -3783,13 +3780,6 @@ Converter::handleInstruction(const struct tgsi_full_instruction *insn) geni->fixed = 1; geni->subOp = NV50_IR_SUBOP_BAR_SYNC; break; - case TGSI_OPCODE_MFENCE: - case TGSI_OPCODE_LFENCE: - case TGSI_OPCODE_SFENCE: - geni = mkOp(OP_MEMBAR, TYPE_NONE, NULL); - geni->fixed = 1; - geni->subOp = tgsi::opcodeToSubOp(tgsi.getOpcode()); - break; case TGSI_OPCODE_MEMBAR: { uint32_t level = tgsi.getSrc(0).getValueU32(0, info); diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c index 74f5add1191..d4eece3e724 100644 --- a/src/gallium/drivers/r600/r600_shader.c +++ b/src/gallium/drivers/r600/r600_shader.c @@ -9231,9 +9231,9 @@ static const struct r600_shader_tgsi_instruction r600_shader_tgsi_instruction[] [TGSI_OPCODE_ISSG] = { 0, tgsi_issg}, [TGSI_OPCODE_LOAD] = { ALU_OP0_NOP, tgsi_unsupported}, [TGSI_OPCODE_STORE] = { ALU_OP0_NOP, tgsi_unsupported}, - [TGSI_OPCODE_MFENCE] = { ALU_OP0_NOP, tgsi_unsupported}, - [TGSI_OPCODE_LFENCE] = { ALU_OP0_NOP, tgsi_unsupported}, - [TGSI_OPCODE_SFENCE] = { ALU_OP0_NOP, tgsi_unsupported}, + [163] = { ALU_OP0_NOP, tgsi_unsupported}, + [164] = { ALU_OP0_NOP, tgsi_unsupported}, + [165] = { ALU_OP0_NOP, tgsi_unsupported}, [TGSI_OPCODE_BARRIER] = { ALU_OP0_NOP, tgsi_unsupported}, [TGSI_OPCODE_ATOMUADD] = { ALU_OP0_NOP, tgsi_unsupported}, [TGSI_OPCODE_ATOMXCHG] = { ALU_OP0_NOP, tgsi_unsupported}, @@ -9429,9 +9429,9 @@ static const struct r600_shader_tgsi_instruction eg_shader_tgsi_instruction[] = [TGSI_OPCODE_ISSG] = { 0, tgsi_issg}, [TGSI_OPCODE_LOAD] = { ALU_OP0_NOP, tgsi_unsupported}, [TGSI_OPCODE_STORE] = { ALU_OP0_NOP, tgsi_unsupported}, - [TGSI_OPCODE_MFENCE] = { ALU_OP0_NOP, tgsi_unsupported}, - [TGSI_OPCODE_LFENCE] = { ALU_OP0_NOP, tgsi_unsupported}, - [TGSI_OPCODE_SFENCE] = { ALU_OP0_NOP, tgsi_unsupported}, + [163] = { ALU_OP0_NOP, tgsi_unsupported}, + [164] = { ALU_OP0_NOP, tgsi_unsupported}, + [165] = { 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}, @@ -9652,9 +9652,9 @@ static const struct r600_shader_tgsi_instruction cm_shader_tgsi_instruction[] = [TGSI_OPCODE_ISSG] = { 0, tgsi_issg}, [TGSI_OPCODE_LOAD] = { ALU_OP0_NOP, tgsi_unsupported}, [TGSI_OPCODE_STORE] = { ALU_OP0_NOP, tgsi_unsupported}, - [TGSI_OPCODE_MFENCE] = { ALU_OP0_NOP, tgsi_unsupported}, - [TGSI_OPCODE_LFENCE] = { ALU_OP0_NOP, tgsi_unsupported}, - [TGSI_OPCODE_SFENCE] = { ALU_OP0_NOP, tgsi_unsupported}, + [163] = { ALU_OP0_NOP, tgsi_unsupported}, + [164] = { ALU_OP0_NOP, tgsi_unsupported}, + [165] = { 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}, |