diff options
| author | Eric Anholt <eric@anholt.net> | 2014-11-13 10:08:02 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2014-11-24 14:56:22 -0800 |
| commit | ff886c49555c2033dd5fda50459cafaf16540f86 (patch) | |
| tree | 6dc292408b000c13aca032678fc28fcb8989d119 /src/gallium/auxiliary | |
| parent | de2f8d75db3dad3089c96b65223e47ad3986a25c (diff) | |
| download | external_mesa3d-ff886c49555c2033dd5fda50459cafaf16540f86.zip external_mesa3d-ff886c49555c2033dd5fda50459cafaf16540f86.tar.gz external_mesa3d-ff886c49555c2033dd5fda50459cafaf16540f86.tar.bz2 | |
gallium: Drop the unused ARA opcode.
Nothing in the tree generated it.
v2: Only drop ARA, not ARR as well.
Reviewed-by: Jose Fonseca <jfonseca@vmware.com> (v2)
Diffstat (limited to 'src/gallium/auxiliary')
| -rw-r--r-- | src/gallium/auxiliary/gallivm/lp_bld_tgsi.c | 1 | ||||
| -rw-r--r-- | src/gallium/auxiliary/gallivm/lp_bld_tgsi_aos.c | 6 | ||||
| -rw-r--r-- | src/gallium/auxiliary/tgsi/tgsi_exec.c | 4 | ||||
| -rw-r--r-- | src/gallium/auxiliary/tgsi/tgsi_info.c | 2 | ||||
| -rw-r--r-- | src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h | 1 |
5 files changed, 1 insertions, 13 deletions
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi.c b/src/gallium/auxiliary/gallivm/lp_bld_tgsi.c index 4a9ce37..44a44a6 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi.c @@ -212,7 +212,6 @@ lp_build_tgsi_inst_llvm( case TGSI_OPCODE_UP4B: case TGSI_OPCODE_UP4UB: case TGSI_OPCODE_X2D: - case TGSI_OPCODE_ARA: case TGSI_OPCODE_BRA: case TGSI_OPCODE_PUSHA: case TGSI_OPCODE_POPA: diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_aos.c b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_aos.c index 3b9833a..ed1798d 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_aos.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_aos.c @@ -798,12 +798,6 @@ lp_emit_instruction_aos( return FALSE; break; - case TGSI_OPCODE_ARA: - /* deprecated */ - assert(0); - return FALSE; - break; - case TGSI_OPCODE_ARR: src0 = lp_build_emit_fetch(&bld->bld_base, inst, 0, LP_CHAN_ALL); dst0 = lp_build_round(&bld->bld_base.base, src0); diff --git a/src/gallium/auxiliary/tgsi/tgsi_exec.c b/src/gallium/auxiliary/tgsi/tgsi_exec.c index b3ea82f..578d4d8 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_exec.c +++ b/src/gallium/auxiliary/tgsi/tgsi_exec.c @@ -3912,10 +3912,6 @@ exec_instruction( exec_x2d(mach, inst); break; - case TGSI_OPCODE_ARA: - assert (0); - break; - case TGSI_OPCODE_ARR: exec_vector_unary(mach, inst, micro_arr, TGSI_EXEC_DATA_INT, TGSI_EXEC_DATA_FLOAT); break; diff --git a/src/gallium/auxiliary/tgsi/tgsi_info.c b/src/gallium/auxiliary/tgsi/tgsi_info.c index d17426f..b94f5ac 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_info.c +++ b/src/gallium/auxiliary/tgsi/tgsi_info.c @@ -97,7 +97,7 @@ static const struct tgsi_opcode_info opcode_info[TGSI_OPCODE_LAST] = { 1, 1, 0, 0, 0, 0, COMP, "UP4B", TGSI_OPCODE_UP4B }, { 1, 1, 0, 0, 0, 0, COMP, "UP4UB", TGSI_OPCODE_UP4UB }, { 1, 3, 0, 0, 0, 0, COMP, "X2D", TGSI_OPCODE_X2D }, - { 1, 1, 0, 0, 0, 0, COMP, "ARA", TGSI_OPCODE_ARA }, + { 0, 1, 0, 0, 0, 1, NONE, "", 60 }, /* removed */ { 1, 1, 0, 0, 0, 0, COMP, "ARR", TGSI_OPCODE_ARR }, { 0, 1, 0, 0, 0, 0, NONE, "BRA", TGSI_OPCODE_BRA }, { 0, 0, 0, 1, 0, 0, NONE, "CAL", TGSI_OPCODE_CAL }, diff --git a/src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h b/src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h index 33cf38b..2ac9031 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h +++ b/src/gallium/auxiliary/tgsi/tgsi_opcode_tmp.h @@ -112,7 +112,6 @@ OP11(UP2US) OP11(UP4B) OP11(UP4UB) OP13(X2D) -OP11(ARA) OP11(ARR) OP01(BRA) OP00_LBL(CAL) |