gallium: remove deprecated TGSI opcodes

Various opcodes which can be implemented trivially with other TGSI opcodes,
such as matrix multiplication and negation.  These were not used by any
state tracker or implemented by any of the drivers.

3 files changed, 7 insertions, 34 deletions

diff --git a/src/gallium/auxiliary/tgsi/tgsi_exec.c b/src/gallium/auxiliary/tgsi/tgsi_exec.c
index b193fd7a0a5..0179bba5a21 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_exec.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_exec.c
@@ -2341,16 +2341,6 @@ exec_instruction(
       }
       break;
 
-   case TGSI_OPCODE_INDEX:
-      /* XXX: considered for removal */
-      assert (0);
-      break;
-
-   case TGSI_OPCODE_NEGATE:
-      /* XXX: considered for removal */
-      assert (0);
-      break;
-
    case TGSI_OPCODE_FRC:
       FOR_EACH_ENABLED_CHANNEL( *inst, chan_index ) {
          FETCH( &r[0], 0, chan_index );
@@ -2454,11 +2444,6 @@ exec_instruction(
       }
       break;
 
-    case TGSI_OPCODE_MULTIPLYMATRIX:
-       /* XXX: considered for removal */
-       assert (0);
-       break;
-
     case TGSI_OPCODE_ABS:
        FOR_EACH_ENABLED_CHANNEL( *inst, chan_index ) {
           FETCH(&r[0], 0, chan_index);
diff --git a/src/gallium/auxiliary/tgsi/tgsi_info.c b/src/gallium/auxiliary/tgsi/tgsi_info.c
index 29b81155609..fedda7bff90 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_info.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_info.c
@@ -53,8 +53,8 @@ static const struct tgsi_opcode_info opcode_info[TGSI_OPCODE_LAST] =
    { 1, 3, 0, 0, "CND", TGSI_OPCODE_CND },
    { 1, 3, 0, 0, "CND0", TGSI_OPCODE_CND0 },
    { 1, 3, 0, 0, "DP2A", TGSI_OPCODE_DP2A },
-   { 1, 2, 0, 0, "INDEX", TGSI_OPCODE_INDEX },
-   { 1, 1, 0, 0, "NEGATE", TGSI_OPCODE_NEGATE },
+   { 0, 0, 0, 0, "", 22 },      /* removed */
+   { 0, 0, 0, 0, "", 23 },      /* removed */
    { 1, 1, 0, 0, "FRC", TGSI_OPCODE_FRC },
    { 1, 3, 0, 0, "CLAMP", TGSI_OPCODE_CLAMP },
    { 1, 1, 0, 0, "FLR", TGSI_OPCODE_FLR },
@@ -63,7 +63,7 @@ static const struct tgsi_opcode_info opcode_info[TGSI_OPCODE_LAST] =
    { 1, 1, 0, 0, "LG2", TGSI_OPCODE_LG2 },
    { 1, 2, 0, 0, "POW", TGSI_OPCODE_POW },
    { 1, 2, 0, 0, "XPD", TGSI_OPCODE_XPD },
-   { 1, 2, 0, 0, "M4X4", TGSI_OPCODE_MULTIPLYMATRIX },
+   { 0, 0, 0, 0, "", 32 },      /* removed */
    { 1, 1, 0, 0, "ABS", TGSI_OPCODE_ABS },
    { 1, 1, 0, 0, "RCC", TGSI_OPCODE_RCC },
    { 1, 2, 0, 0, "DPH", TGSI_OPCODE_DPH },
@@ -139,10 +139,10 @@ static const struct tgsi_opcode_info opcode_info[TGSI_OPCODE_LAST] =
    { 1, 1, 0, 0, "NOISE3", TGSI_OPCODE_NOISE3 },
    { 1, 1, 0, 0, "NOISE4", TGSI_OPCODE_NOISE4 },
    { 0, 0, 0, 0, "NOP", TGSI_OPCODE_NOP },
-   { 1, 2, 0, 0, "M4X3", TGSI_OPCODE_M4X3 },
-   { 1, 2, 0, 0, "M3X4", TGSI_OPCODE_M3X4 },
-   { 1, 2, 0, 0, "M3X3", TGSI_OPCODE_M3X3 },
-   { 1, 2, 0, 0, "M3X2", TGSI_OPCODE_M3X2 },
+   { 0, 0, 0, 0, "", 108 },     /* removed */
+   { 0, 0, 0, 0, "", 109 },     /* removed */
+   { 0, 0, 0, 0, "", 110 },     /* removed */
+   { 0, 0, 0, 0, "", 111 },     /* removed */
    { 1, 1, 0, 0, "NRM4", TGSI_OPCODE_NRM4 },
    { 0, 1, 0, 0, "CALLNZ", TGSI_OPCODE_CALLNZ },
    { 0, 1, 0, 0, "IFC", TGSI_OPCODE_IFC },
diff --git a/src/gallium/auxiliary/tgsi/tgsi_sse2.c b/src/gallium/auxiliary/tgsi/tgsi_sse2.c
index a2d4627da9c..781ea1e75cf 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_sse2.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_sse2.c
@@ -2099,14 +2099,6 @@ emit_instruction(
       }
       break;
 
-   case TGSI_OPCODE_INDEX:
-      return 0;
-      break;
-
-   case TGSI_OPCODE_NEGATE:
-      return 0;
-      break;
-
    case TGSI_OPCODE_FRC:
       FOR_EACH_DST0_ENABLED_CHANNEL( *inst, chan_index ) {
          FETCH( func, *inst, 0, 0, chan_index );
@@ -2206,10 +2198,6 @@ emit_instruction(
       }
       break;
 
-   case TGSI_OPCODE_MULTIPLYMATRIX:
-      return 0;
-      break;
-
    case TGSI_OPCODE_ABS:
       FOR_EACH_DST0_ENABLED_CHANNEL( *inst, chan_index ) {
          FETCH( func, *inst, 0, 0, chan_index );