diff options
Diffstat (limited to 'src/gallium/drivers')
| -rw-r--r-- | src/gallium/drivers/ilo/shader/toy_tgsi.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/nouveau/nv30/nvfx_fragprog.c | 7 | ||||
| -rw-r--r-- | src/gallium/drivers/nouveau/nv30/nvfx_vertprog.c | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/r300/r300_tgsi_to_rc.c | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_shader.c | 6 |
5 files changed, 3 insertions, 14 deletions
diff --git a/src/gallium/drivers/ilo/shader/toy_tgsi.c b/src/gallium/drivers/ilo/shader/toy_tgsi.c index 5989fc4640a..5938de48598 100644 --- a/src/gallium/drivers/ilo/shader/toy_tgsi.c +++ b/src/gallium/drivers/ilo/shader/toy_tgsi.c @@ -829,7 +829,6 @@ static const toy_tgsi_translate aos_translate_table[TGSI_OPCODE_LAST] = { [TGSI_OPCODE_UP4B] = aos_unsupported, [TGSI_OPCODE_UP4UB] = aos_unsupported, [TGSI_OPCODE_ARR] = aos_simple, - [TGSI_OPCODE_BRA] = aos_unsupported, [TGSI_OPCODE_CAL] = aos_unsupported, [TGSI_OPCODE_RET] = aos_unsupported, [TGSI_OPCODE_SSG] = aos_set_sign, @@ -1374,7 +1373,6 @@ static const toy_tgsi_translate soa_translate_table[TGSI_OPCODE_LAST] = { [TGSI_OPCODE_UP4B] = soa_unsupported, [TGSI_OPCODE_UP4UB] = soa_unsupported, [TGSI_OPCODE_ARR] = soa_per_channel, - [TGSI_OPCODE_BRA] = soa_unsupported, [TGSI_OPCODE_CAL] = soa_unsupported, [TGSI_OPCODE_RET] = soa_unsupported, [TGSI_OPCODE_SSG] = soa_per_channel, diff --git a/src/gallium/drivers/nouveau/nv30/nvfx_fragprog.c b/src/gallium/drivers/nouveau/nv30/nvfx_fragprog.c index 0fdaa2b54d1..66009971412 100644 --- a/src/gallium/drivers/nouveau/nv30/nvfx_fragprog.c +++ b/src/gallium/drivers/nouveau/nv30/nvfx_fragprog.c @@ -821,13 +821,6 @@ nvfx_fragprog_parse_instruction(struct nvfx_fpc *fpc, break; } - case TGSI_OPCODE_BRA: - /* This can in limited cases be implemented with an IF with the else and endif labels pointing to the target */ - /* no state tracker uses this, so don't implement this for now */ - assert(0); - nv40_fp_bra(fpc, finst->Label.Label); - break; - case TGSI_OPCODE_BGNSUB: case TGSI_OPCODE_ENDSUB: /* nothing to do here */ diff --git a/src/gallium/drivers/nouveau/nv30/nvfx_vertprog.c b/src/gallium/drivers/nouveau/nv30/nvfx_vertprog.c index e880810c8ab..51e1fb646e0 100644 --- a/src/gallium/drivers/nouveau/nv30/nvfx_vertprog.c +++ b/src/gallium/drivers/nouveau/nv30/nvfx_vertprog.c @@ -712,7 +712,6 @@ nvfx_vertprog_parse_instruction(struct nvfx_vpc *vpc, nvfx_vp_emit(vpc, insn); break; case TGSI_OPCODE_ELSE: - case TGSI_OPCODE_BRA: case TGSI_OPCODE_CAL: reloc.location = vpc->vp->nr_insns; reloc.target = finst->Label.Label; diff --git a/src/gallium/drivers/r300/r300_tgsi_to_rc.c b/src/gallium/drivers/r300/r300_tgsi_to_rc.c index d9067faea6f..a7a741e6abf 100644 --- a/src/gallium/drivers/r300/r300_tgsi_to_rc.c +++ b/src/gallium/drivers/r300/r300_tgsi_to_rc.c @@ -84,7 +84,6 @@ static unsigned translate_opcode(unsigned opcode) /* case TGSI_OPCODE_UP4B: return RC_OPCODE_UP4B; */ /* case TGSI_OPCODE_UP4UB: return RC_OPCODE_UP4UB; */ /* case TGSI_OPCODE_ARR: return RC_OPCODE_ARR; */ - /* case TGSI_OPCODE_BRA: return RC_OPCODE_BRA; */ /* case TGSI_OPCODE_CAL: return RC_OPCODE_CAL; */ /* case TGSI_OPCODE_RET: return RC_OPCODE_RET; */ case TGSI_OPCODE_SSG: return RC_OPCODE_SSG; diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c index 24fed848e94..2e74d5963d4 100644 --- a/src/gallium/drivers/r600/r600_shader.c +++ b/src/gallium/drivers/r600/r600_shader.c @@ -7250,7 +7250,7 @@ static struct r600_shader_tgsi_instruction r600_shader_tgsi_instruction[] = { {59, 0, ALU_OP0_NOP, tgsi_unsupported}, {60, 0, ALU_OP0_NOP, tgsi_unsupported}, {TGSI_OPCODE_ARR, 0, ALU_OP0_NOP, tgsi_r600_arl}, - {TGSI_OPCODE_BRA, 0, ALU_OP0_NOP, tgsi_unsupported}, + {62, 0, ALU_OP0_NOP, tgsi_unsupported}, {TGSI_OPCODE_CAL, 0, ALU_OP0_NOP, tgsi_unsupported}, {TGSI_OPCODE_RET, 0, ALU_OP0_NOP, tgsi_unsupported}, {TGSI_OPCODE_SSG, 0, ALU_OP0_NOP, tgsi_ssg}, @@ -7449,7 +7449,7 @@ static struct r600_shader_tgsi_instruction eg_shader_tgsi_instruction[] = { {59, 0, ALU_OP0_NOP, tgsi_unsupported}, {60, 0, ALU_OP0_NOP, tgsi_unsupported}, {TGSI_OPCODE_ARR, 0, ALU_OP0_NOP, tgsi_eg_arl}, - {TGSI_OPCODE_BRA, 0, ALU_OP0_NOP, tgsi_unsupported}, + {62, 0, ALU_OP0_NOP, tgsi_unsupported}, {TGSI_OPCODE_CAL, 0, ALU_OP0_NOP, tgsi_unsupported}, {TGSI_OPCODE_RET, 0, ALU_OP0_NOP, tgsi_unsupported}, {TGSI_OPCODE_SSG, 0, ALU_OP0_NOP, tgsi_ssg}, @@ -7648,7 +7648,7 @@ static struct r600_shader_tgsi_instruction cm_shader_tgsi_instruction[] = { {59, 0, ALU_OP0_NOP, tgsi_unsupported}, {60, 0, ALU_OP0_NOP, tgsi_unsupported}, {TGSI_OPCODE_ARR, 0, ALU_OP0_NOP, tgsi_eg_arl}, - {TGSI_OPCODE_BRA, 0, ALU_OP0_NOP, tgsi_unsupported}, + {62, 0, ALU_OP0_NOP, tgsi_unsupported}, {TGSI_OPCODE_CAL, 0, ALU_OP0_NOP, tgsi_unsupported}, {TGSI_OPCODE_RET, 0, ALU_OP0_NOP, tgsi_unsupported}, {TGSI_OPCODE_SSG, 0, ALU_OP0_NOP, tgsi_ssg}, |