----- Original Message -----
> The 'is_branch' TGSI opcode info flag was being interpreted
> incorrectly by tgsi_text.c as if it implied that the opcode requires
> a
> label token -- that's not the case on e.g. IF, BGNLOOP or ENDLOOP.
IF, BGNLOOP or ENDLOOP used to have a label. And some old shaders still use it,
e.g., src/gallium/tests/graw/fs-write-z.c:
" 0: MOV OUT[0], IN[0]\n" /* front-facing: red */
" 1: IF IN[0].xxxx :3\n"
" 2: MOV OUT[1].z, IMM[2].yyyy\n" /* red: Z = 0.4 */
" 3: ELSE :5\n"
" 4: MOV OUT[1].z, IMM[2].xxxx\n" /* blue: Z = 0.5 */
" 5: ENDIF\n"
" 6: END\n";
But now, the only opcode that requires label arguments are CAL/CALLNZ I believe.
> Add a new opcode info field that marks an opcode as requiring a TGSI
> label token, and replace the incorrect usage of 'is_branch' with it.
Actually, instead of adding this new has_label, please simply modify tgsi_text
to consume a label when the next token ':', or ignore otherwise. That is, make
labels optional everywhere.
And please make sure that the tests in src/gallium/tests/graw still work
Also, could you please describe what exactly the semantics of is_branch you
think are correct?
Jose
> ---
> src/gallium/auxiliary/tgsi/tgsi_info.c | 352
> ++++++++++++++++----------------
> src/gallium/auxiliary/tgsi/tgsi_info.h | 1 +
> src/gallium/auxiliary/tgsi/tgsi_text.c | 2 +-
> 3 files changed, 178 insertions(+), 177 deletions(-)
>
> diff --git a/src/gallium/auxiliary/tgsi/tgsi_info.c
> b/src/gallium/auxiliary/tgsi/tgsi_info.c
> index 5c5abe6..ec48206 100644
> --- a/src/gallium/auxiliary/tgsi/tgsi_info.c
> +++ b/src/gallium/auxiliary/tgsi/tgsi_info.c
> @@ -37,184 +37,184 @@
>
> static const struct tgsi_opcode_info opcode_info[TGSI_OPCODE_LAST] =
> {
> - { 1, 1, 0, 0, 0, 0, COMP, "ARL", TGSI_OPCODE_ARL },
> - { 1, 1, 0, 0, 0, 0, COMP, "MOV", TGSI_OPCODE_MOV },
> - { 1, 1, 0, 0, 0, 0, CHAN, "LIT", TGSI_OPCODE_LIT },
> - { 1, 1, 0, 0, 0, 0, REPL, "RCP", TGSI_OPCODE_RCP },
> - { 1, 1, 0, 0, 0, 0, REPL, "RSQ", TGSI_OPCODE_RSQ },
> - { 1, 1, 0, 0, 0, 0, CHAN, "EXP", TGSI_OPCODE_EXP },
> - { 1, 1, 0, 0, 0, 0, CHAN, "LOG", TGSI_OPCODE_LOG },
> - { 1, 2, 0, 0, 0, 0, COMP, "MUL", TGSI_OPCODE_MUL },
> - { 1, 2, 0, 0, 0, 0, COMP, "ADD", TGSI_OPCODE_ADD },
> - { 1, 2, 0, 0, 0, 0, REPL, "DP3", TGSI_OPCODE_DP3 },
> - { 1, 2, 0, 0, 0, 0, REPL, "DP4", TGSI_OPCODE_DP4 },
> - { 1, 2, 0, 0, 0, 0, CHAN, "DST", TGSI_OPCODE_DST },
> - { 1, 2, 0, 0, 0, 0, COMP, "MIN", TGSI_OPCODE_MIN },
> - { 1, 2, 0, 0, 0, 0, COMP, "MAX", TGSI_OPCODE_MAX },
> - { 1, 2, 0, 0, 0, 0, COMP, "SLT", TGSI_OPCODE_SLT },
> - { 1, 2, 0, 0, 0, 0, COMP, "SGE", TGSI_OPCODE_SGE },
> - { 1, 3, 0, 0, 0, 0, COMP, "MAD", TGSI_OPCODE_MAD },
> - { 1, 2, 0, 0, 0, 0, COMP, "SUB", TGSI_OPCODE_SUB },
> - { 1, 3, 0, 0, 0, 0, COMP, "LRP", TGSI_OPCODE_LRP },
> - { 1, 3, 0, 0, 0, 0, COMP, "CND", TGSI_OPCODE_CND },
> - { 0, 0, 0, 0, 0, 0, NONE, "", 20 }, /* removed */
> - { 1, 3, 0, 0, 0, 0, REPL, "DP2A", TGSI_OPCODE_DP2A },
> - { 0, 0, 0, 0, 0, 0, NONE, "", 22 }, /* removed */
> - { 0, 0, 0, 0, 0, 0, NONE, "", 23 }, /* removed */
> - { 1, 1, 0, 0, 0, 0, COMP, "FRC", TGSI_OPCODE_FRC },
> - { 1, 3, 0, 0, 0, 0, COMP, "CLAMP", TGSI_OPCODE_CLAMP },
> - { 1, 1, 0, 0, 0, 0, COMP, "FLR", TGSI_OPCODE_FLR },
> - { 1, 1, 0, 0, 0, 0, COMP, "ROUND", TGSI_OPCODE_ROUND },
> - { 1, 1, 0, 0, 0, 0, REPL, "EX2", TGSI_OPCODE_EX2 },
> - { 1, 1, 0, 0, 0, 0, REPL, "LG2", TGSI_OPCODE_LG2 },
> - { 1, 2, 0, 0, 0, 0, REPL, "POW", TGSI_OPCODE_POW },
> - { 1, 2, 0, 0, 0, 0, COMP, "XPD", TGSI_OPCODE_XPD },
> - { 0, 0, 0, 0, 0, 0, NONE, "", 32 }, /* removed */
> - { 1, 1, 0, 0, 0, 0, COMP, "ABS", TGSI_OPCODE_ABS },
> - { 1, 1, 0, 0, 0, 0, REPL, "RCC", TGSI_OPCODE_RCC },
> - { 1, 2, 0, 0, 0, 0, REPL, "DPH", TGSI_OPCODE_DPH },
> - { 1, 1, 0, 0, 0, 0, REPL, "COS", TGSI_OPCODE_COS },
> - { 1, 1, 0, 0, 0, 0, COMP, "DDX", TGSI_OPCODE_DDX },
> - { 1, 1, 0, 0, 0, 0, COMP, "DDY", TGSI_OPCODE_DDY },
> - { 0, 0, 0, 0, 0, 0, NONE, "KILP", TGSI_OPCODE_KILP },
> - { 1, 1, 0, 0, 0, 0, COMP, "PK2H", TGSI_OPCODE_PK2H },
> - { 1, 1, 0, 0, 0, 0, COMP, "PK2US", TGSI_OPCODE_PK2US },
> - { 1, 1, 0, 0, 0, 0, COMP, "PK4B", TGSI_OPCODE_PK4B },
> - { 1, 1, 0, 0, 0, 0, COMP, "PK4UB", TGSI_OPCODE_PK4UB },
> - { 1, 2, 0, 0, 0, 0, COMP, "RFL", TGSI_OPCODE_RFL },
> - { 1, 2, 0, 0, 0, 0, COMP, "SEQ", TGSI_OPCODE_SEQ },
> - { 1, 2, 0, 0, 0, 0, REPL, "SFL", TGSI_OPCODE_SFL },
> - { 1, 2, 0, 0, 0, 0, COMP, "SGT", TGSI_OPCODE_SGT },
> - { 1, 1, 0, 0, 0, 0, REPL, "SIN", TGSI_OPCODE_SIN },
> - { 1, 2, 0, 0, 0, 0, COMP, "SLE", TGSI_OPCODE_SLE },
> - { 1, 2, 0, 0, 0, 0, COMP, "SNE", TGSI_OPCODE_SNE },
> - { 1, 2, 0, 0, 0, 0, REPL, "STR", TGSI_OPCODE_STR },
> - { 1, 2, 1, 0, 0, 0, OTHR, "TEX", TGSI_OPCODE_TEX },
> - { 1, 4, 1, 0, 0, 0, OTHR, "TXD", TGSI_OPCODE_TXD },
> - { 1, 2, 1, 0, 0, 0, OTHR, "TXP", TGSI_OPCODE_TXP },
> - { 1, 1, 0, 0, 0, 0, COMP, "UP2H", TGSI_OPCODE_UP2H },
> - { 1, 1, 0, 0, 0, 0, COMP, "UP2US", TGSI_OPCODE_UP2US },
> - { 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 },
> - { 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 },
> - { 0, 0, 0, 0, 0, 0, NONE, "RET", TGSI_OPCODE_RET },
> - { 1, 1, 0, 0, 0, 0, COMP, "SSG", TGSI_OPCODE_SSG },
> - { 1, 3, 0, 0, 0, 0, COMP, "CMP", TGSI_OPCODE_CMP },
> - { 1, 1, 0, 0, 0, 0, CHAN, "SCS", TGSI_OPCODE_SCS },
> - { 1, 2, 1, 0, 0, 0, OTHR, "TXB", TGSI_OPCODE_TXB },
> - { 1, 1, 0, 0, 0, 0, COMP, "NRM", TGSI_OPCODE_NRM },
> - { 1, 2, 0, 0, 0, 0, COMP, "DIV", TGSI_OPCODE_DIV },
> - { 1, 2, 0, 0, 0, 0, REPL, "DP2", TGSI_OPCODE_DP2 },
> - { 1, 2, 1, 0, 0, 0, OTHR, "TXL", TGSI_OPCODE_TXL },
> - { 0, 0, 0, 0, 0, 0, NONE, "BRK", TGSI_OPCODE_BRK },
> - { 0, 1, 0, 1, 0, 1, NONE, "IF", TGSI_OPCODE_IF },
> - { 1, 1, 0, 0, 0, 1, NONE, "", 75 }, /* removed */
> - { 0, 1, 0, 0, 0, 1, NONE, "", 76 }, /* removed */
> - { 0, 0, 0, 1, 1, 1, NONE, "ELSE", TGSI_OPCODE_ELSE },
> - { 0, 0, 0, 0, 1, 0, NONE, "ENDIF", TGSI_OPCODE_ENDIF },
> - { 1, 0, 0, 0, 1, 0, NONE, "", 79 }, /* removed */
> - { 0, 0, 0, 0, 1, 0, NONE, "", 80 }, /* removed */
> - { 0, 1, 0, 0, 0, 0, NONE, "PUSHA", TGSI_OPCODE_PUSHA },
> - { 1, 0, 0, 0, 0, 0, NONE, "POPA", TGSI_OPCODE_POPA },
> - { 1, 1, 0, 0, 0, 0, COMP, "CEIL", TGSI_OPCODE_CEIL },
> - { 1, 1, 0, 0, 0, 0, COMP, "I2F", TGSI_OPCODE_I2F },
> - { 1, 1, 0, 0, 0, 0, COMP, "NOT", TGSI_OPCODE_NOT },
> - { 1, 1, 0, 0, 0, 0, COMP, "TRUNC", TGSI_OPCODE_TRUNC },
> - { 1, 2, 0, 0, 0, 0, COMP, "SHL", TGSI_OPCODE_SHL },
> - { 0, 0, 0, 0, 0, 0, NONE, "", 88 }, /* removed */
> - { 1, 2, 0, 0, 0, 0, COMP, "AND", TGSI_OPCODE_AND },
> - { 1, 2, 0, 0, 0, 0, COMP, "OR", TGSI_OPCODE_OR },
> - { 1, 2, 0, 0, 0, 0, COMP, "MOD", TGSI_OPCODE_MOD },
> - { 1, 2, 0, 0, 0, 0, COMP, "XOR", TGSI_OPCODE_XOR },
> - { 1, 3, 0, 0, 0, 0, COMP, "SAD", TGSI_OPCODE_SAD },
> - { 1, 2, 1, 0, 0, 0, OTHR, "TXF", TGSI_OPCODE_TXF },
> - { 1, 2, 1, 0, 0, 0, OTHR, "TXQ", TGSI_OPCODE_TXQ },
> - { 0, 0, 0, 0, 0, 0, NONE, "CONT", TGSI_OPCODE_CONT },
> - { 0, 0, 0, 0, 0, 0, NONE, "EMIT", TGSI_OPCODE_EMIT },
> - { 0, 0, 0, 0, 0, 0, NONE, "ENDPRIM", TGSI_OPCODE_ENDPRIM },
> - { 0, 0, 0, 1, 0, 1, NONE, "BGNLOOP", TGSI_OPCODE_BGNLOOP },
> - { 0, 0, 0, 0, 0, 1, NONE, "BGNSUB", TGSI_OPCODE_BGNSUB },
> - { 0, 0, 0, 1, 1, 0, NONE, "ENDLOOP", TGSI_OPCODE_ENDLOOP },
> - { 0, 0, 0, 0, 1, 0, NONE, "ENDSUB", TGSI_OPCODE_ENDSUB },
> - { 0, 0, 0, 0, 0, 0, NONE, "", 103 }, /* removed */
> - { 0, 0, 0, 0, 0, 0, NONE, "", 104 }, /* removed */
> - { 0, 0, 0, 0, 0, 0, NONE, "", 105 }, /* removed */
> - { 0, 0, 0, 0, 0, 0, NONE, "", 106 }, /* removed */
> - { 0, 0, 0, 0, 0, 0, NONE, "NOP", TGSI_OPCODE_NOP },
> - { 0, 0, 0, 0, 0, 0, NONE, "", 108 }, /* removed */
> - { 0, 0, 0, 0, 0, 0, NONE, "", 109 }, /* removed */
> - { 0, 0, 0, 0, 0, 0, NONE, "", 110 }, /* removed */
> - { 0, 0, 0, 0, 0, 0, NONE, "", 111 }, /* removed */
> - { 1, 1, 0, 0, 0, 0, REPL, "NRM4", TGSI_OPCODE_NRM4 },
> - { 0, 1, 0, 0, 0, 0, NONE, "CALLNZ", TGSI_OPCODE_CALLNZ },
> - { 0, 1, 0, 0, 0, 0, NONE, "IFC", TGSI_OPCODE_IFC },
> - { 0, 1, 0, 0, 0, 0, NONE, "BREAKC", TGSI_OPCODE_BREAKC },
> - { 0, 1, 0, 0, 0, 0, NONE, "KIL", TGSI_OPCODE_KIL },
> - { 0, 0, 0, 0, 0, 0, NONE, "END", TGSI_OPCODE_END },
> - { 0, 0, 0, 0, 0, 0, NONE, "", 118 }, /* removed */
> - { 1, 1, 0, 0, 0, 0, COMP, "F2I", TGSI_OPCODE_F2I },
> - { 1, 2, 0, 0, 0, 0, COMP, "IDIV", TGSI_OPCODE_IDIV },
> - { 1, 2, 0, 0, 0, 0, COMP, "IMAX", TGSI_OPCODE_IMAX },
> - { 1, 2, 0, 0, 0, 0, COMP, "IMIN", TGSI_OPCODE_IMIN },
> - { 1, 1, 0, 0, 0, 0, COMP, "INEG", TGSI_OPCODE_INEG },
> - { 1, 2, 0, 0, 0, 0, COMP, "ISGE", TGSI_OPCODE_ISGE },
> - { 1, 2, 0, 0, 0, 0, COMP, "ISHR", TGSI_OPCODE_ISHR },
> - { 1, 2, 0, 0, 0, 0, COMP, "ISLT", TGSI_OPCODE_ISLT },
> - { 1, 1, 0, 0, 0, 0, COMP, "F2U", TGSI_OPCODE_F2U },
> - { 1, 1, 0, 0, 0, 0, COMP, "U2F", TGSI_OPCODE_U2F },
> - { 1, 2, 0, 0, 0, 0, COMP, "UADD", TGSI_OPCODE_UADD },
> - { 1, 2, 0, 0, 0, 0, COMP, "UDIV", TGSI_OPCODE_UDIV },
> - { 1, 3, 0, 0, 0, 0, COMP, "UMAD", TGSI_OPCODE_UMAD },
> - { 1, 2, 0, 0, 0, 0, COMP, "UMAX", TGSI_OPCODE_UMAX },
> - { 1, 2, 0, 0, 0, 0, COMP, "UMIN", TGSI_OPCODE_UMIN },
> - { 1, 2, 0, 0, 0, 0, COMP, "UMOD", TGSI_OPCODE_UMOD },
> - { 1, 2, 0, 0, 0, 0, COMP, "UMUL", TGSI_OPCODE_UMUL },
> - { 1, 2, 0, 0, 0, 0, COMP, "USEQ", TGSI_OPCODE_USEQ },
> - { 1, 2, 0, 0, 0, 0, COMP, "USGE", TGSI_OPCODE_USGE },
> - { 1, 2, 0, 0, 0, 0, COMP, "USHR", TGSI_OPCODE_USHR },
> - { 1, 2, 0, 0, 0, 0, COMP, "USLT", TGSI_OPCODE_USLT },
> - { 1, 2, 0, 0, 0, 0, COMP, "USNE", TGSI_OPCODE_USNE },
> - { 0, 1, 0, 0, 0, 0, NONE, "SWITCH", TGSI_OPCODE_SWITCH },
> - { 0, 1, 0, 0, 0, 0, NONE, "CASE", TGSI_OPCODE_CASE },
> - { 0, 0, 0, 0, 0, 0, NONE, "DEFAULT", TGSI_OPCODE_DEFAULT },
> - { 0, 0, 0, 0, 0, 0, NONE, "ENDSWITCH", TGSI_OPCODE_ENDSWITCH },
> + { 1, 1, 0, 0, 0, 0, 0, COMP, "ARL", TGSI_OPCODE_ARL },
> + { 1, 1, 0, 0, 0, 0, 0, COMP, "MOV", TGSI_OPCODE_MOV },
> + { 1, 1, 0, 0, 0, 0, 0, CHAN, "LIT", TGSI_OPCODE_LIT },
> + { 1, 1, 0, 0, 0, 0, 0, REPL, "RCP", TGSI_OPCODE_RCP },
> + { 1, 1, 0, 0, 0, 0, 0, REPL, "RSQ", TGSI_OPCODE_RSQ },
> + { 1, 1, 0, 0, 0, 0, 0, CHAN, "EXP", TGSI_OPCODE_EXP },
> + { 1, 1, 0, 0, 0, 0, 0, CHAN, "LOG", TGSI_OPCODE_LOG },
> + { 1, 2, 0, 0, 0, 0, 0, COMP, "MUL", TGSI_OPCODE_MUL },
> + { 1, 2, 0, 0, 0, 0, 0, COMP, "ADD", TGSI_OPCODE_ADD },
> + { 1, 2, 0, 0, 0, 0, 0, REPL, "DP3", TGSI_OPCODE_DP3 },
> + { 1, 2, 0, 0, 0, 0, 0, REPL, "DP4", TGSI_OPCODE_DP4 },
> + { 1, 2, 0, 0, 0, 0, 0, CHAN, "DST", TGSI_OPCODE_DST },
> + { 1, 2, 0, 0, 0, 0, 0, COMP, "MIN", TGSI_OPCODE_MIN },
> + { 1, 2, 0, 0, 0, 0, 0, COMP, "MAX", TGSI_OPCODE_MAX },
> + { 1, 2, 0, 0, 0, 0, 0, COMP, "SLT", TGSI_OPCODE_SLT },
> + { 1, 2, 0, 0, 0, 0, 0, COMP, "SGE", TGSI_OPCODE_SGE },
> + { 1, 3, 0, 0, 0, 0, 0, COMP, "MAD", TGSI_OPCODE_MAD },
> + { 1, 2, 0, 0, 0, 0, 0, COMP, "SUB", TGSI_OPCODE_SUB },
> + { 1, 3, 0, 0, 0, 0, 0, COMP, "LRP", TGSI_OPCODE_LRP },
> + { 1, 3, 0, 0, 0, 0, 0, COMP, "CND", TGSI_OPCODE_CND },
> + { 0, 0, 0, 0, 0, 0, 0, NONE, "", 20 }, /* removed */
> + { 1, 3, 0, 0, 0, 0, 0, REPL, "DP2A", TGSI_OPCODE_DP2A },
> + { 0, 0, 0, 0, 0, 0, 0, NONE, "", 22 }, /* removed */
> + { 0, 0, 0, 0, 0, 0, 0, NONE, "", 23 }, /* removed */
> + { 1, 1, 0, 0, 0, 0, 0, COMP, "FRC", TGSI_OPCODE_FRC },
> + { 1, 3, 0, 0, 0, 0, 0, COMP, "CLAMP", TGSI_OPCODE_CLAMP },
> + { 1, 1, 0, 0, 0, 0, 0, COMP, "FLR", TGSI_OPCODE_FLR },
> + { 1, 1, 0, 0, 0, 0, 0, COMP, "ROUND", TGSI_OPCODE_ROUND },
> + { 1, 1, 0, 0, 0, 0, 0, REPL, "EX2", TGSI_OPCODE_EX2 },
> + { 1, 1, 0, 0, 0, 0, 0, REPL, "LG2", TGSI_OPCODE_LG2 },
> + { 1, 2, 0, 0, 0, 0, 0, REPL, "POW", TGSI_OPCODE_POW },
> + { 1, 2, 0, 0, 0, 0, 0, COMP, "XPD", TGSI_OPCODE_XPD },
> + { 0, 0, 0, 0, 0, 0, 0, NONE, "", 32 }, /* removed */
> + { 1, 1, 0, 0, 0, 0, 0, COMP, "ABS", TGSI_OPCODE_ABS },
> + { 1, 1, 0, 0, 0, 0, 0, REPL, "RCC", TGSI_OPCODE_RCC },
> + { 1, 2, 0, 0, 0, 0, 0, REPL, "DPH", TGSI_OPCODE_DPH },
> + { 1, 1, 0, 0, 0, 0, 0, REPL, "COS", TGSI_OPCODE_COS },
> + { 1, 1, 0, 0, 0, 0, 0, COMP, "DDX", TGSI_OPCODE_DDX },
> + { 1, 1, 0, 0, 0, 0, 0, COMP, "DDY", TGSI_OPCODE_DDY },
> + { 0, 0, 0, 0, 0, 0, 0, NONE, "KILP", TGSI_OPCODE_KILP },
> + { 1, 1, 0, 0, 0, 0, 0, COMP, "PK2H", TGSI_OPCODE_PK2H },
> + { 1, 1, 0, 0, 0, 0, 0, COMP, "PK2US", TGSI_OPCODE_PK2US },
> + { 1, 1, 0, 0, 0, 0, 0, COMP, "PK4B", TGSI_OPCODE_PK4B },
> + { 1, 1, 0, 0, 0, 0, 0, COMP, "PK4UB", TGSI_OPCODE_PK4UB },
> + { 1, 2, 0, 0, 0, 0, 0, COMP, "RFL", TGSI_OPCODE_RFL },
> + { 1, 2, 0, 0, 0, 0, 0, COMP, "SEQ", TGSI_OPCODE_SEQ },
> + { 1, 2, 0, 0, 0, 0, 0, REPL, "SFL", TGSI_OPCODE_SFL },
> + { 1, 2, 0, 0, 0, 0, 0, COMP, "SGT", TGSI_OPCODE_SGT },
> + { 1, 1, 0, 0, 0, 0, 0, REPL, "SIN", TGSI_OPCODE_SIN },
> + { 1, 2, 0, 0, 0, 0, 0, COMP, "SLE", TGSI_OPCODE_SLE },
> + { 1, 2, 0, 0, 0, 0, 0, COMP, "SNE", TGSI_OPCODE_SNE },
> + { 1, 2, 0, 0, 0, 0, 0, REPL, "STR", TGSI_OPCODE_STR },
> + { 1, 2, 1, 0, 0, 0, 0, OTHR, "TEX", TGSI_OPCODE_TEX },
> + { 1, 4, 1, 0, 0, 0, 0, OTHR, "TXD", TGSI_OPCODE_TXD },
> + { 1, 2, 1, 0, 0, 0, 0, OTHR, "TXP", TGSI_OPCODE_TXP },
> + { 1, 1, 0, 0, 0, 0, 0, COMP, "UP2H", TGSI_OPCODE_UP2H },
> + { 1, 1, 0, 0, 0, 0, 0, COMP, "UP2US", TGSI_OPCODE_UP2US },
> + { 1, 1, 0, 0, 0, 0, 0, COMP, "UP4B", TGSI_OPCODE_UP4B },
> + { 1, 1, 0, 0, 0, 0, 0, COMP, "UP4UB", TGSI_OPCODE_UP4UB },
> + { 1, 3, 0, 0, 0, 0, 0, COMP, "X2D", TGSI_OPCODE_X2D },
> + { 1, 1, 0, 0, 0, 0, 0, COMP, "ARA", TGSI_OPCODE_ARA },
> + { 1, 1, 0, 0, 0, 0, 0, COMP, "ARR", TGSI_OPCODE_ARR },
> + { 0, 1, 0, 0, 1, 0, 0, NONE, "BRA", TGSI_OPCODE_BRA },
> + { 0, 0, 0, 1, 1, 0, 0, NONE, "CAL", TGSI_OPCODE_CAL },
> + { 0, 0, 0, 0, 0, 0, 0, NONE, "RET", TGSI_OPCODE_RET },
> + { 1, 1, 0, 0, 0, 0, 0, COMP, "SSG", TGSI_OPCODE_SSG },
> + { 1, 3, 0, 0, 0, 0, 0, COMP, "CMP", TGSI_OPCODE_CMP },
> + { 1, 1, 0, 0, 0, 0, 0, CHAN, "SCS", TGSI_OPCODE_SCS },
> + { 1, 2, 1, 0, 0, 0, 0, OTHR, "TXB", TGSI_OPCODE_TXB },
> + { 1, 1, 0, 0, 0, 0, 0, COMP, "NRM", TGSI_OPCODE_NRM },
> + { 1, 2, 0, 0, 0, 0, 0, COMP, "DIV", TGSI_OPCODE_DIV },
> + { 1, 2, 0, 0, 0, 0, 0, REPL, "DP2", TGSI_OPCODE_DP2 },
> + { 1, 2, 1, 0, 0, 0, 0, OTHR, "TXL", TGSI_OPCODE_TXL },
> + { 0, 0, 0, 0, 0, 0, 0, NONE, "BRK", TGSI_OPCODE_BRK },
> + { 0, 1, 0, 1, 0, 0, 1, NONE, "IF", TGSI_OPCODE_IF },
> + { 1, 1, 0, 0, 0, 0, 1, NONE, "", 75 }, /* removed */
> + { 0, 1, 0, 0, 0, 0, 1, NONE, "", 76 }, /* removed */
> + { 0, 0, 0, 1, 0, 1, 1, NONE, "ELSE", TGSI_OPCODE_ELSE },
> + { 0, 0, 0, 0, 0, 1, 0, NONE, "ENDIF", TGSI_OPCODE_ENDIF },
> + { 1, 0, 0, 0, 0, 1, 0, NONE, "", 79 }, /* removed */
> + { 0, 0, 0, 0, 0, 1, 0, NONE, "", 80 }, /* removed */
> + { 0, 1, 0, 0, 0, 0, 0, NONE, "PUSHA", TGSI_OPCODE_PUSHA },
> + { 1, 0, 0, 0, 0, 0, 0, NONE, "POPA", TGSI_OPCODE_POPA },
> + { 1, 1, 0, 0, 0, 0, 0, COMP, "CEIL", TGSI_OPCODE_CEIL },
> + { 1, 1, 0, 0, 0, 0, 0, COMP, "I2F", TGSI_OPCODE_I2F },
> + { 1, 1, 0, 0, 0, 0, 0, COMP, "NOT", TGSI_OPCODE_NOT },
> + { 1, 1, 0, 0, 0, 0, 0, COMP, "TRUNC", TGSI_OPCODE_TRUNC },
> + { 1, 2, 0, 0, 0, 0, 0, COMP, "SHL", TGSI_OPCODE_SHL },
> + { 0, 0, 0, 0, 0, 0, 0, NONE, "", 88 }, /* removed */
> + { 1, 2, 0, 0, 0, 0, 0, COMP, "AND", TGSI_OPCODE_AND },
> + { 1, 2, 0, 0, 0, 0, 0, COMP, "OR", TGSI_OPCODE_OR },
> + { 1, 2, 0, 0, 0, 0, 0, COMP, "MOD", TGSI_OPCODE_MOD },
> + { 1, 2, 0, 0, 0, 0, 0, COMP, "XOR", TGSI_OPCODE_XOR },
> + { 1, 3, 0, 0, 0, 0, 0, COMP, "SAD", TGSI_OPCODE_SAD },
> + { 1, 2, 1, 0, 0, 0, 0, OTHR, "TXF", TGSI_OPCODE_TXF },
> + { 1, 2, 1, 0, 0, 0, 0, OTHR, "TXQ", TGSI_OPCODE_TXQ },
> + { 0, 0, 0, 0, 0, 0, 0, NONE, "CONT", TGSI_OPCODE_CONT },
> + { 0, 0, 0, 0, 0, 0, 0, NONE, "EMIT", TGSI_OPCODE_EMIT },
> + { 0, 0, 0, 0, 0, 0, 0, NONE, "ENDPRIM", TGSI_OPCODE_ENDPRIM },
> + { 0, 0, 0, 1, 0, 0, 1, NONE, "BGNLOOP", TGSI_OPCODE_BGNLOOP },
> + { 0, 0, 0, 0, 0, 0, 1, NONE, "BGNSUB", TGSI_OPCODE_BGNSUB },
> + { 0, 0, 0, 1, 0, 1, 0, NONE, "ENDLOOP", TGSI_OPCODE_ENDLOOP },
> + { 0, 0, 0, 0, 0, 1, 0, NONE, "ENDSUB", TGSI_OPCODE_ENDSUB },
> + { 0, 0, 0, 0, 0, 0, 0, NONE, "", 103 }, /* removed */
> + { 0, 0, 0, 0, 0, 0, 0, NONE, "", 104 }, /* removed */
> + { 0, 0, 0, 0, 0, 0, 0, NONE, "", 105 }, /* removed */
> + { 0, 0, 0, 0, 0, 0, 0, NONE, "", 106 }, /* removed */
> + { 0, 0, 0, 0, 0, 0, 0, NONE, "NOP", TGSI_OPCODE_NOP },
> + { 0, 0, 0, 0, 0, 0, 0, NONE, "", 108 }, /* removed */
> + { 0, 0, 0, 0, 0, 0, 0, NONE, "", 109 }, /* removed */
> + { 0, 0, 0, 0, 0, 0, 0, NONE, "", 110 }, /* removed */
> + { 0, 0, 0, 0, 0, 0, 0, NONE, "", 111 }, /* removed */
> + { 1, 1, 0, 0, 0, 0, 0, REPL, "NRM4", TGSI_OPCODE_NRM4 },
> + { 0, 1, 0, 0, 1, 0, 0, NONE, "CALLNZ", TGSI_OPCODE_CALLNZ },
> + { 0, 1, 0, 0, 0, 0, 0, NONE, "IFC", TGSI_OPCODE_IFC },
> + { 0, 1, 0, 0, 0, 0, 0, NONE, "BREAKC", TGSI_OPCODE_BREAKC },
> + { 0, 1, 0, 0, 0, 0, 0, NONE, "KIL", TGSI_OPCODE_KIL },
> + { 0, 0, 0, 0, 0, 0, 0, NONE, "END", TGSI_OPCODE_END },
> + { 0, 0, 0, 0, 0, 0, 0, NONE, "", 118 }, /* removed */
> + { 1, 1, 0, 0, 0, 0, 0, COMP, "F2I", TGSI_OPCODE_F2I },
> + { 1, 2, 0, 0, 0, 0, 0, COMP, "IDIV", TGSI_OPCODE_IDIV },
> + { 1, 2, 0, 0, 0, 0, 0, COMP, "IMAX", TGSI_OPCODE_IMAX },
> + { 1, 2, 0, 0, 0, 0, 0, COMP, "IMIN", TGSI_OPCODE_IMIN },
> + { 1, 1, 0, 0, 0, 0, 0, COMP, "INEG", TGSI_OPCODE_INEG },
> + { 1, 2, 0, 0, 0, 0, 0, COMP, "ISGE", TGSI_OPCODE_ISGE },
> + { 1, 2, 0, 0, 0, 0, 0, COMP, "ISHR", TGSI_OPCODE_ISHR },
> + { 1, 2, 0, 0, 0, 0, 0, COMP, "ISLT", TGSI_OPCODE_ISLT },
> + { 1, 1, 0, 0, 0, 0, 0, COMP, "F2U", TGSI_OPCODE_F2U },
> + { 1, 1, 0, 0, 0, 0, 0, COMP, "U2F", TGSI_OPCODE_U2F },
> + { 1, 2, 0, 0, 0, 0, 0, COMP, "UADD", TGSI_OPCODE_UADD },
> + { 1, 2, 0, 0, 0, 0, 0, COMP, "UDIV", TGSI_OPCODE_UDIV },
> + { 1, 3, 0, 0, 0, 0, 0, COMP, "UMAD", TGSI_OPCODE_UMAD },
> + { 1, 2, 0, 0, 0, 0, 0, COMP, "UMAX", TGSI_OPCODE_UMAX },
> + { 1, 2, 0, 0, 0, 0, 0, COMP, "UMIN", TGSI_OPCODE_UMIN },
> + { 1, 2, 0, 0, 0, 0, 0, COMP, "UMOD", TGSI_OPCODE_UMOD },
> + { 1, 2, 0, 0, 0, 0, 0, COMP, "UMUL", TGSI_OPCODE_UMUL },
> + { 1, 2, 0, 0, 0, 0, 0, COMP, "USEQ", TGSI_OPCODE_USEQ },
> + { 1, 2, 0, 0, 0, 0, 0, COMP, "USGE", TGSI_OPCODE_USGE },
> + { 1, 2, 0, 0, 0, 0, 0, COMP, "USHR", TGSI_OPCODE_USHR },
> + { 1, 2, 0, 0, 0, 0, 0, COMP, "USLT", TGSI_OPCODE_USLT },
> + { 1, 2, 0, 0, 0, 0, 0, COMP, "USNE", TGSI_OPCODE_USNE },
> + { 0, 1, 0, 0, 0, 0, 0, NONE, "SWITCH", TGSI_OPCODE_SWITCH },
> + { 0, 1, 0, 0, 0, 0, 0, NONE, "CASE", TGSI_OPCODE_CASE },
> + { 0, 0, 0, 0, 0, 0, 0, NONE, "DEFAULT", TGSI_OPCODE_DEFAULT },
> + { 0, 0, 0, 0, 0, 0, 0, NONE, "ENDSWITCH", TGSI_OPCODE_ENDSWITCH
> },
>
> - { 1, 2, 0, 0, 0, 0, OTHR, "LOAD", TGSI_OPCODE_LOAD },
> - { 1, 2, 0, 0, 0, 0, OTHR, "LOAD_MS", TGSI_OPCODE_LOAD_MS },
> - { 1, 3, 0, 0, 0, 0, OTHR, "SAMPLE", TGSI_OPCODE_SAMPLE },
> - { 1, 4, 0, 0, 0, 0, OTHR, "SAMPLE_B", TGSI_OPCODE_SAMPLE_B },
> - { 1, 4, 0, 0, 0, 0, OTHR, "SAMPLE_C", TGSI_OPCODE_SAMPLE_C },
> - { 1, 4, 0, 0, 0, 0, OTHR, "SAMPLE_C_LZ", TGSI_OPCODE_SAMPLE_C_LZ
> },
> - { 1, 5, 0, 0, 0, 0, OTHR, "SAMPLE_D", TGSI_OPCODE_SAMPLE_D },
> - { 1, 3, 0, 0, 0, 0, OTHR, "SAMPLE_L", TGSI_OPCODE_SAMPLE_L },
> - { 1, 3, 0, 0, 0, 0, OTHR, "GATHER4", TGSI_OPCODE_GATHER4 },
> - { 1, 2, 0, 0, 0, 0, OTHR, "RESINFO", TGSI_OPCODE_RESINFO },
> - { 1, 2, 0, 0, 0, 0, OTHR, "SAMPLE_POS", TGSI_OPCODE_SAMPLE_POS
> },
> - { 1, 2, 0, 0, 0, 0, OTHR, "SAMPLE_INFO", TGSI_OPCODE_SAMPLE_INFO
> },
> - { 1, 1, 0, 0, 0, 0, COMP, "UARL", TGSI_OPCODE_UARL },
> - { 1, 3, 0, 0, 0, 0, COMP, "UCMP", TGSI_OPCODE_UCMP },
> - { 1, 1, 0, 0, 0, 0, COMP, "IABS", TGSI_OPCODE_IABS },
> - { 1, 1, 0, 0, 0, 0, COMP, "ISSG", TGSI_OPCODE_ISSG },
> - { 1, 2, 0, 0, 0, 0, OTHR, "STORE", TGSI_OPCODE_STORE },
> - { 1, 0, 0, 0, 0, 0, OTHR, "MFENCE", TGSI_OPCODE_MFENCE },
> - { 1, 0, 0, 0, 0, 0, OTHR, "LFENCE", TGSI_OPCODE_LFENCE },
> - { 1, 0, 0, 0, 0, 0, OTHR, "SFENCE", TGSI_OPCODE_SFENCE },
> - { 0, 0, 0, 0, 0, 0, OTHR, "BARRIER", TGSI_OPCODE_BARRIER },
> + { 1, 2, 0, 0, 0, 0, 0, OTHR, "LOAD", TGSI_OPCODE_LOAD },
> + { 1, 2, 0, 0, 0, 0, 0, OTHR, "LOAD_MS", TGSI_OPCODE_LOAD_MS
> },
> + { 1, 3, 0, 0, 0, 0, 0, OTHR, "SAMPLE", TGSI_OPCODE_SAMPLE },
> + { 1, 4, 0, 0, 0, 0, 0, OTHR, "SAMPLE_B", TGSI_OPCODE_SAMPLE_B
> },
> + { 1, 4, 0, 0, 0, 0, 0, OTHR, "SAMPLE_C", TGSI_OPCODE_SAMPLE_C
> },
> + { 1, 4, 0, 0, 0, 0, 0, OTHR, "SAMPLE_C_LZ",
> TGSI_OPCODE_SAMPLE_C_LZ },
> + { 1, 5, 0, 0, 0, 0, 0, OTHR, "SAMPLE_D", TGSI_OPCODE_SAMPLE_D
> },
> + { 1, 3, 0, 0, 0, 0, 0, OTHR, "SAMPLE_L", TGSI_OPCODE_SAMPLE_L
> },
> + { 1, 3, 0, 0, 0, 0, 0, OTHR, "GATHER4", TGSI_OPCODE_GATHER4
> },
> + { 1, 2, 0, 0, 0, 0, 0, OTHR, "RESINFO", TGSI_OPCODE_RESINFO
> },
> + { 1, 2, 0, 0, 0, 0, 0, OTHR, "SAMPLE_POS",
> TGSI_OPCODE_SAMPLE_POS },
> + { 1, 2, 0, 0, 0, 0, 0, OTHR, "SAMPLE_INFO",
> TGSI_OPCODE_SAMPLE_INFO },
> + { 1, 1, 0, 0, 0, 0, 0, COMP, "UARL", TGSI_OPCODE_UARL },
> + { 1, 3, 0, 0, 0, 0, 0, COMP, "UCMP", TGSI_OPCODE_UCMP },
> + { 1, 1, 0, 0, 0, 0, 0, COMP, "IABS", TGSI_OPCODE_IABS },
> + { 1, 1, 0, 0, 0, 0, 0, COMP, "ISSG", TGSI_OPCODE_ISSG },
> + { 1, 2, 0, 0, 0, 0, 0, OTHR, "STORE", TGSI_OPCODE_STORE },
> + { 1, 0, 0, 0, 0, 0, 0, OTHR, "MFENCE", TGSI_OPCODE_MFENCE },
> + { 1, 0, 0, 0, 0, 0, 0, OTHR, "LFENCE", TGSI_OPCODE_LFENCE },
> + { 1, 0, 0, 0, 0, 0, 0, OTHR, "SFENCE", TGSI_OPCODE_SFENCE },
> + { 0, 0, 0, 0, 0, 0, 0, OTHR, "BARRIER", TGSI_OPCODE_BARRIER },
>
> - { 1, 3, 0, 0, 0, 0, OTHR, "ATOMUADD", TGSI_OPCODE_ATOMUADD },
> - { 1, 3, 0, 0, 0, 0, OTHR, "ATOMXCHG", TGSI_OPCODE_ATOMXCHG },
> - { 1, 4, 0, 0, 0, 0, OTHR, "ATOMCAS", TGSI_OPCODE_ATOMCAS },
> - { 1, 3, 0, 0, 0, 0, OTHR, "ATOMAND", TGSI_OPCODE_ATOMAND },
> - { 1, 3, 0, 0, 0, 0, OTHR, "ATOMOR", TGSI_OPCODE_ATOMOR },
> - { 1, 3, 0, 0, 0, 0, OTHR, "ATOMXOR", TGSI_OPCODE_ATOMXOR },
> - { 1, 3, 0, 0, 0, 0, OTHR, "ATOMUMIN", TGSI_OPCODE_ATOMUMIN },
> - { 1, 3, 0, 0, 0, 0, OTHR, "ATOMUMAX", TGSI_OPCODE_ATOMUMAX },
> - { 1, 3, 0, 0, 0, 0, OTHR, "ATOMIMIN", TGSI_OPCODE_ATOMIMIN },
> - { 1, 3, 0, 0, 0, 0, OTHR, "ATOMIMAX", TGSI_OPCODE_ATOMIMAX }
> + { 1, 3, 0, 0, 0, 0, 0, OTHR, "ATOMUADD", TGSI_OPCODE_ATOMUADD },
> + { 1, 3, 0, 0, 0, 0, 0, OTHR, "ATOMXCHG", TGSI_OPCODE_ATOMXCHG },
> + { 1, 4, 0, 0, 0, 0, 0, OTHR, "ATOMCAS", TGSI_OPCODE_ATOMCAS },
> + { 1, 3, 0, 0, 0, 0, 0, OTHR, "ATOMAND", TGSI_OPCODE_ATOMAND },
> + { 1, 3, 0, 0, 0, 0, 0, OTHR, "ATOMOR", TGSI_OPCODE_ATOMOR },
> + { 1, 3, 0, 0, 0, 0, 0, OTHR, "ATOMXOR", TGSI_OPCODE_ATOMXOR },
> + { 1, 3, 0, 0, 0, 0, 0, OTHR, "ATOMUMIN", TGSI_OPCODE_ATOMUMIN },
> + { 1, 3, 0, 0, 0, 0, 0, OTHR, "ATOMUMAX", TGSI_OPCODE_ATOMUMAX },
> + { 1, 3, 0, 0, 0, 0, 0, OTHR, "ATOMIMIN", TGSI_OPCODE_ATOMIMIN },
> + { 1, 3, 0, 0, 0, 0, 0, OTHR, "ATOMIMAX", TGSI_OPCODE_ATOMIMAX }
> };
>
> const struct tgsi_opcode_info *
> diff --git a/src/gallium/auxiliary/tgsi/tgsi_info.h
> b/src/gallium/auxiliary/tgsi/tgsi_info.h
> index 44fe00b..81dfabc 100644
> --- a/src/gallium/auxiliary/tgsi/tgsi_info.h
> +++ b/src/gallium/auxiliary/tgsi/tgsi_info.h
> @@ -75,6 +75,7 @@ struct tgsi_opcode_info
> unsigned num_src:3;
> unsigned is_tex:1;
> unsigned is_branch:1;
> + unsigned has_label:1;
> int pre_dedent:2;
> int post_indent:2;
> enum tgsi_output_mode output_mode:3;
> diff --git a/src/gallium/auxiliary/tgsi/tgsi_text.c
> b/src/gallium/auxiliary/tgsi/tgsi_text.c
> index 56a90f7..51943ed 100644
> --- a/src/gallium/auxiliary/tgsi/tgsi_text.c
> +++ b/src/gallium/auxiliary/tgsi/tgsi_text.c
> @@ -940,7 +940,7 @@ parse_instruction(
> }
> }
>
> - if (info->is_branch) {
> + if (info->has_label) {
> uint target;
>
> eat_opt_white( &ctx->cur );
> --
> 1.7.9.2
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
