tgsi: Fix instruction operand counts.

diff --git a/src/gallium/auxiliary/tgsi/util/tgsi_text.c b/src/gallium/auxiliary/tgsi/util/tgsi_text.c
index 7848f3d55f2a62856cb3ccadd3ebce95879671ee..3c7a4688c998580629e3cae85f7e896d96e8b159 100644 (file)
--- a/src/gallium/auxiliary/tgsi/util/tgsi_text.c
+++ b/src/gallium/auxiliary/tgsi/util/tgsi_text.c
@@ -405,9 +405,9 @@ struct opcode_info
 
 static const struct opcode_info opcode_info[TGSI_OPCODE_LAST] =
 {
-{ 1, 1, "ARL" },
+   { 1, 1, "ARL" },
    { 1, 1, "MOV" },
-{ 1, 1, "LIT" },
+   { 1, 1, "LIT" },
    { 1, 1, "RCP" },
    { 1, 1, "RSQ" },
    { 1, 1, "EXP" },
@@ -416,112 +416,112 @@ static const struct opcode_info opcode_info[TGSI_OPCODE_LAST] =
    { 1, 2, "ADD" },
    { 1, 2, "DP3" },
    { 1, 2, "DP4" },
-{ 1, 2, "DST" },
+   { 1, 2, "DST" },
    { 1, 2, "MIN" },
    { 1, 2, "MAX" },
-{ 1, 2, "SLT" },
-{ 1, 2, "SGE" },
+   { 1, 2, "SLT" },
+   { 1, 2, "SGE" },
    { 1, 3, "MAD" },
    { 1, 2, "SUB" },
-{ 1, 3, "LERP" },
-{ 1, 2, "CND" },
-{ 1, 2, "CND0" },
-{ 1, 2, "DOT2ADD" },
-{ 1, 2, "INDEX" },
-{ 1, 2, "NEGATE" },
-{ 1, 2, "FRAC" },
-{ 1, 2, "CLAMP" },
-{ 1, 2, "FLOOR" },
-{ 1, 2, "ROUND" },
-{ 1, 2, "EXPBASE2" },
-{ 1, 2, "LOGBASE2" },
-{ 1, 2, "POWER" },
-{ 1, 2, "CROSSPRODUCT" },
-{ 1, 2, "MULTIPLYMATRIX" },
-   { 1, 2, "ABS" },
-{ 1, 2, "RCC" },
-{ 1, 2, "DPH" },
-{ 1, 2, "COS" },
-{ 1, 2, "DDX" },
-{ 1, 2, "DDY" },
-{ 1, 2, "KILP" },
-{ 1, 2, "PK2H" },
-{ 1, 2, "PK2US" },
-{ 1, 2, "PK4B" },
-{ 1, 2, "PK4UB" },
-{ 1, 2, "RFL" },
-{ 1, 2, "SEQ" },
-{ 1, 2, "SFL" },
-{ 1, 2, "SGT" },
-{ 1, 2, "SIN" },
-{ 1, 2, "SLE" },
-{ 1, 2, "SNE" },
-{ 1, 2, "STR" },
-{ 1, 2, "TEX" },
-{ 1, 2, "TXD" },
-{ 1, 2, "TXP" },
-{ 1, 2, "UP2H" },
-{ 1, 2, "UP2US" },
-{ 1, 2, "UP4B" },
-{ 1, 2, "UP4UB" },
-{ 1, 2, "X2D" },
-{ 1, 2, "ARA" },
-{ 1, 2, "ARR" },
-{ 1, 2, "BRA" },
-{ 1, 2, "CAL" },
-{ 1, 2, "RET" },
-{ 1, 2, "SSG" },
-{ 1, 2, "CMP" },
-{ 1, 2, "SCS" },
-{ 1, 2, "TXB" },
-{ 1, 2, "NRM" },
-{ 1, 2, "DIV" },
-{ 1, 2, "DP2" },
-{ 1, 2, "TXL" },
-{ 1, 2, "BRK" },
-{ 1, 2, "IF" },
-{ 1, 2, "LOOP" },
-{ 1, 2, "REP" },
-{ 1, 2, "ELSE" },
-{ 1, 2, "ENDIF" },
-{ 1, 2, "ENDLOOP" },
-{ 1, 2, "ENDREP" },
-{ 1, 2, "PUSHA" },
-{ 1, 2, "POPA" },
-{ 1, 2, "CEIL" },
-{ 1, 2, "I2F" },
-{ 1, 2, "NOT" },
-{ 1, 2, "TRUNC" },
-{ 1, 2, "SHL" },
-{ 1, 2, "SHR" },
-{ 1, 2, "AND" },
-{ 1, 2, "OR" },
-{ 1, 2, "MOD" },
-{ 1, 2, "XOR" },
-{ 1, 2, "SAD" },
-{ 1, 2, "TXF" },
-{ 1, 2, "TXQ" },
-{ 1, 2, "CONT" },
-{ 1, 2, "EMIT" },
-{ 1, 2, "ENDPRIM" },
-{ 1, 2, "BGNLOOP2" },
-{ 1, 2, "BGNSUB" },
-{ 1, 2, "ENDLOOP2" },
-{ 1, 2, "ENDSUB" },
-{ 1, 2, "NOISE1" },
-{ 1, 2, "NOISE2" },
-{ 1, 2, "NOISE3" },
-{ 1, 2, "NOISE4" },
-{ 1, 2, "NOP" },
-{ 1, 2, "M4X3" },
-{ 1, 2, "M3X4" },
-{ 1, 2, "M3X3" },
-{ 1, 2, "M3X2" },
-{ 1, 2, "NRM4" },
-{ 1, 2, "CALLNZ" },
-{ 1, 2, "IFC" },
-{ 1, 2, "BREAKC" },
-{ 1, 2, "KIL" },
+   { 1, 3, "LERP" },
+   { 1, 3, "CND" },
+   { 1, 3, "CND0" },
+   { 1, 3, "DOT2ADD" },
+   { 1, 2, "INDEX" },
+   { 1, 1, "NEGATE" },
+   { 1, 1, "FRAC" },
+   { 1, 3, "CLAMP" },
+   { 1, 1, "FLOOR" },
+   { 1, 1, "ROUND" },
+   { 1, 1, "EXPBASE2" },
+   { 1, 1, "LOGBASE2" },
+   { 1, 2, "POWER" },
+   { 1, 2, "CROSSPRODUCT" },
+   { 1, 2, "MULTIPLYMATRIX" },
+   { 1, 1, "ABS" },
+   { 1, 1, "RCC" },
+   { 1, 2, "DPH" },
+   { 1, 1, "COS" },
+   { 1, 1, "DDX" },
+   { 1, 1, "DDY" },
+   { 0, 1, "KILP" },
+   { 1, 1, "PK2H" },
+   { 1, 1, "PK2US" },
+   { 1, 1, "PK4B" },
+   { 1, 1, "PK4UB" },
+   { 1, 2, "RFL" },
+   { 1, 2, "SEQ" },
+   { 1, 2, "SFL" },
+   { 1, 2, "SGT" },
+   { 1, 1, "SIN" },
+   { 1, 2, "SLE" },
+   { 1, 2, "SNE" },
+   { 1, 2, "STR" },
+   { 1, 1, "TEX" },
+   { 1, 3, "TXD" },
+   { 1, 1, "TXP" },
+   { 1, 1, "UP2H" },
+   { 1, 1, "UP2US" },
+   { 1, 1, "UP4B" },
+   { 1, 1, "UP4UB" },
+   { 1, 3, "X2D" },
+   { 1, 1, "ARA" },
+   { 1, 1, "ARR" },
+   { 0, 1, "BRA" },
+   { 0, 0, "CAL" },
+   { 0, 0, "RET" },
+   { 1, 1, "SSG" },
+   { 1, 3, "CMP" },
+   { 1, 1, "SCS" },
+   { 1, 1, "TXB" },
+   { 1, 1, "NRM" },
+   { 1, 2, "DIV" },
+   { 1, 2, "DP2" },
+   { 1, 1, "TXL" },
+   { 0, 0, "BRK" },
+   { 0, 1, "IF" },
+   { 0, 0, "LOOP" },
+   { 0, 1, "REP" },
+   { 0, 0, "ELSE" },
+   { 0, 0, "ENDIF" },
+   { 0, 0, "ENDLOOP" },
+   { 0, 0, "ENDREP" },
+   { 0, 1, "PUSHA" },
+   { 1, 0, "POPA" },
+   { 1, 1, "CEIL" },
+   { 1, 1, "I2F" },
+   { 1, 1, "NOT" },
+   { 1, 1, "TRUNC" },
+   { 1, 2, "SHL" },
+   { 1, 2, "SHR" },
+   { 1, 2, "AND" },
+   { 1, 2, "OR" },
+   { 1, 2, "MOD" },
+   { 1, 2, "XOR" },
+   { 1, 3, "SAD" },
+   { 1, 1, "TXF" },
+   { 1, 1, "TXQ" },
+   { 0, 0, "CONT" },
+   { 0, 0, "EMIT" },
+   { 0, 0, "ENDPRIM" },
+   { 0, 0, "BGNLOOP2" },
+   { 0, 0, "BGNSUB" },
+   { 0, 0, "ENDLOOP2" },
+   { 0, 0, "ENDSUB" },
+   { 1, 1, "NOISE1" },
+   { 1, 1, "NOISE2" },
+   { 1, 1, "NOISE3" },
+   { 1, 1, "NOISE4" },
+   { 0, 0, "NOP" },
+   { 1, 2, "M4X3" },
+   { 1, 2, "M3X4" },
+   { 1, 2, "M3X3" },
+   { 1, 2, "M3X2" },
+   { 1, 1, "NRM4" },
+   { 0, 1, "CALLNZ" },
+   { 0, 1, "IFC" },
+   { 0, 1, "BREAKC" },
+   { 0, 0, "KIL" },
    { 0, 0, "END" },
    { 1, 1, "SWZ" }
 };