Merge branch 'master' into r300-compiler

Conflicts:
	src/gallium/drivers/r300/r300_tgsi_to_rc.c

1 files changed, 119 insertions, 119 deletions

diff --git a/src/gallium/auxiliary/tgsi/tgsi_info.c b/src/gallium/auxiliary/tgsi/tgsi_info.c
index ccf4b205ff..17af4cb7ad 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_info.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_info.c
@@ -31,125 +31,125 @@
 
 static const struct tgsi_opcode_info opcode_info[TGSI_OPCODE_LAST] =
 {
-   { 1, 1, 0, 0, "ARL", TGSI_OPCODE_ARL },
-   { 1, 1, 0, 0, "MOV", TGSI_OPCODE_MOV },
-   { 1, 1, 0, 0, "LIT", TGSI_OPCODE_LIT },
-   { 1, 1, 0, 0, "RCP", TGSI_OPCODE_RCP },
-   { 1, 1, 0, 0, "RSQ", TGSI_OPCODE_RSQ },
-   { 1, 1, 0, 0, "EXP", TGSI_OPCODE_EXP },
-   { 1, 1, 0, 0, "LOG", TGSI_OPCODE_LOG },
-   { 1, 2, 0, 0, "MUL", TGSI_OPCODE_MUL },
-   { 1, 2, 0, 0, "ADD", TGSI_OPCODE_ADD },
-   { 1, 2, 0, 0, "DP3", TGSI_OPCODE_DP3 },
-   { 1, 2, 0, 0, "DP4", TGSI_OPCODE_DP4 },
-   { 1, 2, 0, 0, "DST", TGSI_OPCODE_DST },
-   { 1, 2, 0, 0, "MIN", TGSI_OPCODE_MIN },
-   { 1, 2, 0, 0, "MAX", TGSI_OPCODE_MAX },
-   { 1, 2, 0, 0, "SLT", TGSI_OPCODE_SLT },
-   { 1, 2, 0, 0, "SGE", TGSI_OPCODE_SGE },
-   { 1, 3, 0, 0, "MAD", TGSI_OPCODE_MAD },
-   { 1, 2, 0, 0, "SUB", TGSI_OPCODE_SUB },
-   { 1, 3, 0, 0, "LRP", TGSI_OPCODE_LRP },
-   { 1, 3, 0, 0, "CND", TGSI_OPCODE_CND },
-   { 1, 3, 0, 0, "CND0", TGSI_OPCODE_CND0 },
-   { 1, 3, 0, 0, "DP2A", TGSI_OPCODE_DP2A },
-   { 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 },
-   { 1, 1, 0, 0, "ROUND", TGSI_OPCODE_ROUND },
-   { 1, 1, 0, 0, "EX2", TGSI_OPCODE_EX2 },
-   { 1, 1, 0, 0, "LG2", TGSI_OPCODE_LG2 },
-   { 1, 2, 0, 0, "POW", TGSI_OPCODE_POW },
-   { 1, 2, 0, 0, "XPD", TGSI_OPCODE_XPD },
-   { 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 },
-   { 1, 1, 0, 0, "COS", TGSI_OPCODE_COS },
-   { 1, 1, 0, 0, "DDX", TGSI_OPCODE_DDX },
-   { 1, 1, 0, 0, "DDY", TGSI_OPCODE_DDY },
-   { 0, 0, 0, 0, "KILP", TGSI_OPCODE_KILP },
-   { 1, 1, 0, 0, "PK2H", TGSI_OPCODE_PK2H },
-   { 1, 1, 0, 0, "PK2US", TGSI_OPCODE_PK2US },
-   { 1, 1, 0, 0, "PK4B", TGSI_OPCODE_PK4B },
-   { 1, 1, 0, 0, "PK4UB", TGSI_OPCODE_PK4UB },
-   { 1, 2, 0, 0, "RFL", TGSI_OPCODE_RFL },
-   { 1, 2, 0, 0, "SEQ", TGSI_OPCODE_SEQ },
-   { 1, 2, 0, 0, "SFL", TGSI_OPCODE_SFL },
-   { 1, 2, 0, 0, "SGT", TGSI_OPCODE_SGT },
-   { 1, 1, 0, 0, "SIN", TGSI_OPCODE_SIN },
-   { 1, 2, 0, 0, "SLE", TGSI_OPCODE_SLE },
-   { 1, 2, 0, 0, "SNE", TGSI_OPCODE_SNE },
-   { 1, 2, 0, 0, "STR", TGSI_OPCODE_STR },
-   { 1, 2, 1, 0, "TEX", TGSI_OPCODE_TEX },
-   { 1, 4, 1, 0, "TXD", TGSI_OPCODE_TXD },
-   { 1, 2, 1, 0, "TXP", TGSI_OPCODE_TXP },
-   { 1, 1, 0, 0, "UP2H", TGSI_OPCODE_UP2H },
-   { 1, 1, 0, 0, "UP2US", TGSI_OPCODE_UP2US },
-   { 1, 1, 0, 0, "UP4B", TGSI_OPCODE_UP4B },
-   { 1, 1, 0, 0, "UP4UB", TGSI_OPCODE_UP4UB },
-   { 1, 3, 0, 0, "X2D", TGSI_OPCODE_X2D },
-   { 1, 1, 0, 0, "ARA", TGSI_OPCODE_ARA },
-   { 1, 1, 0, 0, "ARR", TGSI_OPCODE_ARR },
-   { 0, 1, 0, 0, "BRA", TGSI_OPCODE_BRA },
-   { 0, 0, 0, 1, "CAL", TGSI_OPCODE_CAL },
-   { 0, 0, 0, 0, "RET", TGSI_OPCODE_RET },
-   { 1, 1, 0, 0, "SSG", TGSI_OPCODE_SSG },
-   { 1, 3, 0, 0, "CMP", TGSI_OPCODE_CMP },
-   { 1, 1, 0, 0, "SCS", TGSI_OPCODE_SCS },
-   { 1, 2, 1, 0, "TXB", TGSI_OPCODE_TXB },
-   { 1, 1, 0, 0, "NRM", TGSI_OPCODE_NRM },
-   { 1, 2, 0, 0, "DIV", TGSI_OPCODE_DIV },
-   { 1, 2, 0, 0, "DP2", TGSI_OPCODE_DP2 },
-   { 1, 2, 1, 0, "TXL", TGSI_OPCODE_TXL },
-   { 0, 0, 0, 0, "BRK", TGSI_OPCODE_BRK },
-   { 0, 1, 0, 1, "IF", TGSI_OPCODE_IF },
-   { 1, 1, 0, 0, "BGNFOR", TGSI_OPCODE_BGNFOR },
-   { 0, 1, 0, 0, "REP", TGSI_OPCODE_REP },
-   { 0, 0, 0, 1, "ELSE", TGSI_OPCODE_ELSE },
-   { 0, 0, 0, 0, "ENDIF", TGSI_OPCODE_ENDIF },
-   { 1, 0, 0, 0, "ENDFOR", TGSI_OPCODE_ENDFOR },
-   { 0, 0, 0, 0, "ENDREP", TGSI_OPCODE_ENDREP },
-   { 0, 1, 0, 0, "PUSHA", TGSI_OPCODE_PUSHA },
-   { 1, 0, 0, 0, "POPA", TGSI_OPCODE_POPA },
-   { 1, 1, 0, 0, "CEIL", TGSI_OPCODE_CEIL },
-   { 1, 1, 0, 0, "I2F", TGSI_OPCODE_I2F },
-   { 1, 1, 0, 0, "NOT", TGSI_OPCODE_NOT },
-   { 1, 1, 0, 0, "TRUNC", TGSI_OPCODE_TRUNC },
-   { 1, 2, 0, 0, "SHL", TGSI_OPCODE_SHL },
-   { 1, 2, 0, 0, "SHR", TGSI_OPCODE_SHR },
-   { 1, 2, 0, 0, "AND", TGSI_OPCODE_AND },
-   { 1, 2, 0, 0, "OR", TGSI_OPCODE_OR },
-   { 1, 2, 0, 0, "MOD", TGSI_OPCODE_MOD },
-   { 1, 2, 0, 0, "XOR", TGSI_OPCODE_XOR },
-   { 1, 3, 0, 0, "SAD", TGSI_OPCODE_SAD },
-   { 1, 2, 1, 0, "TXF", TGSI_OPCODE_TXF },
-   { 1, 2, 1, 0, "TXQ", TGSI_OPCODE_TXQ },
-   { 0, 0, 0, 0, "CONT", TGSI_OPCODE_CONT },
-   { 0, 0, 0, 0, "EMIT", TGSI_OPCODE_EMIT },
-   { 0, 0, 0, 0, "ENDPRIM", TGSI_OPCODE_ENDPRIM },
-   { 0, 0, 0, 1, "BGNLOOP", TGSI_OPCODE_BGNLOOP },
-   { 0, 0, 0, 0, "BGNSUB", TGSI_OPCODE_BGNSUB },
-   { 0, 0, 0, 1, "ENDLOOP", TGSI_OPCODE_ENDLOOP },
-   { 0, 0, 0, 0, "ENDSUB", TGSI_OPCODE_ENDSUB },
-   { 1, 1, 0, 0, "NOISE1", TGSI_OPCODE_NOISE1 },
-   { 1, 1, 0, 0, "NOISE2", TGSI_OPCODE_NOISE2 },
-   { 1, 1, 0, 0, "NOISE3", TGSI_OPCODE_NOISE3 },
-   { 1, 1, 0, 0, "NOISE4", TGSI_OPCODE_NOISE4 },
-   { 0, 0, 0, 0, "NOP", TGSI_OPCODE_NOP },
-   { 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 },
-   { 0, 1, 0, 0, "BREAKC", TGSI_OPCODE_BREAKC },
-   { 0, 1, 0, 0, "KIL", TGSI_OPCODE_KIL },
-   { 0, 0, 0, 0, "END", TGSI_OPCODE_END },
-   { 1, 1, 0, 0, "SWZ", TGSI_OPCODE_SWZ }
+   { 1, 1, 0, 0, 0, 0, "ARL", TGSI_OPCODE_ARL },
+   { 1, 1, 0, 0, 0, 0, "MOV", TGSI_OPCODE_MOV },
+   { 1, 1, 0, 0, 0, 0, "LIT", TGSI_OPCODE_LIT },
+   { 1, 1, 0, 0, 0, 0, "RCP", TGSI_OPCODE_RCP },
+   { 1, 1, 0, 0, 0, 0, "RSQ", TGSI_OPCODE_RSQ },
+   { 1, 1, 0, 0, 0, 0, "EXP", TGSI_OPCODE_EXP },
+   { 1, 1, 0, 0, 0, 0, "LOG", TGSI_OPCODE_LOG },
+   { 1, 2, 0, 0, 0, 0, "MUL", TGSI_OPCODE_MUL },
+   { 1, 2, 0, 0, 0, 0, "ADD", TGSI_OPCODE_ADD },
+   { 1, 2, 0, 0, 0, 0, "DP3", TGSI_OPCODE_DP3 },
+   { 1, 2, 0, 0, 0, 0, "DP4", TGSI_OPCODE_DP4 },
+   { 1, 2, 0, 0, 0, 0, "DST", TGSI_OPCODE_DST },
+   { 1, 2, 0, 0, 0, 0, "MIN", TGSI_OPCODE_MIN },
+   { 1, 2, 0, 0, 0, 0, "MAX", TGSI_OPCODE_MAX },
+   { 1, 2, 0, 0, 0, 0, "SLT", TGSI_OPCODE_SLT },
+   { 1, 2, 0, 0, 0, 0, "SGE", TGSI_OPCODE_SGE },
+   { 1, 3, 0, 0, 0, 0, "MAD", TGSI_OPCODE_MAD },
+   { 1, 2, 0, 0, 0, 0, "SUB", TGSI_OPCODE_SUB },
+   { 1, 3, 0, 0, 0, 0, "LRP", TGSI_OPCODE_LRP },
+   { 1, 3, 0, 0, 0, 0, "CND", TGSI_OPCODE_CND },
+   { 0, 0, 0, 0, 0, 0, "", 20 },      /* removed */
+   { 1, 3, 0, 0, 0, 0, "DP2A", TGSI_OPCODE_DP2A },
+   { 0, 0, 0, 0, 0, 0, "", 22 },      /* removed */
+   { 0, 0, 0, 0, 0, 0, "", 23 },      /* removed */
+   { 1, 1, 0, 0, 0, 0, "FRC", TGSI_OPCODE_FRC },
+   { 1, 3, 0, 0, 0, 0, "CLAMP", TGSI_OPCODE_CLAMP },
+   { 1, 1, 0, 0, 0, 0, "FLR", TGSI_OPCODE_FLR },
+   { 1, 1, 0, 0, 0, 0, "ROUND", TGSI_OPCODE_ROUND },
+   { 1, 1, 0, 0, 0, 0, "EX2", TGSI_OPCODE_EX2 },
+   { 1, 1, 0, 0, 0, 0, "LG2", TGSI_OPCODE_LG2 },
+   { 1, 2, 0, 0, 0, 0, "POW", TGSI_OPCODE_POW },
+   { 1, 2, 0, 0, 0, 0, "XPD", TGSI_OPCODE_XPD },
+   { 0, 0, 0, 0, 0, 0, "", 32 },      /* removed */
+   { 1, 1, 0, 0, 0, 0, "ABS", TGSI_OPCODE_ABS },
+   { 1, 1, 0, 0, 0, 0, "RCC", TGSI_OPCODE_RCC },
+   { 1, 2, 0, 0, 0, 0, "DPH", TGSI_OPCODE_DPH },
+   { 1, 1, 0, 0, 0, 0, "COS", TGSI_OPCODE_COS },
+   { 1, 1, 0, 0, 0, 0, "DDX", TGSI_OPCODE_DDX },
+   { 1, 1, 0, 0, 0, 0, "DDY", TGSI_OPCODE_DDY },
+   { 0, 0, 0, 0, 0, 0, "KILP", TGSI_OPCODE_KILP },
+   { 1, 1, 0, 0, 0, 0, "PK2H", TGSI_OPCODE_PK2H },
+   { 1, 1, 0, 0, 0, 0, "PK2US", TGSI_OPCODE_PK2US },
+   { 1, 1, 0, 0, 0, 0, "PK4B", TGSI_OPCODE_PK4B },
+   { 1, 1, 0, 0, 0, 0, "PK4UB", TGSI_OPCODE_PK4UB },
+   { 1, 2, 0, 0, 0, 0, "RFL", TGSI_OPCODE_RFL },
+   { 1, 2, 0, 0, 0, 0, "SEQ", TGSI_OPCODE_SEQ },
+   { 1, 2, 0, 0, 0, 0, "SFL", TGSI_OPCODE_SFL },
+   { 1, 2, 0, 0, 0, 0, "SGT", TGSI_OPCODE_SGT },
+   { 1, 1, 0, 0, 0, 0, "SIN", TGSI_OPCODE_SIN },
+   { 1, 2, 0, 0, 0, 0, "SLE", TGSI_OPCODE_SLE },
+   { 1, 2, 0, 0, 0, 0, "SNE", TGSI_OPCODE_SNE },
+   { 1, 2, 0, 0, 0, 0, "STR", TGSI_OPCODE_STR },
+   { 1, 2, 1, 0, 0, 0, "TEX", TGSI_OPCODE_TEX },
+   { 1, 4, 1, 0, 0, 0, "TXD", TGSI_OPCODE_TXD },
+   { 1, 2, 1, 0, 0, 0, "TXP", TGSI_OPCODE_TXP },
+   { 1, 1, 0, 0, 0, 0, "UP2H", TGSI_OPCODE_UP2H },
+   { 1, 1, 0, 0, 0, 0, "UP2US", TGSI_OPCODE_UP2US },
+   { 1, 1, 0, 0, 0, 0, "UP4B", TGSI_OPCODE_UP4B },
+   { 1, 1, 0, 0, 0, 0, "UP4UB", TGSI_OPCODE_UP4UB },
+   { 1, 3, 0, 0, 0, 0, "X2D", TGSI_OPCODE_X2D },
+   { 1, 1, 0, 0, 0, 0, "ARA", TGSI_OPCODE_ARA },
+   { 1, 1, 0, 0, 0, 0, "ARR", TGSI_OPCODE_ARR },
+   { 0, 1, 0, 0, 0, 0, "BRA", TGSI_OPCODE_BRA },
+   { 0, 0, 0, 1, 0, 0, "CAL", TGSI_OPCODE_CAL },
+   { 0, 0, 0, 0, 0, 0, "RET", TGSI_OPCODE_RET },
+   { 1, 1, 0, 0, 0, 0, "SSG", TGSI_OPCODE_SSG },
+   { 1, 3, 0, 0, 0, 0, "CMP", TGSI_OPCODE_CMP },
+   { 1, 1, 0, 0, 0, 0, "SCS", TGSI_OPCODE_SCS },
+   { 1, 2, 1, 0, 0, 0, "TXB", TGSI_OPCODE_TXB },
+   { 1, 1, 0, 0, 0, 0, "NRM", TGSI_OPCODE_NRM },
+   { 1, 2, 0, 0, 0, 0, "DIV", TGSI_OPCODE_DIV },
+   { 1, 2, 0, 0, 0, 0, "DP2", TGSI_OPCODE_DP2 },
+   { 1, 2, 1, 0, 0, 0, "TXL", TGSI_OPCODE_TXL },
+   { 0, 0, 0, 0, 0, 0, "BRK", TGSI_OPCODE_BRK },
+   { 0, 1, 0, 1, 0, 1, "IF", TGSI_OPCODE_IF },
+   { 1, 1, 0, 0, 0, 1, "BGNFOR", TGSI_OPCODE_BGNFOR },
+   { 0, 1, 0, 0, 0, 1, "REP", TGSI_OPCODE_REP },
+   { 0, 0, 0, 1, 1, 1, "ELSE", TGSI_OPCODE_ELSE },
+   { 0, 0, 0, 0, 1, 0, "ENDIF", TGSI_OPCODE_ENDIF },
+   { 1, 0, 0, 0, 1, 0, "ENDFOR", TGSI_OPCODE_ENDFOR },
+   { 0, 0, 0, 0, 1, 0, "ENDREP", TGSI_OPCODE_ENDREP },
+   { 0, 1, 0, 0, 0, 0, "PUSHA", TGSI_OPCODE_PUSHA },
+   { 1, 0, 0, 0, 0, 0, "POPA", TGSI_OPCODE_POPA },
+   { 1, 1, 0, 0, 0, 0, "CEIL", TGSI_OPCODE_CEIL },
+   { 1, 1, 0, 0, 0, 0, "I2F", TGSI_OPCODE_I2F },
+   { 1, 1, 0, 0, 0, 0, "NOT", TGSI_OPCODE_NOT },
+   { 1, 1, 0, 0, 0, 0, "TRUNC", TGSI_OPCODE_TRUNC },
+   { 1, 2, 0, 0, 0, 0, "SHL", TGSI_OPCODE_SHL },
+   { 1, 2, 0, 0, 0, 0, "SHR", TGSI_OPCODE_SHR },
+   { 1, 2, 0, 0, 0, 0, "AND", TGSI_OPCODE_AND },
+   { 1, 2, 0, 0, 0, 0, "OR", TGSI_OPCODE_OR },
+   { 1, 2, 0, 0, 0, 0, "MOD", TGSI_OPCODE_MOD },
+   { 1, 2, 0, 0, 0, 0, "XOR", TGSI_OPCODE_XOR },
+   { 1, 3, 0, 0, 0, 0, "SAD", TGSI_OPCODE_SAD },
+   { 1, 2, 1, 0, 0, 0, "TXF", TGSI_OPCODE_TXF },
+   { 1, 2, 1, 0, 0, 0, "TXQ", TGSI_OPCODE_TXQ },
+   { 0, 0, 0, 0, 0, 0, "CONT", TGSI_OPCODE_CONT },
+   { 0, 0, 0, 0, 0, 0, "EMIT", TGSI_OPCODE_EMIT },
+   { 0, 0, 0, 0, 0, 0, "ENDPRIM", TGSI_OPCODE_ENDPRIM },
+   { 0, 0, 0, 1, 0, 1, "BGNLOOP", TGSI_OPCODE_BGNLOOP },
+   { 0, 0, 0, 0, 0, 1, "BGNSUB", TGSI_OPCODE_BGNSUB },
+   { 0, 0, 0, 1, 1, 0, "ENDLOOP", TGSI_OPCODE_ENDLOOP },
+   { 0, 0, 0, 0, 1, 0, "ENDSUB", TGSI_OPCODE_ENDSUB },
+   { 1, 1, 0, 0, 0, 0, "NOISE1", TGSI_OPCODE_NOISE1 },
+   { 1, 1, 0, 0, 0, 0, "NOISE2", TGSI_OPCODE_NOISE2 },
+   { 1, 1, 0, 0, 0, 0, "NOISE3", TGSI_OPCODE_NOISE3 },
+   { 1, 1, 0, 0, 0, 0, "NOISE4", TGSI_OPCODE_NOISE4 },
+   { 0, 0, 0, 0, 0, 0, "NOP", TGSI_OPCODE_NOP },
+   { 0, 0, 0, 0, 0, 0, "", 108 },     /* removed */
+   { 0, 0, 0, 0, 0, 0, "", 109 },     /* removed */
+   { 0, 0, 0, 0, 0, 0, "", 110 },     /* removed */
+   { 0, 0, 0, 0, 0, 0, "", 111 },     /* removed */
+   { 1, 1, 0, 0, 0, 0, "NRM4", TGSI_OPCODE_NRM4 },
+   { 0, 1, 0, 0, 0, 0, "CALLNZ", TGSI_OPCODE_CALLNZ },
+   { 0, 1, 0, 0, 0, 0, "IFC", TGSI_OPCODE_IFC },
+   { 0, 1, 0, 0, 0, 0, "BREAKC", TGSI_OPCODE_BREAKC },
+   { 0, 1, 0, 0, 0, 0, "KIL", TGSI_OPCODE_KIL },
+   { 0, 0, 0, 0, 0, 0, "END", TGSI_OPCODE_END },
+   { 1, 1, 0, 0, 0, 0, "SWZ", TGSI_OPCODE_SWZ }
 };
 
 const struct tgsi_opcode_info *