From: Ian Romanick Date: Thu, 10 Sep 2009 22:33:45 +0000 (-0700) Subject: Merge branch 'master' into asm-shader-rework-2 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b8e1e8d2d8ae6ffbf8f271b46ee89788a926b3b0;p=mesa.git Merge branch 'master' into asm-shader-rework-2 Conflicts: src/mesa/shader/lex.yy.c src/mesa/shader/program_parse.tab.c src/mesa/shader/program_parse.tab.h --- b8e1e8d2d8ae6ffbf8f271b46ee89788a926b3b0 diff --cc src/mesa/drivers/dri/swrast/swrast.c index d8de5cca808,3016987d561..b36cd0274a8 --- a/src/mesa/drivers/dri/swrast/swrast.c +++ b/src/mesa/drivers/dri/swrast/swrast.c @@@ -107,9 -112,9 +112,10 @@@ const struct dri_extension card_extensi { "GL_EXT_paletted_texture", GL_EXT_paletted_texture_functions }, { "GL_EXT_stencil_two_side", GL_EXT_stencil_two_side_functions }, { "GL_MESA_resize_buffers", GL_MESA_resize_buffers_functions }, + { "GL_NV_depth_clamp", NULL }, { "GL_NV_vertex_program", GL_NV_vertex_program_functions }, { "GL_NV_fragment_program", GL_NV_fragment_program_functions }, + { "GL_NV_fragment_program_option", NULL }, { NULL, NULL } }; diff --cc src/mesa/main/extensions.c index c6f5068685b,2ad66de7dd1..73adb0e2176 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@@ -161,8 -164,8 +164,9 @@@ static const struct { OFF, "GL_MESA_ycbcr_texture", F(MESA_ycbcr_texture) }, { ON, "GL_MESA_window_pos", F(ARB_window_pos) }, { OFF, "GL_NV_blend_square", F(NV_blend_square) }, + { OFF, "GL_NV_depth_clamp", F(ARB_depth_clamp) }, { OFF, "GL_NV_fragment_program", F(NV_fragment_program) }, + { OFF, "GL_NV_fragment_program_option", F(NV_fragment_program_option) }, { ON, "GL_NV_light_max_exponent", F(NV_light_max_exponent) }, { OFF, "GL_NV_point_sprite", F(NV_point_sprite) }, { OFF, "GL_NV_texture_env_combine4", F(NV_texture_env_combine4) }, diff --cc src/mesa/shader/lex.yy.c index ba3512365e7,283ba8d26e5..3c4e97b650a --- a/src/mesa/shader/lex.yy.c +++ b/src/mesa/shader/lex.yy.c @@@ -1036,8 -901,8 +1036,9 @@@ static yyconst flex_int16_t yy_chk[1352 */ #include "main/glheader.h" #include "prog_instruction.h" + #include "prog_statevars.h" +#include "symbol_table.h" #include "program_parser.h" #include "program_parse.tab.h" @@@ -1148,7 -1007,7 +1153,7 @@@ handle_ident(struct asm_parser_state *s } while(0); #define YY_EXTRA_TYPE struct asm_parser_state * - #line 1152 "lex.yy.c" -#line 1007 "lex.yy.c" ++#line 1157 "lex.yy.c" #define INITIAL 0 @@@ -1394,10 -1248,10 +1399,10 @@@ YY_DEC register int yy_act; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - #line 151 "program_lexer.l" -#line 136 "program_lexer.l" ++#line 156 "program_lexer.l" - #line 1401 "lex.yy.c" -#line 1251 "lex.yy.c" ++#line 1406 "lex.yy.c" yylval = yylval_param; @@@ -1486,17 -1340,17 +1491,17 @@@ do_action: /* This label is used only t case 1: YY_RULE_SETUP - #line 153 "program_lexer.l" -#line 138 "program_lexer.l" ++#line 158 "program_lexer.l" { return ARBvp_10; } YY_BREAK case 2: YY_RULE_SETUP - #line 154 "program_lexer.l" -#line 139 "program_lexer.l" ++#line 159 "program_lexer.l" { return ARBfp_10; } YY_BREAK case 3: YY_RULE_SETUP - #line 155 "program_lexer.l" -#line 140 "program_lexer.l" ++#line 160 "program_lexer.l" { yylval->integer = at_address; return_token_or_IDENTIFIER(require_ARB_vp, ADDRESS); @@@ -1504,690 -1358,768 +1509,690 @@@ YY_BREAK case 4: YY_RULE_SETUP - #line 159 "program_lexer.l" -#line 144 "program_lexer.l" ++#line 164 "program_lexer.l" { return ALIAS; } YY_BREAK case 5: YY_RULE_SETUP - #line 160 "program_lexer.l" -#line 145 "program_lexer.l" ++#line 165 "program_lexer.l" { return ATTRIB; } YY_BREAK case 6: YY_RULE_SETUP - #line 161 "program_lexer.l" -#line 146 "program_lexer.l" ++#line 166 "program_lexer.l" { return END; } YY_BREAK case 7: YY_RULE_SETUP - #line 162 "program_lexer.l" -#line 147 "program_lexer.l" ++#line 167 "program_lexer.l" { return OPTION; } YY_BREAK case 8: YY_RULE_SETUP - #line 163 "program_lexer.l" -#line 148 "program_lexer.l" ++#line 168 "program_lexer.l" { return OUTPUT; } YY_BREAK case 9: YY_RULE_SETUP - #line 164 "program_lexer.l" -#line 149 "program_lexer.l" ++#line 169 "program_lexer.l" { return PARAM; } YY_BREAK case 10: YY_RULE_SETUP - #line 165 "program_lexer.l" -#line 150 "program_lexer.l" ++#line 170 "program_lexer.l" { yylval->integer = at_temp; return TEMP; } YY_BREAK case 11: YY_RULE_SETUP - #line 167 "program_lexer.l" -#line 152 "program_lexer.l" -{ return_opcode( 1, VECTOR_OP, ABS, OFF); } ++#line 172 "program_lexer.l" +{ return_opcode( 1, VECTOR_OP, ABS, 3); } YY_BREAK case 12: YY_RULE_SETUP - #line 168 "program_lexer.l" -#line 153 "program_lexer.l" -{ return_opcode(require_ARB_fp, VECTOR_OP, ABS, ZERO_ONE); } ++#line 173 "program_lexer.l" +{ return_opcode( 1, BIN_OP, ADD, 3); } YY_BREAK case 13: YY_RULE_SETUP - #line 169 "program_lexer.l" -#line 154 "program_lexer.l" -{ return_opcode( 1, BIN_OP, ADD, OFF); } ++#line 174 "program_lexer.l" +{ return_opcode(require_ARB_vp, ARL, ARL, 3); } YY_BREAK case 14: YY_RULE_SETUP - #line 171 "program_lexer.l" -#line 155 "program_lexer.l" -{ return_opcode(require_ARB_fp, BIN_OP, ADD, ZERO_ONE); } ++#line 176 "program_lexer.l" +{ return_opcode(require_ARB_fp, TRI_OP, CMP, 3); } YY_BREAK case 15: YY_RULE_SETUP - #line 172 "program_lexer.l" -#line 156 "program_lexer.l" -{ return_opcode(require_ARB_vp, ARL, ARL, OFF); } ++#line 177 "program_lexer.l" +{ return_opcode(require_ARB_fp, SCALAR_OP, COS, 3); } YY_BREAK case 16: YY_RULE_SETUP - #line 174 "program_lexer.l" -#line 158 "program_lexer.l" -{ return_opcode(require_ARB_fp, TRI_OP, CMP, OFF); } ++#line 179 "program_lexer.l" +{ return_opcode(require_NV_fp, VECTOR_OP, DDX, 3); } YY_BREAK case 17: YY_RULE_SETUP - #line 175 "program_lexer.l" -#line 159 "program_lexer.l" -{ return_opcode(require_ARB_fp, TRI_OP, CMP, ZERO_ONE); } ++#line 180 "program_lexer.l" +{ return_opcode(require_NV_fp, VECTOR_OP, DDY, 3); } YY_BREAK case 18: YY_RULE_SETUP - #line 176 "program_lexer.l" -#line 160 "program_lexer.l" -{ return_opcode(require_ARB_fp, SCALAR_OP, COS, OFF); } ++#line 181 "program_lexer.l" +{ return_opcode( 1, BIN_OP, DP3, 3); } YY_BREAK case 19: YY_RULE_SETUP - #line 177 "program_lexer.l" -#line 161 "program_lexer.l" -{ return_opcode(require_ARB_fp, SCALAR_OP, COS, ZERO_ONE); } ++#line 182 "program_lexer.l" +{ return_opcode( 1, BIN_OP, DP4, 3); } YY_BREAK case 20: YY_RULE_SETUP - #line 178 "program_lexer.l" -#line 163 "program_lexer.l" -{ return_opcode( 1, BIN_OP, DP3, OFF); } ++#line 183 "program_lexer.l" +{ return_opcode( 1, BIN_OP, DPH, 3); } YY_BREAK case 21: YY_RULE_SETUP - #line 179 "program_lexer.l" -#line 164 "program_lexer.l" -{ return_opcode(require_ARB_fp, BIN_OP, DP3, ZERO_ONE); } ++#line 184 "program_lexer.l" +{ return_opcode( 1, BIN_OP, DST, 3); } YY_BREAK case 22: YY_RULE_SETUP - #line 181 "program_lexer.l" -#line 165 "program_lexer.l" -{ return_opcode( 1, BIN_OP, DP4, OFF); } ++#line 186 "program_lexer.l" +{ return_opcode( 1, SCALAR_OP, EX2, 3); } YY_BREAK case 23: YY_RULE_SETUP - #line 182 "program_lexer.l" -#line 166 "program_lexer.l" -{ return_opcode(require_ARB_fp, BIN_OP, DP4, ZERO_ONE); } ++#line 187 "program_lexer.l" +{ return_opcode(require_ARB_vp, SCALAR_OP, EXP, 3); } YY_BREAK case 24: YY_RULE_SETUP - #line 184 "program_lexer.l" -#line 167 "program_lexer.l" -{ return_opcode( 1, BIN_OP, DPH, OFF); } ++#line 189 "program_lexer.l" +{ return_opcode( 1, VECTOR_OP, FLR, 3); } YY_BREAK case 25: YY_RULE_SETUP - #line 185 "program_lexer.l" -#line 168 "program_lexer.l" -{ return_opcode(require_ARB_fp, BIN_OP, DPH, ZERO_ONE); } ++#line 190 "program_lexer.l" +{ return_opcode( 1, VECTOR_OP, FRC, 3); } YY_BREAK case 26: YY_RULE_SETUP - #line 187 "program_lexer.l" -#line 169 "program_lexer.l" -{ return_opcode( 1, BIN_OP, DST, OFF); } ++#line 192 "program_lexer.l" +{ return_opcode(require_ARB_fp, KIL, KIL, 3); } YY_BREAK case 27: YY_RULE_SETUP - #line 189 "program_lexer.l" -#line 170 "program_lexer.l" -{ return_opcode(require_ARB_fp, BIN_OP, DST, ZERO_ONE); } ++#line 194 "program_lexer.l" +{ return_opcode( 1, VECTOR_OP, LIT, 3); } YY_BREAK case 28: YY_RULE_SETUP - #line 190 "program_lexer.l" -#line 172 "program_lexer.l" -{ return_opcode( 1, SCALAR_OP, EX2, OFF); } ++#line 195 "program_lexer.l" +{ return_opcode( 1, SCALAR_OP, LG2, 3); } YY_BREAK case 29: YY_RULE_SETUP - #line 191 "program_lexer.l" -#line 173 "program_lexer.l" -{ return_opcode(require_ARB_fp, SCALAR_OP, EX2, ZERO_ONE); } ++#line 196 "program_lexer.l" +{ return_opcode(require_ARB_vp, SCALAR_OP, LOG, 3); } YY_BREAK case 30: YY_RULE_SETUP - #line 192 "program_lexer.l" -#line 174 "program_lexer.l" -{ return_opcode(require_ARB_vp, SCALAR_OP, EXP, OFF); } ++#line 197 "program_lexer.l" +{ return_opcode(require_ARB_fp, TRI_OP, LRP, 3); } YY_BREAK case 31: YY_RULE_SETUP - #line 194 "program_lexer.l" -#line 176 "program_lexer.l" -{ return_opcode( 1, VECTOR_OP, FLR, OFF); } ++#line 199 "program_lexer.l" +{ return_opcode( 1, TRI_OP, MAD, 3); } YY_BREAK case 32: YY_RULE_SETUP - #line 195 "program_lexer.l" -#line 177 "program_lexer.l" -{ return_opcode(require_ARB_fp, VECTOR_OP, FLR, ZERO_ONE); } ++#line 200 "program_lexer.l" +{ return_opcode( 1, BIN_OP, MAX, 3); } YY_BREAK case 33: YY_RULE_SETUP - #line 196 "program_lexer.l" -#line 178 "program_lexer.l" -{ return_opcode( 1, VECTOR_OP, FRC, OFF); } ++#line 201 "program_lexer.l" +{ return_opcode( 1, BIN_OP, MIN, 3); } YY_BREAK case 34: YY_RULE_SETUP - #line 197 "program_lexer.l" -#line 179 "program_lexer.l" -{ return_opcode(require_ARB_fp, VECTOR_OP, FRC, ZERO_ONE); } ++#line 202 "program_lexer.l" +{ return_opcode( 1, VECTOR_OP, MOV, 3); } YY_BREAK case 35: YY_RULE_SETUP - #line 198 "program_lexer.l" -#line 181 "program_lexer.l" -{ return_opcode(require_ARB_fp, KIL, KIL, OFF); } ++#line 203 "program_lexer.l" +{ return_opcode( 1, BIN_OP, MUL, 3); } YY_BREAK case 36: YY_RULE_SETUP - #line 200 "program_lexer.l" -#line 183 "program_lexer.l" -{ return_opcode( 1, VECTOR_OP, LIT, OFF); } ++#line 205 "program_lexer.l" +{ return_opcode(require_NV_fp, VECTOR_OP, PK2H, 4); } YY_BREAK case 37: YY_RULE_SETUP - #line 201 "program_lexer.l" -#line 184 "program_lexer.l" -{ return_opcode(require_ARB_fp, VECTOR_OP, LIT, ZERO_ONE); } ++#line 206 "program_lexer.l" +{ return_opcode(require_NV_fp, VECTOR_OP, PK2US, 5); } YY_BREAK case 38: YY_RULE_SETUP - #line 202 "program_lexer.l" -#line 185 "program_lexer.l" -{ return_opcode( 1, SCALAR_OP, LG2, OFF); } ++#line 207 "program_lexer.l" +{ return_opcode(require_NV_fp, VECTOR_OP, PK4B, 4); } YY_BREAK case 39: YY_RULE_SETUP - #line 203 "program_lexer.l" -#line 186 "program_lexer.l" -{ return_opcode(require_ARB_fp, SCALAR_OP, LG2, ZERO_ONE); } ++#line 208 "program_lexer.l" +{ return_opcode(require_NV_fp, VECTOR_OP, PK4UB, 5); } YY_BREAK case 40: YY_RULE_SETUP - #line 204 "program_lexer.l" -#line 187 "program_lexer.l" -{ return_opcode(require_ARB_vp, SCALAR_OP, LOG, OFF); } ++#line 209 "program_lexer.l" +{ return_opcode( 1, BINSC_OP, POW, 3); } YY_BREAK case 41: YY_RULE_SETUP - #line 206 "program_lexer.l" -#line 188 "program_lexer.l" -{ return_opcode(require_ARB_fp, TRI_OP, LRP, OFF); } ++#line 211 "program_lexer.l" +{ return_opcode( 1, SCALAR_OP, RCP, 3); } YY_BREAK case 42: YY_RULE_SETUP - #line 207 "program_lexer.l" -#line 189 "program_lexer.l" -{ return_opcode(require_ARB_fp, TRI_OP, LRP, ZERO_ONE); } ++#line 212 "program_lexer.l" +{ return_opcode(require_NV_fp, BIN_OP, RFL, 3); } YY_BREAK case 43: YY_RULE_SETUP - #line 208 "program_lexer.l" -#line 191 "program_lexer.l" -{ return_opcode( 1, TRI_OP, MAD, OFF); } ++#line 213 "program_lexer.l" +{ return_opcode( 1, SCALAR_OP, RSQ, 3); } YY_BREAK case 44: YY_RULE_SETUP - #line 210 "program_lexer.l" -#line 192 "program_lexer.l" -{ return_opcode(require_ARB_fp, TRI_OP, MAD, ZERO_ONE); } ++#line 215 "program_lexer.l" +{ return_opcode(require_ARB_fp, SCALAR_OP, SCS, 3); } YY_BREAK case 45: YY_RULE_SETUP - #line 211 "program_lexer.l" -#line 193 "program_lexer.l" -{ return_opcode( 1, BIN_OP, MAX, OFF); } ++#line 216 "program_lexer.l" +{ return_opcode(require_NV_fp, BIN_OP, SEQ, 3); } YY_BREAK case 46: YY_RULE_SETUP - #line 212 "program_lexer.l" -#line 194 "program_lexer.l" -{ return_opcode(require_ARB_fp, BIN_OP, MAX, ZERO_ONE); } ++#line 217 "program_lexer.l" +{ return_opcode(require_NV_fp, BIN_OP, SFL, 3); } YY_BREAK case 47: YY_RULE_SETUP - #line 213 "program_lexer.l" -#line 195 "program_lexer.l" -{ return_opcode( 1, BIN_OP, MIN, OFF); } ++#line 218 "program_lexer.l" +{ return_opcode( 1, BIN_OP, SGE, 3); } YY_BREAK case 48: YY_RULE_SETUP - #line 214 "program_lexer.l" -#line 196 "program_lexer.l" -{ return_opcode(require_ARB_fp, BIN_OP, MIN, ZERO_ONE); } ++#line 219 "program_lexer.l" +{ return_opcode(require_NV_fp, BIN_OP, SGT, 3); } YY_BREAK case 49: YY_RULE_SETUP - #line 215 "program_lexer.l" -#line 197 "program_lexer.l" -{ return_opcode( 1, VECTOR_OP, MOV, OFF); } ++#line 220 "program_lexer.l" +{ return_opcode(require_ARB_fp, SCALAR_OP, SIN, 3); } YY_BREAK case 50: YY_RULE_SETUP - #line 216 "program_lexer.l" -#line 198 "program_lexer.l" -{ return_opcode(require_ARB_fp, VECTOR_OP, MOV, ZERO_ONE); } ++#line 221 "program_lexer.l" +{ return_opcode(require_NV_fp, BIN_OP, SLE, 3); } YY_BREAK case 51: YY_RULE_SETUP - #line 217 "program_lexer.l" -#line 199 "program_lexer.l" -{ return_opcode( 1, BIN_OP, MUL, OFF); } ++#line 222 "program_lexer.l" +{ return_opcode( 1, BIN_OP, SLT, 3); } YY_BREAK case 52: YY_RULE_SETUP - #line 218 "program_lexer.l" -#line 200 "program_lexer.l" -{ return_opcode(require_ARB_fp, BIN_OP, MUL, ZERO_ONE); } ++#line 223 "program_lexer.l" +{ return_opcode(require_NV_fp, BIN_OP, SNE, 3); } YY_BREAK case 53: YY_RULE_SETUP - #line 219 "program_lexer.l" -#line 202 "program_lexer.l" -{ return_opcode( 1, BINSC_OP, POW, OFF); } ++#line 224 "program_lexer.l" +{ return_opcode(require_NV_fp, BIN_OP, STR, 3); } YY_BREAK case 54: YY_RULE_SETUP - #line 220 "program_lexer.l" -#line 203 "program_lexer.l" -{ return_opcode(require_ARB_fp, BINSC_OP, POW, ZERO_ONE); } ++#line 225 "program_lexer.l" +{ return_opcode( 1, BIN_OP, SUB, 3); } YY_BREAK case 55: YY_RULE_SETUP - #line 221 "program_lexer.l" -#line 205 "program_lexer.l" -{ return_opcode( 1, SCALAR_OP, RCP, OFF); } ++#line 226 "program_lexer.l" +{ return_opcode( 1, SWZ, SWZ, 3); } YY_BREAK case 56: YY_RULE_SETUP - #line 223 "program_lexer.l" -#line 206 "program_lexer.l" -{ return_opcode(require_ARB_fp, SCALAR_OP, RCP, ZERO_ONE); } ++#line 228 "program_lexer.l" +{ return_opcode(require_ARB_fp, SAMPLE_OP, TEX, 3); } YY_BREAK case 57: YY_RULE_SETUP - #line 224 "program_lexer.l" -#line 207 "program_lexer.l" -{ return_opcode( 1, SCALAR_OP, RSQ, OFF); } ++#line 229 "program_lexer.l" +{ return_opcode(require_ARB_fp, SAMPLE_OP, TXB, 3); } YY_BREAK case 58: YY_RULE_SETUP - #line 225 "program_lexer.l" -#line 208 "program_lexer.l" -{ return_opcode(require_ARB_fp, SCALAR_OP, RSQ, ZERO_ONE); } ++#line 230 "program_lexer.l" +{ return_opcode(require_NV_fp, TXD_OP, TXD, 3); } YY_BREAK case 59: YY_RULE_SETUP - #line 226 "program_lexer.l" -#line 210 "program_lexer.l" -{ return_opcode(require_ARB_fp, SCALAR_OP, SCS, OFF); } ++#line 231 "program_lexer.l" +{ return_opcode(require_ARB_fp, SAMPLE_OP, TXP, 3); } YY_BREAK case 60: YY_RULE_SETUP - #line 228 "program_lexer.l" -#line 211 "program_lexer.l" -{ return_opcode(require_ARB_fp, SCALAR_OP, SCS, ZERO_ONE); } ++#line 233 "program_lexer.l" +{ return_opcode(require_NV_fp, SCALAR_OP, UP2H, 4); } YY_BREAK case 61: YY_RULE_SETUP - #line 229 "program_lexer.l" -#line 212 "program_lexer.l" -{ return_opcode( 1, BIN_OP, SGE, OFF); } ++#line 234 "program_lexer.l" +{ return_opcode(require_NV_fp, SCALAR_OP, UP2US, 5); } YY_BREAK case 62: YY_RULE_SETUP - #line 231 "program_lexer.l" -#line 213 "program_lexer.l" -{ return_opcode(require_ARB_fp, BIN_OP, SGE, ZERO_ONE); } ++#line 236 "program_lexer.l" +{ return_opcode(require_NV_fp, TRI_OP, X2D, 3); } YY_BREAK case 63: YY_RULE_SETUP - #line 232 "program_lexer.l" -#line 214 "program_lexer.l" -{ return_opcode(require_ARB_fp, SCALAR_OP, SIN, OFF); } ++#line 237 "program_lexer.l" +{ return_opcode( 1, BIN_OP, XPD, 3); } YY_BREAK case 64: YY_RULE_SETUP - #line 234 "program_lexer.l" -#line 215 "program_lexer.l" -{ return_opcode(require_ARB_fp, SCALAR_OP, SIN, ZERO_ONE); } ++#line 239 "program_lexer.l" +{ return_token_or_IDENTIFIER(require_ARB_vp, VERTEX); } YY_BREAK case 65: YY_RULE_SETUP - #line 235 "program_lexer.l" -#line 216 "program_lexer.l" -{ return_opcode( 1, BIN_OP, SLT, OFF); } ++#line 240 "program_lexer.l" +{ return_token_or_IDENTIFIER(require_ARB_fp, FRAGMENT); } YY_BREAK case 66: YY_RULE_SETUP - #line 236 "program_lexer.l" -#line 217 "program_lexer.l" -{ return_opcode(require_ARB_fp, BIN_OP, SLT, ZERO_ONE); } ++#line 241 "program_lexer.l" +{ return PROGRAM; } YY_BREAK case 67: YY_RULE_SETUP - #line 237 "program_lexer.l" -#line 218 "program_lexer.l" -{ return_opcode( 1, BIN_OP, SUB, OFF); } ++#line 242 "program_lexer.l" +{ return STATE; } YY_BREAK case 68: YY_RULE_SETUP - #line 238 "program_lexer.l" -#line 219 "program_lexer.l" -{ return_opcode(require_ARB_fp, BIN_OP, SUB, ZERO_ONE); } ++#line 243 "program_lexer.l" +{ return RESULT; } YY_BREAK case 69: YY_RULE_SETUP - #line 240 "program_lexer.l" -#line 220 "program_lexer.l" -{ return_opcode( 1, SWZ, SWZ, OFF); } ++#line 245 "program_lexer.l" +{ return AMBIENT; } YY_BREAK case 70: YY_RULE_SETUP - #line 241 "program_lexer.l" -#line 221 "program_lexer.l" -{ return_opcode(require_ARB_fp, SWZ, SWZ, ZERO_ONE); } ++#line 246 "program_lexer.l" +{ return ATTENUATION; } YY_BREAK case 71: YY_RULE_SETUP - #line 242 "program_lexer.l" -#line 223 "program_lexer.l" -{ return_opcode(require_ARB_fp, SAMPLE_OP, TEX, OFF); } ++#line 247 "program_lexer.l" +{ return BACK; } YY_BREAK case 72: YY_RULE_SETUP - #line 243 "program_lexer.l" -#line 224 "program_lexer.l" -{ return_opcode(require_ARB_fp, SAMPLE_OP, TEX, ZERO_ONE); } ++#line 248 "program_lexer.l" +{ return_token_or_DOT(require_ARB_vp, CLIP); } YY_BREAK case 73: YY_RULE_SETUP - #line 244 "program_lexer.l" -#line 225 "program_lexer.l" -{ return_opcode(require_ARB_fp, SAMPLE_OP, TXB, OFF); } ++#line 249 "program_lexer.l" +{ return COLOR; } YY_BREAK case 74: YY_RULE_SETUP - #line 245 "program_lexer.l" -#line 226 "program_lexer.l" -{ return_opcode(require_ARB_fp, SAMPLE_OP, TXB, ZERO_ONE); } ++#line 250 "program_lexer.l" +{ return_token_or_DOT(require_ARB_fp, DEPTH); } YY_BREAK case 75: YY_RULE_SETUP - #line 246 "program_lexer.l" -#line 227 "program_lexer.l" -{ return_opcode(require_ARB_fp, SAMPLE_OP, TXP, OFF); } ++#line 251 "program_lexer.l" +{ return DIFFUSE; } YY_BREAK case 76: YY_RULE_SETUP - #line 247 "program_lexer.l" -#line 228 "program_lexer.l" -{ return_opcode(require_ARB_fp, SAMPLE_OP, TXP, ZERO_ONE); } ++#line 252 "program_lexer.l" +{ return DIRECTION; } YY_BREAK case 77: YY_RULE_SETUP - #line 248 "program_lexer.l" -#line 230 "program_lexer.l" -{ return_opcode( 1, BIN_OP, XPD, OFF); } ++#line 253 "program_lexer.l" +{ return EMISSION; } YY_BREAK case 78: YY_RULE_SETUP - #line 249 "program_lexer.l" -#line 231 "program_lexer.l" -{ return_opcode(require_ARB_fp, BIN_OP, XPD, ZERO_ONE); } ++#line 254 "program_lexer.l" +{ return ENV; } YY_BREAK case 79: YY_RULE_SETUP - #line 250 "program_lexer.l" -#line 233 "program_lexer.l" -{ return_token_or_IDENTIFIER(require_ARB_vp, VERTEX); } ++#line 255 "program_lexer.l" +{ return EYE; } YY_BREAK case 80: YY_RULE_SETUP - #line 251 "program_lexer.l" -#line 234 "program_lexer.l" -{ return_token_or_IDENTIFIER(require_ARB_fp, FRAGMENT); } ++#line 256 "program_lexer.l" +{ return FOGCOORD; } YY_BREAK case 81: YY_RULE_SETUP - #line 252 "program_lexer.l" -#line 235 "program_lexer.l" -{ return PROGRAM; } ++#line 257 "program_lexer.l" +{ return FOG; } YY_BREAK case 82: YY_RULE_SETUP - #line 253 "program_lexer.l" -#line 236 "program_lexer.l" -{ return STATE; } ++#line 258 "program_lexer.l" +{ return FRONT; } YY_BREAK case 83: YY_RULE_SETUP - #line 254 "program_lexer.l" -#line 237 "program_lexer.l" -{ return RESULT; } ++#line 259 "program_lexer.l" +{ return HALF; } YY_BREAK case 84: YY_RULE_SETUP - #line 255 "program_lexer.l" -#line 239 "program_lexer.l" -{ return AMBIENT; } ++#line 260 "program_lexer.l" +{ return INVERSE; } YY_BREAK case 85: YY_RULE_SETUP - #line 256 "program_lexer.l" -#line 240 "program_lexer.l" -{ return ATTENUATION; } ++#line 261 "program_lexer.l" +{ return INVTRANS; } YY_BREAK case 86: YY_RULE_SETUP - #line 257 "program_lexer.l" -#line 241 "program_lexer.l" -{ return BACK; } ++#line 262 "program_lexer.l" +{ return LIGHT; } YY_BREAK case 87: YY_RULE_SETUP - #line 258 "program_lexer.l" -#line 242 "program_lexer.l" -{ return_token_or_DOT(require_ARB_vp, CLIP); } ++#line 263 "program_lexer.l" +{ return LIGHTMODEL; } YY_BREAK case 88: YY_RULE_SETUP - #line 259 "program_lexer.l" -#line 243 "program_lexer.l" -{ return COLOR; } ++#line 264 "program_lexer.l" +{ return LIGHTPROD; } YY_BREAK case 89: YY_RULE_SETUP - #line 260 "program_lexer.l" -#line 244 "program_lexer.l" -{ return_token_or_DOT(require_ARB_fp, DEPTH); } ++#line 265 "program_lexer.l" +{ return LOCAL; } YY_BREAK case 90: YY_RULE_SETUP - #line 261 "program_lexer.l" -#line 245 "program_lexer.l" -{ return DIFFUSE; } ++#line 266 "program_lexer.l" +{ return MATERIAL; } YY_BREAK case 91: YY_RULE_SETUP - #line 262 "program_lexer.l" -#line 246 "program_lexer.l" -{ return DIRECTION; } ++#line 267 "program_lexer.l" +{ return MAT_PROGRAM; } YY_BREAK case 92: YY_RULE_SETUP - #line 263 "program_lexer.l" -#line 247 "program_lexer.l" -{ return EMISSION; } ++#line 268 "program_lexer.l" +{ return MATRIX; } YY_BREAK case 93: YY_RULE_SETUP - #line 264 "program_lexer.l" -#line 248 "program_lexer.l" -{ return ENV; } ++#line 269 "program_lexer.l" +{ return_token_or_DOT(require_ARB_vp, MATRIXINDEX); } YY_BREAK case 94: YY_RULE_SETUP - #line 265 "program_lexer.l" -#line 249 "program_lexer.l" -{ return EYE; } ++#line 270 "program_lexer.l" +{ return MODELVIEW; } YY_BREAK case 95: YY_RULE_SETUP - #line 266 "program_lexer.l" -#line 250 "program_lexer.l" -{ return FOGCOORD; } ++#line 271 "program_lexer.l" +{ return MVP; } YY_BREAK case 96: YY_RULE_SETUP - #line 267 "program_lexer.l" -#line 251 "program_lexer.l" -{ return FOG; } ++#line 272 "program_lexer.l" +{ return_token_or_DOT(require_ARB_vp, NORMAL); } YY_BREAK case 97: YY_RULE_SETUP - #line 268 "program_lexer.l" -#line 252 "program_lexer.l" -{ return FRONT; } ++#line 273 "program_lexer.l" +{ return OBJECT; } YY_BREAK case 98: YY_RULE_SETUP - #line 269 "program_lexer.l" -#line 253 "program_lexer.l" -{ return HALF; } ++#line 274 "program_lexer.l" +{ return PALETTE; } YY_BREAK case 99: YY_RULE_SETUP - #line 270 "program_lexer.l" -#line 254 "program_lexer.l" -{ return INVERSE; } ++#line 275 "program_lexer.l" +{ return PARAMS; } YY_BREAK case 100: YY_RULE_SETUP - #line 271 "program_lexer.l" -#line 255 "program_lexer.l" -{ return INVTRANS; } ++#line 276 "program_lexer.l" +{ return PLANE; } YY_BREAK case 101: YY_RULE_SETUP - #line 272 "program_lexer.l" - { return_token_or_DOT(require_ARB_vp, POINT); } -#line 256 "program_lexer.l" -{ return LIGHT; } ++#line 277 "program_lexer.l" ++{ return_token_or_DOT(require_ARB_vp, POINT_TOK); } YY_BREAK case 102: YY_RULE_SETUP - #line 273 "program_lexer.l" -#line 257 "program_lexer.l" -{ return LIGHTMODEL; } ++#line 278 "program_lexer.l" +{ return_token_or_DOT(require_ARB_vp, POINTSIZE); } YY_BREAK case 103: YY_RULE_SETUP - #line 274 "program_lexer.l" -#line 258 "program_lexer.l" -{ return LIGHTPROD; } ++#line 279 "program_lexer.l" +{ return POSITION; } YY_BREAK case 104: YY_RULE_SETUP - #line 275 "program_lexer.l" -#line 259 "program_lexer.l" -{ return LOCAL; } ++#line 280 "program_lexer.l" +{ return PRIMARY; } YY_BREAK case 105: YY_RULE_SETUP - #line 276 "program_lexer.l" -#line 260 "program_lexer.l" -{ return MATERIAL; } ++#line 281 "program_lexer.l" +{ return PROJECTION; } YY_BREAK case 106: YY_RULE_SETUP - #line 277 "program_lexer.l" -#line 261 "program_lexer.l" -{ return MAT_PROGRAM; } ++#line 282 "program_lexer.l" +{ return_token_or_DOT(require_ARB_fp, RANGE); } YY_BREAK case 107: YY_RULE_SETUP - #line 278 "program_lexer.l" -#line 262 "program_lexer.l" -{ return MATRIX; } ++#line 283 "program_lexer.l" +{ return ROW; } YY_BREAK case 108: YY_RULE_SETUP - #line 279 "program_lexer.l" -#line 263 "program_lexer.l" -{ return_token_or_DOT(require_ARB_vp, MATRIXINDEX); } ++#line 284 "program_lexer.l" +{ return SCENECOLOR; } YY_BREAK case 109: YY_RULE_SETUP - #line 280 "program_lexer.l" -#line 264 "program_lexer.l" -{ return MODELVIEW; } ++#line 285 "program_lexer.l" +{ return SECONDARY; } YY_BREAK case 110: YY_RULE_SETUP - #line 281 "program_lexer.l" -#line 265 "program_lexer.l" -{ return MVP; } ++#line 286 "program_lexer.l" +{ return SHININESS; } YY_BREAK case 111: YY_RULE_SETUP - #line 282 "program_lexer.l" - { return_token_or_DOT(require_ARB_vp, SIZE); } -#line 266 "program_lexer.l" -{ return_token_or_DOT(require_ARB_vp, NORMAL); } ++#line 287 "program_lexer.l" ++{ return_token_or_DOT(require_ARB_vp, SIZE_TOK); } YY_BREAK case 112: YY_RULE_SETUP - #line 283 "program_lexer.l" -#line 267 "program_lexer.l" -{ return OBJECT; } ++#line 288 "program_lexer.l" +{ return SPECULAR; } YY_BREAK case 113: YY_RULE_SETUP - #line 284 "program_lexer.l" -#line 268 "program_lexer.l" -{ return PALETTE; } ++#line 289 "program_lexer.l" +{ return SPOT; } YY_BREAK case 114: YY_RULE_SETUP - #line 285 "program_lexer.l" -#line 269 "program_lexer.l" -{ return PARAMS; } ++#line 290 "program_lexer.l" +{ return TEXCOORD; } YY_BREAK case 115: YY_RULE_SETUP - #line 286 "program_lexer.l" -#line 270 "program_lexer.l" -{ return PLANE; } ++#line 291 "program_lexer.l" +{ return_token_or_DOT(require_ARB_fp, TEXENV); } YY_BREAK case 116: YY_RULE_SETUP - #line 287 "program_lexer.l" -#line 271 "program_lexer.l" -{ return_token_or_DOT(require_ARB_vp, POINT_TOK); } ++#line 292 "program_lexer.l" +{ return_token_or_DOT(require_ARB_vp, TEXGEN); } YY_BREAK case 117: YY_RULE_SETUP - #line 288 "program_lexer.l" -#line 272 "program_lexer.l" -{ return_token_or_DOT(require_ARB_vp, POINTSIZE); } ++#line 293 "program_lexer.l" +{ return_token_or_DOT(require_ARB_vp, TEXGEN_Q); } YY_BREAK case 118: YY_RULE_SETUP - #line 289 "program_lexer.l" -#line 273 "program_lexer.l" -{ return POSITION; } ++#line 294 "program_lexer.l" +{ return_token_or_DOT(require_ARB_vp, TEXGEN_S); } YY_BREAK case 119: YY_RULE_SETUP - #line 290 "program_lexer.l" -#line 274 "program_lexer.l" -{ return PRIMARY; } ++#line 295 "program_lexer.l" +{ return_token_or_DOT(require_ARB_vp, TEXGEN_T); } YY_BREAK case 120: YY_RULE_SETUP - #line 291 "program_lexer.l" -#line 275 "program_lexer.l" -{ return PROJECTION; } ++#line 296 "program_lexer.l" +{ return TEXTURE; } YY_BREAK case 121: YY_RULE_SETUP - #line 292 "program_lexer.l" -#line 276 "program_lexer.l" -{ return_token_or_DOT(require_ARB_fp, RANGE); } ++#line 297 "program_lexer.l" +{ return TRANSPOSE; } YY_BREAK case 122: YY_RULE_SETUP - #line 293 "program_lexer.l" -#line 277 "program_lexer.l" -{ return ROW; } ++#line 298 "program_lexer.l" +{ return_token_or_DOT(require_ARB_vp, VTXATTRIB); } YY_BREAK case 123: YY_RULE_SETUP - #line 294 "program_lexer.l" -#line 278 "program_lexer.l" -{ return SCENECOLOR; } ++#line 299 "program_lexer.l" +{ return_token_or_DOT(require_ARB_vp, WEIGHT); } YY_BREAK case 124: YY_RULE_SETUP - #line 296 "program_lexer.l" -#line 279 "program_lexer.l" -{ return SECONDARY; } ++#line 301 "program_lexer.l" +{ return_token_or_IDENTIFIER(require_ARB_fp, TEXTURE_UNIT); } YY_BREAK case 125: YY_RULE_SETUP - #line 297 "program_lexer.l" -#line 280 "program_lexer.l" -{ return SHININESS; } ++#line 302 "program_lexer.l" +{ return_token_or_IDENTIFIER(require_ARB_fp, TEX_1D); } YY_BREAK case 126: YY_RULE_SETUP - #line 298 "program_lexer.l" -#line 281 "program_lexer.l" -{ return_token_or_DOT(require_ARB_vp, SIZE_TOK); } ++#line 303 "program_lexer.l" +{ return_token_or_IDENTIFIER(require_ARB_fp, TEX_2D); } YY_BREAK case 127: YY_RULE_SETUP - #line 299 "program_lexer.l" -#line 282 "program_lexer.l" -{ return SPECULAR; } ++#line 304 "program_lexer.l" +{ return_token_or_IDENTIFIER(require_ARB_fp, TEX_3D); } YY_BREAK case 128: YY_RULE_SETUP - #line 300 "program_lexer.l" -#line 283 "program_lexer.l" -{ return SPOT; } ++#line 305 "program_lexer.l" +{ return_token_or_IDENTIFIER(require_ARB_fp, TEX_CUBE); } YY_BREAK case 129: YY_RULE_SETUP - #line 301 "program_lexer.l" -#line 284 "program_lexer.l" -{ return TEXCOORD; } ++#line 306 "program_lexer.l" +{ return_token_or_IDENTIFIER(require_ARB_fp && require_rect, TEX_RECT); } YY_BREAK case 130: YY_RULE_SETUP - #line 302 "program_lexer.l" -#line 285 "program_lexer.l" -{ return_token_or_DOT(require_ARB_fp, TEXENV); } ++#line 307 "program_lexer.l" +{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow, TEX_SHADOW1D); } YY_BREAK case 131: YY_RULE_SETUP - #line 303 "program_lexer.l" -#line 286 "program_lexer.l" -{ return_token_or_DOT(require_ARB_vp, TEXGEN); } ++#line 308 "program_lexer.l" +{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow, TEX_SHADOW2D); } YY_BREAK case 132: YY_RULE_SETUP - #line 304 "program_lexer.l" -#line 287 "program_lexer.l" -{ return_token_or_DOT(require_ARB_vp, TEXGEN_Q); } ++#line 309 "program_lexer.l" +{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow && require_rect, TEX_SHADOWRECT); } YY_BREAK case 133: YY_RULE_SETUP - #line 305 "program_lexer.l" -#line 288 "program_lexer.l" -{ return_token_or_DOT(require_ARB_vp, TEXGEN_S); } ++#line 310 "program_lexer.l" +{ return_token_or_IDENTIFIER(require_ARB_fp && require_texarray, TEX_ARRAY1D); } YY_BREAK case 134: YY_RULE_SETUP - #line 306 "program_lexer.l" -#line 289 "program_lexer.l" -{ return_token_or_DOT(require_ARB_vp, TEXGEN_T); } ++#line 311 "program_lexer.l" +{ return_token_or_IDENTIFIER(require_ARB_fp && require_texarray, TEX_ARRAY2D); } YY_BREAK case 135: YY_RULE_SETUP - #line 307 "program_lexer.l" -#line 290 "program_lexer.l" -{ return TEXTURE; } ++#line 312 "program_lexer.l" +{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow && require_texarray, TEX_ARRAYSHADOW1D); } YY_BREAK case 136: YY_RULE_SETUP - #line 308 "program_lexer.l" -#line 291 "program_lexer.l" -{ return TRANSPOSE; } ++#line 313 "program_lexer.l" +{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow && require_texarray, TEX_ARRAYSHADOW2D); } YY_BREAK case 137: YY_RULE_SETUP - #line 310 "program_lexer.l" -#line 292 "program_lexer.l" -{ return_token_or_DOT(require_ARB_vp, VTXATTRIB); } ++#line 315 "program_lexer.l" +{ return handle_ident(yyextra, yytext, yylval); } YY_BREAK case 138: YY_RULE_SETUP - #line 312 "program_lexer.l" -#line 293 "program_lexer.l" -{ return_token_or_DOT(require_ARB_vp, WEIGHT); } - YY_BREAK -case 139: -YY_RULE_SETUP -#line 295 "program_lexer.l" -{ return_token_or_IDENTIFIER(require_ARB_fp, TEXTURE_UNIT); } - YY_BREAK -case 140: -YY_RULE_SETUP -#line 296 "program_lexer.l" -{ return_token_or_IDENTIFIER(require_ARB_fp, TEX_1D); } - YY_BREAK -case 141: -YY_RULE_SETUP -#line 297 "program_lexer.l" -{ return_token_or_IDENTIFIER(require_ARB_fp, TEX_2D); } - YY_BREAK -case 142: -YY_RULE_SETUP -#line 298 "program_lexer.l" -{ return_token_or_IDENTIFIER(require_ARB_fp, TEX_3D); } - YY_BREAK -case 143: -YY_RULE_SETUP -#line 299 "program_lexer.l" -{ return_token_or_IDENTIFIER(require_ARB_fp, TEX_CUBE); } - YY_BREAK -case 144: -YY_RULE_SETUP -#line 300 "program_lexer.l" -{ return_token_or_IDENTIFIER(require_ARB_fp && require_rect, TEX_RECT); } - YY_BREAK -case 145: -YY_RULE_SETUP -#line 301 "program_lexer.l" -{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow, TEX_SHADOW1D); } - YY_BREAK -case 146: -YY_RULE_SETUP -#line 302 "program_lexer.l" -{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow, TEX_SHADOW2D); } - YY_BREAK -case 147: -YY_RULE_SETUP -#line 303 "program_lexer.l" -{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow && require_rect, TEX_SHADOWRECT); } - YY_BREAK -case 148: -YY_RULE_SETUP -#line 304 "program_lexer.l" -{ return_token_or_IDENTIFIER(require_ARB_fp && require_texarray, TEX_ARRAY1D); } - YY_BREAK -case 149: -YY_RULE_SETUP -#line 305 "program_lexer.l" -{ return_token_or_IDENTIFIER(require_ARB_fp && require_texarray, TEX_ARRAY2D); } - YY_BREAK -case 150: -YY_RULE_SETUP -#line 306 "program_lexer.l" -{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow && require_texarray, TEX_ARRAYSHADOW1D); } - YY_BREAK -case 151: -YY_RULE_SETUP -#line 307 "program_lexer.l" -{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow && require_texarray, TEX_ARRAYSHADOW2D); } - YY_BREAK -case 152: -YY_RULE_SETUP -#line 309 "program_lexer.l" -{ - yylval->string = strdup(yytext); - return IDENTIFIER; -} - YY_BREAK -case 153: -YY_RULE_SETUP -#line 314 "program_lexer.l" ++#line 317 "program_lexer.l" { return DOT_DOT; } YY_BREAK -case 154: +case 139: YY_RULE_SETUP - #line 314 "program_lexer.l" -#line 316 "program_lexer.l" ++#line 319 "program_lexer.l" { yylval->integer = strtol(yytext, NULL, 10); return INTEGER; } YY_BREAK -case 155: +case 140: YY_RULE_SETUP - #line 318 "program_lexer.l" -#line 320 "program_lexer.l" ++#line 323 "program_lexer.l" { yylval->real = strtod(yytext, NULL); return REAL; @@@ -2199,40 -2131,40 +2204,40 @@@ case 141 yyg->yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP - #line 322 "program_lexer.l" -#line 324 "program_lexer.l" ++#line 327 "program_lexer.l" { yylval->real = strtod(yytext, NULL); return REAL; } YY_BREAK -case 157: +case 142: YY_RULE_SETUP - #line 326 "program_lexer.l" -#line 328 "program_lexer.l" ++#line 331 "program_lexer.l" { yylval->real = strtod(yytext, NULL); return REAL; } YY_BREAK -case 158: +case 143: YY_RULE_SETUP - #line 330 "program_lexer.l" -#line 332 "program_lexer.l" ++#line 335 "program_lexer.l" { yylval->real = strtod(yytext, NULL); return REAL; } YY_BREAK -case 159: +case 144: YY_RULE_SETUP - #line 335 "program_lexer.l" -#line 337 "program_lexer.l" ++#line 340 "program_lexer.l" { yylval->swiz_mask.swizzle = SWIZZLE_NOOP; yylval->swiz_mask.mask = WRITEMASK_XYZW; return MASK4; } YY_BREAK -case 160: +case 145: YY_RULE_SETUP - #line 341 "program_lexer.l" -#line 343 "program_lexer.l" ++#line 346 "program_lexer.l" { yylval->swiz_mask.swizzle = SWIZZLE_INVAL; yylval->swiz_mask.mask = WRITEMASK_XY @@@ -2240,27 -2172,27 +2245,27 @@@ return MASK3; } YY_BREAK -case 161: +case 146: YY_RULE_SETUP - #line 347 "program_lexer.l" -#line 349 "program_lexer.l" ++#line 352 "program_lexer.l" { yylval->swiz_mask.swizzle = SWIZZLE_INVAL; yylval->swiz_mask.mask = WRITEMASK_XZW; return MASK3; } YY_BREAK -case 162: +case 147: YY_RULE_SETUP - #line 352 "program_lexer.l" -#line 354 "program_lexer.l" ++#line 357 "program_lexer.l" { yylval->swiz_mask.swizzle = SWIZZLE_INVAL; yylval->swiz_mask.mask = WRITEMASK_YZW; return MASK3; } YY_BREAK -case 163: +case 148: YY_RULE_SETUP - #line 358 "program_lexer.l" -#line 360 "program_lexer.l" ++#line 363 "program_lexer.l" { yylval->swiz_mask.swizzle = SWIZZLE_INVAL; yylval->swiz_mask.mask = WRITEMASK_X @@@ -2268,9 -2200,9 +2273,9 @@@ return MASK2; } YY_BREAK -case 164: +case 149: YY_RULE_SETUP - #line 364 "program_lexer.l" -#line 366 "program_lexer.l" ++#line 369 "program_lexer.l" { yylval->swiz_mask.swizzle = SWIZZLE_INVAL; yylval->swiz_mask.mask = WRITEMASK_Y @@@ -2278,18 -2210,18 +2283,18 @@@ return MASK2; } YY_BREAK -case 165: +case 150: YY_RULE_SETUP - #line 370 "program_lexer.l" -#line 372 "program_lexer.l" ++#line 375 "program_lexer.l" { yylval->swiz_mask.swizzle = SWIZZLE_INVAL; yylval->swiz_mask.mask = WRITEMASK_ZW; return MASK2; } YY_BREAK -case 166: +case 151: YY_RULE_SETUP - #line 376 "program_lexer.l" -#line 378 "program_lexer.l" ++#line 381 "program_lexer.l" { const unsigned s = swiz_from_char(yytext[1]); yylval->swiz_mask.swizzle = MAKE_SWIZZLE4(s, s, s, s); @@@ -2297,9 -2229,9 +2302,9 @@@ return MASK1; } YY_BREAK -case 167: +case 152: YY_RULE_SETUP - #line 383 "program_lexer.l" -#line 385 "program_lexer.l" ++#line 388 "program_lexer.l" { yylval->swiz_mask.swizzle = MAKE_SWIZZLE4(swiz_from_char(yytext[1]), swiz_from_char(yytext[2]), @@@ -2309,18 -2241,18 +2314,18 @@@ return SWIZZLE; } YY_BREAK -case 168: +case 153: YY_RULE_SETUP - #line 392 "program_lexer.l" -#line 394 "program_lexer.l" ++#line 397 "program_lexer.l" { yylval->swiz_mask.swizzle = SWIZZLE_NOOP; yylval->swiz_mask.mask = WRITEMASK_XYZW; return_token_or_DOT(require_ARB_fp, MASK4); } YY_BREAK -case 169: +case 154: YY_RULE_SETUP - #line 398 "program_lexer.l" -#line 400 "program_lexer.l" ++#line 403 "program_lexer.l" { yylval->swiz_mask.swizzle = SWIZZLE_INVAL; yylval->swiz_mask.mask = WRITEMASK_XY @@@ -2328,27 -2260,27 +2333,27 @@@ return_token_or_DOT(require_ARB_fp, MASK3); } YY_BREAK -case 170: +case 155: YY_RULE_SETUP - #line 404 "program_lexer.l" -#line 406 "program_lexer.l" ++#line 409 "program_lexer.l" { yylval->swiz_mask.swizzle = SWIZZLE_INVAL; yylval->swiz_mask.mask = WRITEMASK_XZW; return_token_or_DOT(require_ARB_fp, MASK3); } YY_BREAK -case 171: +case 156: YY_RULE_SETUP - #line 409 "program_lexer.l" -#line 411 "program_lexer.l" ++#line 414 "program_lexer.l" { yylval->swiz_mask.swizzle = SWIZZLE_INVAL; yylval->swiz_mask.mask = WRITEMASK_YZW; return_token_or_DOT(require_ARB_fp, MASK3); } YY_BREAK -case 172: +case 157: YY_RULE_SETUP - #line 415 "program_lexer.l" -#line 417 "program_lexer.l" ++#line 420 "program_lexer.l" { yylval->swiz_mask.swizzle = SWIZZLE_INVAL; yylval->swiz_mask.mask = WRITEMASK_X @@@ -2356,9 -2288,9 +2361,9 @@@ return_token_or_DOT(require_ARB_fp, MASK2); } YY_BREAK -case 173: +case 158: YY_RULE_SETUP - #line 421 "program_lexer.l" -#line 423 "program_lexer.l" ++#line 426 "program_lexer.l" { yylval->swiz_mask.swizzle = SWIZZLE_INVAL; yylval->swiz_mask.mask = WRITEMASK_Y @@@ -2366,18 -2298,18 +2371,18 @@@ return_token_or_DOT(require_ARB_fp, MASK2); } YY_BREAK -case 174: +case 159: YY_RULE_SETUP - #line 427 "program_lexer.l" -#line 429 "program_lexer.l" ++#line 432 "program_lexer.l" { yylval->swiz_mask.swizzle = SWIZZLE_INVAL; yylval->swiz_mask.mask = WRITEMASK_ZW; return_token_or_DOT(require_ARB_fp, MASK2); } YY_BREAK -case 175: +case 160: YY_RULE_SETUP - #line 433 "program_lexer.l" -#line 435 "program_lexer.l" ++#line 438 "program_lexer.l" { const unsigned s = swiz_from_char(yytext[1]); yylval->swiz_mask.swizzle = MAKE_SWIZZLE4(s, s, s, s); @@@ -2385,9 -2317,9 +2390,9 @@@ return_token_or_DOT(require_ARB_fp, MASK1); } YY_BREAK -case 176: +case 161: YY_RULE_SETUP - #line 441 "program_lexer.l" -#line 443 "program_lexer.l" ++#line 446 "program_lexer.l" { if (require_ARB_vp) { return TEXGEN_R; @@@ -2399,9 -2331,9 +2404,9 @@@ } } YY_BREAK -case 177: +case 162: YY_RULE_SETUP - #line 452 "program_lexer.l" -#line 454 "program_lexer.l" ++#line 457 "program_lexer.l" { yylval->swiz_mask.swizzle = MAKE_SWIZZLE4(swiz_from_char(yytext[1]), swiz_from_char(yytext[2]), @@@ -2411,15 -2343,15 +2416,15 @@@ return_token_or_DOT(require_ARB_fp, SWIZZLE); } YY_BREAK -case 178: +case 163: YY_RULE_SETUP - #line 461 "program_lexer.l" -#line 463 "program_lexer.l" ++#line 466 "program_lexer.l" { return DOT; } YY_BREAK -case 179: -/* rule 179 can match eol */ +case 164: +/* rule 164 can match eol */ YY_RULE_SETUP - #line 463 "program_lexer.l" -#line 465 "program_lexer.l" ++#line 468 "program_lexer.l" { yylloc->first_line++; yylloc->first_column = 1; @@@ -2428,30 -2360,30 +2433,30 @@@ yylloc->position++; } YY_BREAK -case 180: +case 165: YY_RULE_SETUP - #line 470 "program_lexer.l" -#line 472 "program_lexer.l" ++#line 475 "program_lexer.l" /* eat whitespace */ ; YY_BREAK -case 181: +case 166: *yy_cp = yyg->yy_hold_char; /* undo effects of setting up yytext */ yyg->yy_c_buf_p = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP - #line 471 "program_lexer.l" -#line 473 "program_lexer.l" ++#line 476 "program_lexer.l" /* eat comments */ ; YY_BREAK -case 182: +case 167: YY_RULE_SETUP - #line 472 "program_lexer.l" -#line 474 "program_lexer.l" ++#line 477 "program_lexer.l" { return yytext[0]; } YY_BREAK -case 183: +case 168: YY_RULE_SETUP - #line 473 "program_lexer.l" -#line 475 "program_lexer.l" ++#line 478 "program_lexer.l" ECHO; YY_BREAK - #line 2455 "lex.yy.c" -#line 2383 "lex.yy.c" ++#line 2460 "lex.yy.c" case YY_STATE_EOF(INITIAL): yyterminate(); @@@ -3626,7 -3558,7 +3631,7 @@@ void yyfree (void * ptr , yyscan_t yysc #define YYTABLES_NAME "yytables" - #line 473 "program_lexer.l" -#line 475 "program_lexer.l" ++#line 478 "program_lexer.l" diff --cc src/mesa/shader/program_lexer.l index a0d1af1e07a,612f99a42d0..750c6acf42c --- a/src/mesa/shader/program_lexer.l +++ b/src/mesa/shader/program_lexer.l @@@ -23,8 -23,8 +23,9 @@@ */ #include "main/glheader.h" #include "prog_instruction.h" + #include "prog_statevars.h" +#include "symbol_table.h" #include "program_parser.h" #include "program_parse.tab.h" diff --cc src/mesa/shader/program_parse.tab.c index 33195c0b165,9f2d4de90fc..c51b4d2f282 --- a/src/mesa/shader/program_parse.tab.c +++ b/src/mesa/shader/program_parse.tab.c @@@ -225,92 -216,90 +225,92 @@@ static struct asm_instruction *asm_inst ARL = 274, KIL = 275, SWZ = 276, - INTEGER = 277, - REAL = 278, - AMBIENT = 279, - ATTENUATION = 280, - BACK = 281, - CLIP = 282, - COLOR = 283, - DEPTH = 284, - DIFFUSE = 285, - DIRECTION = 286, - EMISSION = 287, - ENV = 288, - EYE = 289, - FOG = 290, - FOGCOORD = 291, - FRAGMENT = 292, - FRONT = 293, - HALF = 294, - INVERSE = 295, - INVTRANS = 296, - LIGHT = 297, - LIGHTMODEL = 298, - LIGHTPROD = 299, - LOCAL = 300, - MATERIAL = 301, - MAT_PROGRAM = 302, - MATRIX = 303, - MATRIXINDEX = 304, - MODELVIEW = 305, - MVP = 306, - NORMAL = 307, - OBJECT = 308, - PALETTE = 309, - PARAMS = 310, - PLANE = 311, - POINT_TOK = 312, - POINTSIZE = 313, - POSITION = 314, - PRIMARY = 315, - PROGRAM = 316, - PROJECTION = 317, - RANGE = 318, - RESULT = 319, - ROW = 320, - SCENECOLOR = 321, - SECONDARY = 322, - SHININESS = 323, - SIZE_TOK = 324, - SPECULAR = 325, - SPOT = 326, - STATE = 327, - TEXCOORD = 328, - TEXENV = 329, - TEXGEN = 330, - TEXGEN_Q = 331, - TEXGEN_R = 332, - TEXGEN_S = 333, - TEXGEN_T = 334, - TEXTURE = 335, - TRANSPOSE = 336, - TEXTURE_UNIT = 337, - TEX_1D = 338, - TEX_2D = 339, - TEX_3D = 340, - TEX_CUBE = 341, - TEX_RECT = 342, - TEX_SHADOW1D = 343, - TEX_SHADOW2D = 344, - TEX_SHADOWRECT = 345, - TEX_ARRAY1D = 346, - TEX_ARRAY2D = 347, - TEX_ARRAYSHADOW1D = 348, - TEX_ARRAYSHADOW2D = 349, - VERTEX = 350, - VTXATTRIB = 351, - WEIGHT = 352, - IDENTIFIER = 353, - MASK4 = 354, - MASK3 = 355, - MASK2 = 356, - MASK1 = 357, - SWIZZLE = 358, - DOT_DOT = 359, - DOT = 360 + TXD_OP = 277, + INTEGER = 278, + REAL = 279, + AMBIENT = 280, + ATTENUATION = 281, + BACK = 282, + CLIP = 283, + COLOR = 284, + DEPTH = 285, + DIFFUSE = 286, + DIRECTION = 287, + EMISSION = 288, + ENV = 289, + EYE = 290, + FOG = 291, + FOGCOORD = 292, + FRAGMENT = 293, + FRONT = 294, + HALF = 295, + INVERSE = 296, + INVTRANS = 297, + LIGHT = 298, + LIGHTMODEL = 299, + LIGHTPROD = 300, + LOCAL = 301, + MATERIAL = 302, + MAT_PROGRAM = 303, + MATRIX = 304, + MATRIXINDEX = 305, + MODELVIEW = 306, + MVP = 307, + NORMAL = 308, + OBJECT = 309, + PALETTE = 310, + PARAMS = 311, + PLANE = 312, - POINT = 313, ++ POINT_TOK = 313, + POINTSIZE = 314, + POSITION = 315, + PRIMARY = 316, + PROGRAM = 317, + PROJECTION = 318, + RANGE = 319, + RESULT = 320, + ROW = 321, + SCENECOLOR = 322, + SECONDARY = 323, + SHININESS = 324, - SIZE = 325, ++ SIZE_TOK = 325, + SPECULAR = 326, + SPOT = 327, + STATE = 328, + TEXCOORD = 329, + TEXENV = 330, + TEXGEN = 331, + TEXGEN_Q = 332, + TEXGEN_R = 333, + TEXGEN_S = 334, + TEXGEN_T = 335, + TEXTURE = 336, + TRANSPOSE = 337, + TEXTURE_UNIT = 338, + TEX_1D = 339, + TEX_2D = 340, + TEX_3D = 341, + TEX_CUBE = 342, + TEX_RECT = 343, + TEX_SHADOW1D = 344, + TEX_SHADOW2D = 345, + TEX_SHADOWRECT = 346, + TEX_ARRAY1D = 347, + TEX_ARRAY2D = 348, + TEX_ARRAYSHADOW1D = 349, + TEX_ARRAYSHADOW2D = 350, + VERTEX = 351, + VTXATTRIB = 352, + WEIGHT = 353, + IDENTIFIER = 354, + USED_IDENTIFIER = 355, + MASK4 = 356, + MASK3 = 357, + MASK2 = 358, + MASK1 = 359, + SWIZZLE = 360, + DOT_DOT = 361, + DOT = 362 }; #endif @@@ -598,16 -587,16 +598,16 @@@ union yyallo /* YYFINAL -- State number of the termination state. */ #define YYFINAL 5 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 342 +#define YYLAST 396 /* YYNTOKENS -- Number of terminals. */ -#define YYNTOKENS 115 +#define YYNTOKENS 120 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 134 +#define YYNNTS 143 /* YYNRULES -- Number of rules. */ -#define YYNRULES 264 +#define YYNRULES 282 /* YYNRULES -- Number of states. */ - #define YYNSTATES 473 -#define YYNSTATES 436 ++#define YYNSTATES 475 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@@ -665,118 -654,110 +665,118 @@@ static const yytype_uint16 yyprhs[] { 0, 0, 3, 8, 10, 12, 15, 16, 20, 23, 24, 27, 30, 32, 34, 36, 38, 40, 42, 44, - 46, 48, 50, 52, 57, 62, 67, 74, 81, 90, - 99, 102, 105, 107, 109, 111, 113, 115, 117, 119, - 121, 123, 125, 127, 129, 136, 140, 144, 147, 150, - 158, 161, 163, 165, 167, 169, 174, 176, 178, 180, - 182, 184, 186, 188, 192, 193, 196, 199, 201, 203, - 205, 207, 209, 211, 213, 215, 217, 218, 220, 222, - 224, 226, 227, 229, 231, 233, 235, 237, 239, 244, - 247, 250, 252, 255, 257, 260, 262, 265, 270, 275, - 277, 278, 282, 284, 286, 289, 291, 294, 296, 298, - 302, 309, 310, 312, 315, 320, 322, 326, 328, 330, - 332, 334, 336, 338, 340, 342, 344, 346, 349, 352, - 355, 358, 361, 364, 367, 370, 373, 376, 379, 382, - 386, 388, 390, 392, 398, 400, 402, 404, 407, 409, - 411, 414, 416, 419, 426, 428, 432, 434, 436, 438, - 440, 442, 447, 449, 451, 453, 455, 457, 459, 462, - 464, 466, 472, 474, 477, 479, 481, 487, 490, 491, - 498, 502, 503, 505, 507, 509, 511, 513, 516, 518, - 520, 523, 528, 533, 534, 538, 540, 542, 544, 547, - 549, 551, 553, 555, 561, 563, 567, 573, 579, 581, - 585, 591, 593, 595, 597, 599, 601, 603, 605, 607, - 609, 613, 619, 627, 637, 640, 643, 645, 647, 648, - 649, 653, 654, 658, 662, 664, 669, 672, 675, 678, - 681, 685, 688, 692, 693, 695, 697, 698, 700, 702, - 703, 705, 707, 708, 710, 712, 713, 717, 718, 722, - 723, 727, 729, 731, 733 + 46, 48, 50, 52, 54, 59, 64, 69, 76, 83, + 92, 101, 104, 107, 120, 123, 125, 127, 129, 131, + 133, 135, 137, 139, 141, 143, 145, 147, 154, 157, + 162, 165, 167, 171, 177, 181, 184, 192, 195, 197, + 199, 201, 203, 208, 210, 212, 214, 216, 218, 220, + 222, 226, 227, 230, 233, 235, 237, 239, 241, 243, + 245, 247, 249, 251, 252, 254, 256, 258, 260, 261, + 265, 269, 270, 273, 276, 278, 280, 282, 284, 286, + 288, 290, 292, 297, 300, 303, 305, 308, 310, 313, + 315, 318, 323, 328, 330, 331, 335, 337, 339, 342, + 344, 347, 349, 351, 355, 362, 363, 365, 368, 373, + 375, 379, 381, 383, 385, 387, 389, 391, 393, 395, + 397, 399, 402, 405, 408, 411, 414, 417, 420, 423, + 426, 429, 432, 435, 439, 441, 443, 445, 451, 453, + 455, 457, 460, 462, 464, 467, 469, 472, 479, 481, + 485, 487, 489, 491, 493, 495, 500, 502, 504, 506, + 508, 510, 512, 515, 517, 519, 525, 527, 530, 532, + 534, 540, 543, 544, 551, 555, 556, 558, 560, 562, - 564, 566, 569, 571, 573, 576, 581, 586, 587, 589, - 591, 593, 595, 598, 600, 602, 604, 606, 612, 614, - 618, 624, 630, 632, 636, 642, 644, 646, 648, 650, - 652, 654, 656, 658, 660, 664, 670, 678, 688, 691, - 694, 696, 698, 699, 700, 705, 707, 708, 709, 713, - 717, 719, 725, 728, 731, 734, 737, 741, 744, 748, - 749, 751, 753, 754, 756, 758, 759, 761, 763, 764, - 766, 768, 769, 773, 774, 778, 779, 783, 785, 787, - 789, 794, 796 ++ 564, 566, 569, 571, 573, 576, 581, 586, 587, 591, ++ 593, 595, 597, 600, 602, 604, 606, 608, 614, 616, ++ 620, 626, 632, 634, 638, 644, 646, 648, 650, 652, ++ 654, 656, 658, 660, 662, 666, 672, 680, 690, 693, ++ 696, 698, 700, 701, 702, 707, 709, 710, 711, 715, ++ 719, 721, 727, 730, 733, 736, 739, 743, 746, 750, ++ 751, 753, 755, 756, 758, 760, 761, 763, 765, 766, ++ 768, 770, 771, 775, 776, 780, 781, 785, 787, 789, ++ 791, 796, 798 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ static const yytype_int16 yyrhs[] = { - 116, 0, -1, 117, 118, 120, 12, -1, 3, -1, - 4, -1, 118, 119, -1, -1, 8, 98, 106, -1, - 120, 121, -1, -1, 122, 106, -1, 158, 106, -1, - 123, -1, 124, -1, 125, -1, 126, -1, 127, -1, - 128, -1, 129, -1, 130, -1, 135, -1, 131, -1, - 132, -1, 19, 139, 107, 136, -1, 18, 138, 107, - 137, -1, 16, 138, 107, 136, -1, 14, 138, 107, - 136, 107, 136, -1, 13, 138, 107, 137, 107, 137, - -1, 17, 138, 107, 137, 107, 137, 107, 137, -1, - 15, 138, 107, 137, 107, 133, 107, 134, -1, 20, - 137, -1, 82, 243, -1, 83, -1, 84, -1, 85, - -1, 86, -1, 87, -1, 88, -1, 89, -1, 90, - -1, 91, -1, 92, -1, 93, -1, 94, -1, 21, - 138, 107, 143, 107, 140, -1, 229, 143, 155, -1, - 229, 143, 156, -1, 144, 157, -1, 152, 154, -1, - 141, 107, 141, 107, 141, 107, 141, -1, 229, 142, - -1, 22, -1, 98, -1, 98, -1, 160, -1, 145, - 108, 146, 109, -1, 174, -1, 236, -1, 98, -1, - 98, -1, 147, -1, 148, -1, 22, -1, 152, 153, - 149, -1, -1, 110, 150, -1, 111, 151, -1, 22, - -1, 22, -1, 98, -1, 102, -1, 102, -1, 102, - -1, 102, -1, 99, -1, 103, -1, -1, 99, -1, - 100, -1, 101, -1, 102, -1, -1, 159, -1, 166, - -1, 230, -1, 232, -1, 235, -1, 248, -1, 7, - 98, 112, 160, -1, 95, 161, -1, 37, 165, -1, - 59, -1, 97, 163, -1, 52, -1, 28, 241, -1, - 36, -1, 73, 242, -1, 49, 108, 164, 109, -1, - 96, 108, 162, 109, -1, 22, -1, -1, 108, 164, - 109, -1, 22, -1, 59, -1, 28, 241, -1, 36, - -1, 73, 242, -1, 167, -1, 168, -1, 10, 98, - 170, -1, 10, 98, 108, 169, 109, 171, -1, -1, - 22, -1, 112, 173, -1, 112, 113, 172, 114, -1, - 175, -1, 172, 107, 175, -1, 177, -1, 213, -1, - 223, -1, 177, -1, 213, -1, 224, -1, 176, -1, - 214, -1, 223, -1, 177, -1, 72, 201, -1, 72, - 178, -1, 72, 180, -1, 72, 183, -1, 72, 185, - -1, 72, 191, -1, 72, 187, -1, 72, 194, -1, - 72, 196, -1, 72, 198, -1, 72, 200, -1, 72, - 212, -1, 46, 240, 179, -1, 189, -1, 32, -1, - 68, -1, 42, 108, 190, 109, 181, -1, 189, -1, - 59, -1, 25, -1, 71, 182, -1, 39, -1, 31, - -1, 43, 184, -1, 24, -1, 240, 66, -1, 44, - 108, 190, 109, 240, 186, -1, 189, -1, 74, 244, - 188, -1, 28, -1, 24, -1, 30, -1, 70, -1, - 22, -1, 75, 242, 192, 193, -1, 34, -1, 53, - -1, 78, -1, 79, -1, 77, -1, 76, -1, 35, - 195, -1, 28, -1, 55, -1, 27, 108, 197, 109, - 56, -1, 22, -1, 57, 199, -1, 69, -1, 25, - -1, 203, 65, 108, 206, 109, -1, 203, 202, -1, - -1, 65, 108, 206, 104, 206, 109, -1, 48, 207, - 204, -1, -1, 205, -1, 40, -1, 81, -1, 41, - -1, 22, -1, 50, 208, -1, 62, -1, 51, -1, - 80, 242, -1, 54, 108, 210, 109, -1, 47, 108, - 211, 109, -1, -1, 108, 209, 109, -1, 22, -1, - 22, -1, 22, -1, 29, 63, -1, 217, -1, 220, - -1, 215, -1, 218, -1, 61, 33, 108, 216, 109, - -1, 221, -1, 221, 104, 221, -1, 61, 33, 108, - 221, 109, -1, 61, 45, 108, 219, 109, -1, 222, - -1, 222, 104, 222, -1, 61, 45, 108, 222, 109, - -1, 22, -1, 22, -1, 225, -1, 227, -1, 226, - -1, 227, -1, 228, -1, 23, -1, 22, -1, 113, - 228, 114, -1, 113, 228, 107, 228, 114, -1, 113, - 228, 107, 228, 107, 228, 114, -1, 113, 228, 107, - 228, 107, 228, 107, 228, 114, -1, 229, 23, -1, - 229, 22, -1, 110, -1, 111, -1, -1, -1, 11, - 231, 234, -1, -1, 5, 233, 234, -1, 234, 107, - 98, -1, 98, -1, 9, 98, 112, 236, -1, 64, - 59, -1, 64, 36, -1, 64, 237, -1, 64, 58, - -1, 64, 73, 242, -1, 64, 29, -1, 28, 238, - 239, -1, -1, 38, -1, 26, -1, -1, 60, -1, - 67, -1, -1, 38, -1, 26, -1, -1, 60, -1, - 67, -1, -1, 108, 245, 109, -1, -1, 108, 246, - 109, -1, -1, 108, 247, 109, -1, 22, -1, 22, - -1, 22, -1, 6, 98, 112, 98, -1 + 121, 0, -1, 122, 123, 125, 12, -1, 3, -1, + 4, -1, 123, 124, -1, -1, 8, 262, 108, -1, + 125, 126, -1, -1, 127, 108, -1, 170, 108, -1, + 128, -1, 129, -1, 130, -1, 131, -1, 132, -1, + 133, -1, 134, -1, 135, -1, 141, -1, 136, -1, + 137, -1, 138, -1, 19, 146, 109, 142, -1, 18, + 145, 109, 144, -1, 16, 145, 109, 142, -1, 14, + 145, 109, 142, 109, 142, -1, 13, 145, 109, 144, + 109, 144, -1, 17, 145, 109, 144, 109, 144, 109, + 144, -1, 15, 145, 109, 144, 109, 139, 109, 140, + -1, 20, 144, -1, 20, 166, -1, 22, 145, 109, + 144, 109, 144, 109, 144, 109, 139, 109, 140, -1, + 83, 256, -1, 84, -1, 85, -1, 86, -1, 87, + -1, 88, -1, 89, -1, 90, -1, 91, -1, 92, + -1, 93, -1, 94, -1, 95, -1, 21, 145, 109, + 150, 109, 147, -1, 241, 143, -1, 241, 110, 143, + 110, -1, 150, 162, -1, 238, -1, 241, 150, 163, + -1, 241, 110, 150, 163, 110, -1, 151, 164, 165, + -1, 159, 161, -1, 148, 109, 148, 109, 148, 109, + 148, -1, 241, 149, -1, 23, -1, 262, -1, 100, + -1, 172, -1, 152, 111, 153, 112, -1, 186, -1, + 249, -1, 100, -1, 100, -1, 154, -1, 155, -1, + 23, -1, 159, 160, 156, -1, -1, 113, 157, -1, + 114, 158, -1, 23, -1, 23, -1, 100, -1, 104, + -1, 104, -1, 104, -1, 104, -1, 101, -1, 105, + -1, -1, 101, -1, 102, -1, 103, -1, 104, -1, + -1, 115, 166, 116, -1, 115, 167, 116, -1, -1, + 168, 163, -1, 169, 163, -1, 99, -1, 100, -1, + 171, -1, 178, -1, 242, -1, 245, -1, 248, -1, + 261, -1, 7, 99, 117, 172, -1, 96, 173, -1, + 38, 177, -1, 60, -1, 98, 175, -1, 53, -1, + 29, 254, -1, 37, -1, 74, 255, -1, 50, 111, + 176, 112, -1, 97, 111, 174, 112, -1, 23, -1, + -1, 111, 176, 112, -1, 23, -1, 60, -1, 29, + 254, -1, 37, -1, 74, 255, -1, 179, -1, 180, + -1, 10, 99, 182, -1, 10, 99, 111, 181, 112, + 183, -1, -1, 23, -1, 117, 185, -1, 117, 118, + 184, 119, -1, 187, -1, 184, 109, 187, -1, 189, + -1, 225, -1, 235, -1, 189, -1, 225, -1, 236, + -1, 188, -1, 226, -1, 235, -1, 189, -1, 73, + 213, -1, 73, 190, -1, 73, 192, -1, 73, 195, + -1, 73, 197, -1, 73, 203, -1, 73, 199, -1, + 73, 206, -1, 73, 208, -1, 73, 210, -1, 73, + 212, -1, 73, 224, -1, 47, 253, 191, -1, 201, + -1, 33, -1, 69, -1, 43, 111, 202, 112, 193, + -1, 201, -1, 60, -1, 26, -1, 72, 194, -1, + 40, -1, 32, -1, 44, 196, -1, 25, -1, 253, + 67, -1, 45, 111, 202, 112, 253, 198, -1, 201, + -1, 75, 257, 200, -1, 29, -1, 25, -1, 31, + -1, 71, -1, 23, -1, 76, 255, 204, 205, -1, + 35, -1, 54, -1, 79, -1, 80, -1, 78, -1, + 77, -1, 36, 207, -1, 29, -1, 56, -1, 28, + 111, 209, 112, 57, -1, 23, -1, 58, 211, -1, + 70, -1, 26, -1, 215, 66, 111, 218, 112, -1, + 215, 214, -1, -1, 66, 111, 218, 106, 218, 112, + -1, 49, 219, 216, -1, -1, 217, -1, 41, -1, + 82, -1, 42, -1, 23, -1, 51, 220, -1, 63, + -1, 52, -1, 81, 255, -1, 55, 111, 222, 112, - -1, 48, 111, 223, 112, -1, -1, 221, -1, 23, - -1, 23, -1, 23, -1, 30, 64, -1, 229, -1, - 232, -1, 227, -1, 230, -1, 62, 34, 111, 228, - 112, -1, 233, -1, 233, 106, 233, -1, 62, 34, - 111, 233, 112, -1, 62, 46, 111, 231, 112, -1, - 234, -1, 234, 106, 234, -1, 62, 46, 111, 234, - 112, -1, 23, -1, 23, -1, 237, -1, 239, -1, - 238, -1, 239, -1, 240, -1, 24, -1, 23, -1, - 118, 240, 119, -1, 118, 240, 109, 240, 119, -1, - 118, 240, 109, 240, 109, 240, 119, -1, 118, 240, - 109, 240, 109, 240, 109, 240, 119, -1, 241, 24, - -1, 241, 23, -1, 113, -1, 114, -1, -1, -1, - 244, 11, 243, 247, -1, 262, -1, -1, -1, 5, - 246, 247, -1, 247, 109, 99, -1, 99, -1, 244, - 9, 99, 117, 249, -1, 65, 60, -1, 65, 37, - -1, 65, 250, -1, 65, 59, -1, 65, 74, 255, - -1, 65, 30, -1, 29, 251, 252, -1, -1, 39, - -1, 27, -1, -1, 61, -1, 68, -1, -1, 39, - -1, 27, -1, -1, 61, -1, 68, -1, -1, 111, - 258, 112, -1, -1, 111, 259, 112, -1, -1, 111, - 260, 112, -1, 23, -1, 23, -1, 23, -1, 6, - 99, 117, 100, -1, 99, -1, 100, -1 ++ -1, 48, 111, 223, 112, -1, -1, 111, 221, 112, ++ -1, 23, -1, 23, -1, 23, -1, 30, 64, -1, ++ 229, -1, 232, -1, 227, -1, 230, -1, 62, 34, ++ 111, 228, 112, -1, 233, -1, 233, 106, 233, -1, ++ 62, 34, 111, 233, 112, -1, 62, 46, 111, 231, ++ 112, -1, 234, -1, 234, 106, 234, -1, 62, 46, ++ 111, 234, 112, -1, 23, -1, 23, -1, 237, -1, ++ 239, -1, 238, -1, 239, -1, 240, -1, 24, -1, ++ 23, -1, 118, 240, 119, -1, 118, 240, 109, 240, ++ 119, -1, 118, 240, 109, 240, 109, 240, 119, -1, ++ 118, 240, 109, 240, 109, 240, 109, 240, 119, -1, ++ 241, 24, -1, 241, 23, -1, 113, -1, 114, -1, ++ -1, -1, 244, 11, 243, 247, -1, 262, -1, -1, ++ -1, 5, 246, 247, -1, 247, 109, 99, -1, 99, ++ -1, 244, 9, 99, 117, 249, -1, 65, 60, -1, ++ 65, 37, -1, 65, 250, -1, 65, 59, -1, 65, ++ 74, 255, -1, 65, 30, -1, 29, 251, 252, -1, ++ -1, 39, -1, 27, -1, -1, 61, -1, 68, -1, ++ -1, 39, -1, 27, -1, -1, 61, -1, 68, -1, ++ -1, 111, 258, 112, -1, -1, 111, 259, 112, -1, ++ -1, 111, 260, 112, -1, 23, -1, 23, -1, 23, ++ -1, 6, 99, 117, 100, -1, 99, -1, 100, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ @@@ -822,14 -801,14 +822,14 @@@ static const char *const yytname[] "$end", "error", "$undefined", "ARBvp_10", "ARBfp_10", "ADDRESS", "ALIAS", "ATTRIB", "OPTION", "OUTPUT", "PARAM", "TEMP", "END", "BIN_OP", "BINSC_OP", "SAMPLE_OP", "SCALAR_OP", "TRI_OP", "VECTOR_OP", "ARL", - "KIL", "SWZ", "INTEGER", "REAL", "AMBIENT", "ATTENUATION", "BACK", - "CLIP", "COLOR", "DEPTH", "DIFFUSE", "DIRECTION", "EMISSION", "ENV", - "EYE", "FOG", "FOGCOORD", "FRAGMENT", "FRONT", "HALF", "INVERSE", + "KIL", "SWZ", "TXD_OP", "INTEGER", "REAL", "AMBIENT", "ATTENUATION", + "BACK", "CLIP", "COLOR", "DEPTH", "DIFFUSE", "DIRECTION", "EMISSION", + "ENV", "EYE", "FOG", "FOGCOORD", "FRAGMENT", "FRONT", "HALF", "INVERSE", "INVTRANS", "LIGHT", "LIGHTMODEL", "LIGHTPROD", "LOCAL", "MATERIAL", "MAT_PROGRAM", "MATRIX", "MATRIXINDEX", "MODELVIEW", "MVP", "NORMAL", - "OBJECT", "PALETTE", "PARAMS", "PLANE", "POINT", "POINTSIZE", "POSITION", - "PRIMARY", "PROGRAM", "PROJECTION", "RANGE", "RESULT", "ROW", - "SCENECOLOR", "SECONDARY", "SHININESS", "SIZE", "SPECULAR", "SPOT", + "OBJECT", "PALETTE", "PARAMS", "PLANE", "POINT_TOK", "POINTSIZE", + "POSITION", "PRIMARY", "PROGRAM", "PROJECTION", "RANGE", "RESULT", "ROW", + "SCENECOLOR", "SECONDARY", "SHININESS", "SIZE_TOK", "SPECULAR", "SPOT", "STATE", "TEXCOORD", "TEXENV", "TEXGEN", "TEXGEN_Q", "TEXGEN_R", "TEXGEN_S", "TEXGEN_T", "TEXTURE", "TRANSPOSE", "TEXTURE_UNIT", "TEX_1D", "TEX_2D", "TEX_3D", "TEX_CUBE", "TEX_RECT", "TEX_SHADOW1D", @@@ -942,33 -917,31 +942,33 @@@ static const yytype_uint8 yyr2[] { 0, 2, 4, 1, 1, 2, 0, 3, 2, 0, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 4, 4, 4, 6, 6, 8, 8, - 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 6, 3, 3, 2, 2, 7, - 2, 1, 1, 1, 1, 4, 1, 1, 1, 1, - 1, 1, 1, 3, 0, 2, 2, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, - 1, 0, 1, 1, 1, 1, 1, 1, 4, 2, - 2, 1, 2, 1, 2, 1, 2, 4, 4, 1, - 0, 3, 1, 1, 2, 1, 2, 1, 1, 3, - 6, 0, 1, 2, 4, 1, 3, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, - 1, 1, 1, 5, 1, 1, 1, 2, 1, 1, - 2, 1, 2, 6, 1, 3, 1, 1, 1, 1, - 1, 4, 1, 1, 1, 1, 1, 1, 2, 1, - 1, 5, 1, 2, 1, 1, 5, 2, 0, 6, - 3, 0, 1, 1, 1, 1, 1, 2, 1, 1, - 2, 4, 4, 0, 3, 1, 1, 1, 2, 1, - 1, 1, 1, 5, 1, 3, 5, 5, 1, 3, - 5, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 3, 5, 7, 9, 2, 2, 1, 1, 0, 0, - 3, 0, 3, 3, 1, 4, 2, 2, 2, 2, - 3, 2, 3, 0, 1, 1, 0, 1, 1, 0, - 1, 1, 0, 1, 1, 0, 3, 0, 3, 0, - 3, 1, 1, 1, 4 + 1, 1, 1, 1, 4, 4, 4, 6, 6, 8, + 8, 2, 2, 12, 2, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 6, 2, 4, + 2, 1, 3, 5, 3, 2, 7, 2, 1, 1, + 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, + 3, 0, 2, 2, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 0, 1, 1, 1, 1, 0, 3, + 3, 0, 2, 2, 1, 1, 1, 1, 1, 1, + 1, 1, 4, 2, 2, 1, 2, 1, 2, 1, + 2, 4, 4, 1, 0, 3, 1, 1, 2, 1, + 2, 1, 1, 3, 6, 0, 1, 2, 4, 1, + 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 3, 1, 1, 1, 5, 1, 1, + 1, 2, 1, 1, 2, 1, 2, 6, 1, 3, + 1, 1, 1, 1, 1, 4, 1, 1, 1, 1, + 1, 1, 2, 1, 1, 5, 1, 2, 1, 1, + 5, 2, 0, 6, 3, 0, 1, 1, 1, 1, - 1, 2, 1, 1, 2, 4, 4, 0, 1, 1, ++ 1, 2, 1, 1, 2, 4, 4, 0, 3, 1, + 1, 1, 2, 1, 1, 1, 1, 5, 1, 3, + 5, 5, 1, 3, 5, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 3, 5, 7, 9, 2, 2, + 1, 1, 0, 0, 4, 1, 0, 0, 3, 3, + 1, 5, 2, 2, 2, 2, 3, 2, 3, 0, + 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, + 1, 0, 3, 0, 3, 0, 3, 1, 1, 1, + 4, 1, 1 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@@ -976,296 -949,272 +976,296 @@@ means the default is an error. */ static const yytype_uint16 yydefact[] = { - 0, 3, 4, 0, 6, 1, 9, 0, 5, 0, - 0, 231, 0, 0, 0, 0, 229, 2, 0, 0, - 0, 0, 0, 0, 0, 228, 0, 8, 0, 12, - 13, 14, 15, 16, 17, 18, 19, 21, 22, 20, - 0, 82, 83, 107, 108, 84, 85, 86, 87, 7, - 0, 0, 0, 0, 0, 0, 0, 58, 0, 81, - 57, 0, 0, 0, 0, 0, 69, 0, 0, 226, - 227, 30, 0, 0, 10, 11, 234, 232, 0, 0, - 0, 111, 228, 109, 230, 243, 241, 237, 239, 236, - 255, 238, 228, 77, 78, 79, 80, 47, 228, 228, - 228, 228, 228, 228, 71, 48, 219, 218, 0, 0, - 0, 0, 53, 228, 76, 0, 54, 56, 120, 121, - 199, 200, 122, 215, 216, 0, 0, 264, 88, 235, - 112, 0, 113, 117, 118, 119, 213, 214, 217, 0, - 245, 244, 246, 0, 240, 0, 0, 0, 0, 25, - 0, 24, 23, 252, 105, 103, 255, 90, 0, 0, - 0, 0, 0, 0, 249, 0, 249, 0, 0, 259, - 255, 128, 129, 130, 131, 133, 132, 134, 135, 136, - 137, 0, 138, 252, 95, 0, 93, 91, 255, 0, - 100, 89, 0, 74, 73, 75, 46, 0, 0, 233, - 0, 225, 224, 247, 248, 242, 261, 0, 228, 228, - 0, 0, 228, 253, 254, 104, 106, 0, 0, 0, - 198, 169, 170, 168, 0, 151, 251, 250, 150, 0, - 0, 0, 0, 193, 189, 0, 188, 255, 181, 175, - 174, 173, 0, 0, 0, 0, 94, 0, 96, 0, - 0, 92, 228, 220, 62, 0, 60, 61, 0, 228, - 0, 110, 256, 27, 26, 72, 45, 257, 0, 0, - 211, 0, 212, 0, 172, 0, 160, 0, 152, 0, - 157, 158, 141, 142, 159, 139, 140, 0, 0, 187, - 0, 190, 183, 185, 184, 180, 182, 263, 0, 156, - 155, 162, 163, 0, 0, 102, 0, 99, 0, 0, - 0, 55, 70, 64, 44, 0, 0, 228, 0, 31, - 0, 228, 206, 210, 0, 0, 249, 197, 0, 195, - 0, 196, 0, 260, 167, 166, 164, 165, 161, 186, - 0, 97, 98, 101, 228, 221, 0, 0, 63, 228, - 51, 52, 50, 0, 0, 0, 115, 123, 126, 124, - 201, 202, 125, 262, 0, 32, 33, 34, 35, 36, - 37, 38, 39, 40, 41, 42, 43, 29, 28, 171, - 146, 148, 145, 0, 143, 144, 0, 192, 194, 191, - 176, 0, 67, 65, 68, 66, 0, 0, 0, 127, - 178, 228, 114, 258, 149, 147, 153, 154, 228, 222, - 228, 0, 0, 0, 177, 116, 0, 0, 0, 204, - 0, 208, 0, 223, 228, 203, 0, 207, 0, 0, - 49, 205, 209, 0, 0, 179 + 0, 3, 4, 0, 6, 1, 9, 0, 5, 246, + 281, 282, 0, 247, 0, 0, 0, 2, 0, 0, + 0, 0, 0, 0, 0, 242, 0, 0, 8, 0, + 12, 13, 14, 15, 16, 17, 18, 19, 21, 22, + 23, 20, 0, 96, 97, 121, 122, 98, 0, 99, + 100, 101, 245, 7, 0, 0, 0, 0, 0, 65, + 0, 88, 64, 0, 0, 0, 0, 0, 76, 0, + 0, 94, 240, 241, 31, 32, 83, 0, 0, 0, + 10, 11, 0, 243, 250, 248, 0, 0, 125, 242, + 123, 259, 257, 253, 255, 252, 271, 254, 242, 84, + 85, 86, 87, 91, 242, 242, 242, 242, 242, 242, + 78, 55, 81, 80, 82, 92, 233, 232, 0, 0, + 0, 0, 60, 0, 242, 83, 0, 61, 63, 134, + 135, 213, 214, 136, 229, 230, 0, 242, 0, 0, + 0, 280, 102, 126, 0, 127, 131, 132, 133, 227, + 228, 231, 0, 261, 260, 262, 0, 256, 0, 0, + 54, 0, 0, 0, 26, 0, 25, 24, 268, 119, + 117, 271, 104, 0, 0, 0, 0, 0, 0, 265, + 0, 265, 0, 0, 275, 271, 142, 143, 144, 145, + 147, 146, 148, 149, 150, 151, 0, 152, 268, 109, + 0, 107, 105, 271, 0, 114, 103, 83, 0, 52, + 0, 0, 0, 0, 244, 249, 0, 239, 238, 263, + 264, 258, 277, 0, 242, 95, 0, 0, 83, 242, + 0, 48, 0, 51, 0, 242, 269, 270, 118, 120, + 0, 0, 0, 212, 183, 184, 182, 0, 165, 267, + 266, 164, 0, 0, 0, 0, 207, 203, 0, 202, + 271, 195, 189, 188, 187, 0, 0, 0, 0, 108, + 0, 110, 0, 0, 106, 0, 242, 234, 69, 0, + 67, 68, 0, 242, 242, 251, 0, 124, 272, 28, + 89, 90, 93, 27, 0, 79, 50, 273, 0, 0, + 225, 0, 226, 0, 186, 0, 174, 0, 166, 0, - 171, 172, 155, 156, 173, 153, 154, 0, 209, 201, - 208, 0, 204, 197, 199, 198, 194, 196, 279, 0, - 170, 169, 176, 177, 0, 0, 116, 0, 113, 0, - 0, 53, 0, 62, 77, 71, 47, 0, 0, 0, - 242, 49, 0, 34, 0, 242, 220, 224, 0, 0, - 265, 211, 0, 210, 0, 276, 181, 180, 178, 179, - 175, 200, 0, 111, 112, 115, 242, 235, 0, 0, - 70, 242, 58, 57, 59, 242, 0, 0, 0, 129, - 137, 140, 138, 215, 216, 139, 278, 0, 35, 36, - 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, - 30, 29, 185, 160, 162, 159, 0, 157, 158, 0, - 206, 205, 190, 0, 74, 72, 75, 73, 0, 0, - 0, 0, 141, 192, 242, 128, 274, 163, 161, 167, - 168, 242, 236, 242, 0, 0, 0, 0, 191, 130, - 0, 0, 0, 0, 218, 0, 222, 0, 237, 242, - 0, 217, 0, 221, 0, 0, 56, 33, 219, 223, - 0, 0, 193 ++ 171, 172, 155, 156, 173, 153, 154, 0, 0, 201, ++ 0, 204, 197, 199, 198, 194, 196, 279, 0, 170, ++ 169, 176, 177, 0, 0, 116, 0, 113, 0, 0, ++ 53, 0, 62, 77, 71, 47, 0, 0, 0, 242, ++ 49, 0, 34, 0, 242, 220, 224, 0, 0, 265, ++ 211, 0, 209, 0, 210, 0, 276, 181, 180, 178, ++ 179, 175, 200, 0, 111, 112, 115, 242, 235, 0, ++ 0, 70, 242, 58, 57, 59, 242, 0, 0, 0, ++ 129, 137, 140, 138, 215, 216, 139, 278, 0, 35, ++ 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, ++ 46, 30, 29, 185, 160, 162, 159, 0, 157, 158, ++ 0, 206, 208, 205, 190, 0, 74, 72, 75, 73, ++ 0, 0, 0, 0, 141, 192, 242, 128, 274, 163, ++ 161, 167, 168, 242, 236, 242, 0, 0, 0, 0, ++ 191, 130, 0, 0, 0, 0, 218, 0, 222, 0, ++ 237, 242, 0, 217, 0, 221, 0, 0, 56, 33, ++ 219, 223, 0, 0, 193 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 3, 4, 6, 8, 9, 27, 28, 29, 30, - 31, 32, 33, 34, 35, 36, 37, 38, 268, 377, - 39, 146, 71, 58, 67, 314, 315, 352, 114, 59, - 115, 255, 256, 257, 348, 393, 395, 68, 313, 105, - 266, 196, 97, 40, 41, 116, 191, 308, 251, 306, - 157, 42, 43, 44, 131, 83, 261, 355, 132, 117, - 356, 357, 118, 171, 285, 172, 384, 405, 173, 228, - 174, 406, 175, 300, 286, 277, 176, 303, 338, 177, - 223, 178, 275, 179, 241, 180, 399, 414, 181, 295, - 296, 340, 238, 289, 330, 332, 328, 182, 119, 359, - 360, 418, 120, 361, 420, 121, 271, 273, 362, 122, - 136, 123, 124, 138, 72, 45, 55, 46, 50, 77, - 47, 60, 91, 142, 205, 229, 215, 144, 319, 243, - 207, 364, 298, 48 + -1, 3, 4, 6, 8, 9, 28, 29, 30, 31, + 32, 33, 34, 35, 36, 37, 38, 39, 40, 298, - 410, 41, 161, 231, 74, 60, 69, 346, 347, 383, - 232, 61, 126, 279, 280, 281, 380, 425, 427, 70, - 345, 111, 296, 115, 103, 160, 75, 227, 76, 228, - 42, 43, 127, 206, 339, 274, 337, 172, 44, 45, - 46, 144, 90, 287, 388, 145, 128, 389, 390, 129, - 186, 315, 187, 417, 438, 188, 251, 189, 439, 190, - 331, 316, 307, 191, 334, 370, 192, 246, 193, 305, - 194, 264, 195, 432, 448, 196, 326, 327, 372, 261, - 319, 320, 364, 362, 197, 130, 392, 393, 453, 131, - 394, 455, 132, 301, 303, 395, 133, 149, 134, 135, ++ 411, 41, 161, 231, 74, 60, 69, 345, 346, 384, ++ 232, 61, 126, 279, 280, 281, 381, 427, 429, 70, ++ 344, 111, 296, 115, 103, 160, 75, 227, 76, 228, ++ 42, 43, 127, 206, 338, 274, 336, 172, 44, 45, ++ 46, 144, 90, 287, 389, 145, 128, 390, 391, 129, ++ 186, 315, 187, 418, 440, 188, 251, 189, 441, 190, ++ 330, 316, 307, 191, 333, 371, 192, 246, 193, 305, ++ 194, 264, 195, 434, 450, 196, 325, 326, 373, 261, ++ 319, 363, 365, 361, 197, 130, 393, 394, 455, 131, ++ 395, 457, 132, 301, 303, 396, 133, 149, 134, 135, + 151, 77, 47, 139, 48, 49, 54, 85, 50, 62, - 97, 155, 221, 252, 238, 157, 353, 266, 223, 397, - 329, 51, 12 ++ 97, 155, 221, 252, 238, 157, 352, 266, 223, 398, ++ 328, 51, 12 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ - #define YYPACT_NINF -387 -#define YYPACT_NINF -369 ++#define YYPACT_NINF -401 static const yytype_int16 yypact[] = { - 202, -387, -387, 67, -387, -387, 73, -73, -387, 24, - -387, -387, -4, -387, 78, 84, 127, -387, -18, -18, - -18, -18, -18, -18, 66, 44, -18, -18, -387, 138, - -387, -387, -387, -387, -387, -387, -387, -387, -387, -387, - -387, -387, 144, -387, -387, -387, -387, -387, 236, -387, - -387, -387, -387, -387, 154, 140, 141, 10, 133, -387, - 145, 136, -387, 150, 151, 155, 156, 157, -387, 158, - 166, -387, -387, -387, -387, -387, 131, -13, 159, 162, - -387, -387, 173, -387, -387, 165, 175, 23, 232, 0, - -387, 125, -387, -387, -387, -387, 167, -387, 116, -387, - -387, -387, -387, 161, 116, 116, 116, 116, 116, 116, - -387, -387, -387, -387, -387, -387, -387, -387, 105, 98, - 92, 19, 168, 30, 116, 131, 169, -387, -387, -387, - -387, -387, -387, -387, -387, -387, 30, 116, 160, 154, - 174, -387, -387, -387, 170, -387, -387, -387, -387, -387, - -387, -387, 210, -387, -387, 134, 258, -387, 176, 149, - -387, 177, -10, 179, -387, 180, -387, -387, 135, -387, - -387, 167, -387, 172, 182, 183, 220, 46, 184, 106, - 185, 146, 123, 7, 186, 167, -387, -387, -387, -387, - -387, -387, -387, -387, -387, -387, 224, -387, 135, -387, - 187, -387, -387, 167, 189, 190, -387, 131, -45, -387, - 1, 193, 194, 226, 165, -387, 188, -387, -387, -387, - -387, -387, -387, 192, 116, -387, 191, 195, 131, 116, - 30, -387, 204, 205, 223, 116, -387, -387, -387, -387, - 287, 289, 290, -387, -387, -387, -387, 291, -387, -387, - -387, -387, 248, 291, 128, 206, 293, -387, 207, -387, - 167, 16, -387, -387, -387, 296, 294, 45, 209, -387, - 299, -387, 301, 299, -387, 215, 116, -387, -387, 214, - -387, -387, 225, 116, 116, -387, 212, -387, -387, -387, - -387, -387, -387, -387, 217, -387, -387, 221, 219, 222, - -387, 227, -387, 228, -387, 229, -387, 231, -387, 237, - -387, -387, -387, -387, -387, -387, -387, 310, -387, -387, - -387, 311, -387, -387, -387, -387, -387, -387, -387, 238, - -387, -387, -387, -387, 164, 312, -387, 239, -387, 241, - 243, -387, 63, -387, -387, 137, -387, 235, -15, 247, - 33, -387, 313, -387, 124, 116, -387, -387, 280, 129, - 146, -387, 245, -387, 246, -387, -387, -387, -387, -387, - -387, -387, 249, -387, -387, -387, 116, -387, 315, 325, - -387, 116, -387, -387, -387, 116, 142, 92, 71, -387, - -387, -387, -387, -387, -387, -387, -387, 250, -387, -387, - -387, -387, -387, -387, -387, -387, -387, -387, -387, -387, - -387, -387, -387, -387, -387, -387, 327, -387, -387, 40, - -387, -387, -387, 72, -387, -387, -387, -387, 251, 254, - 253, 255, -387, 302, 33, -387, -387, -387, -387, -387, - -387, 116, -387, 116, 223, 287, 289, 256, -387, -387, - 252, 260, 263, 261, 259, 262, 269, 312, -387, 116, - 124, -387, 287, -387, 289, 119, -387, -387, -387, -387, - 312, 264, -387 - 143, -369, -369, 36, -369, -369, 45, -39, -369, 169, - -33, -369, -19, -6, -4, 12, -369, -369, -34, -34, - -34, -34, -34, -34, 15, 62, -34, -369, 26, -369, - -369, -369, -369, -369, -369, -369, -369, -369, -369, -369, - 60, -369, -369, -369, -369, -369, -369, -369, -369, -369, - 20, 56, 107, 110, 37, 20, -3, -369, 111, 109, - -369, 113, 114, 116, 117, 118, -369, 119, 125, -369, - -369, -369, -15, 121, -369, -369, -369, 122, 132, -18, - 167, 210, -11, -369, 122, 63, -369, -369, -369, -369, - 130, -369, 62, -369, -369, -369, -369, -369, 62, 62, - 62, 62, 62, 62, -369, -369, -369, -369, 9, 72, - 87, -1, 131, 62, 104, 134, -369, -369, -369, -369, - -369, -369, -369, -369, -369, -15, 142, -369, -369, -369, - -369, 135, -369, -369, -369, -369, -369, -369, -369, 182, - -369, -369, 52, 219, -369, 138, 139, -15, 140, -369, - 141, -369, -369, 61, -369, -369, 130, -369, 144, 145, - 146, 180, 11, 147, 85, 148, 99, 89, -2, 149, - 130, -369, -369, -369, -369, -369, -369, -369, -369, -369, - -369, 184, -369, 61, -369, 150, -369, -369, 130, 151, - 152, -369, 27, -369, -369, -369, -369, -10, 154, -369, - 153, -369, -369, -369, -369, -369, -369, 155, 62, 62, - 161, 168, 62, -369, -369, -369, -369, 229, 244, 246, - -369, -369, -369, -369, 247, -369, -369, -369, -369, 204, - 247, 17, 163, 164, -369, 165, -369, 130, 67, -369, - -369, -369, 252, 248, 18, 170, -369, 253, -369, 255, - 253, -369, 62, -369, -369, 171, -369, -369, 177, 62, - 172, -369, -369, -369, -369, -369, -369, 173, 175, 176, - -369, 178, -369, 179, -369, 181, -369, 183, -369, 185, - -369, -369, -369, -369, -369, -369, -369, 262, 264, -369, - 267, -369, -369, -369, -369, -369, -369, -369, 186, -369, - -369, -369, -369, 136, 269, -369, 187, -369, 188, 190, - 43, -369, -369, 106, -369, 193, -5, -7, 271, -369, - 108, 62, -369, -369, 245, 4, 99, -369, 194, -369, - 195, -369, 196, -369, -369, -369, -369, -369, -369, -369, - 197, -369, -369, -369, 62, -369, 280, 285, -369, 62, - -369, -369, -369, 93, 87, 53, -369, -369, -369, -369, - -369, -369, -369, -369, 199, -369, -369, -369, -369, -369, - -369, -369, -369, -369, -369, -369, -369, -369, -369, -369, - -369, -369, -369, 278, -369, -369, 8, -369, -369, -369, - -369, 57, -369, -369, -369, -369, 203, 205, 206, -369, - 250, -7, -369, -369, -369, -369, -369, -369, 62, -369, - 62, 229, 244, 208, -369, -369, 198, 211, 202, 213, - 214, 218, 269, -369, 62, -369, 229, -369, 244, 54, - -369, -369, -369, 269, 215, -369 ++ 193, -401, -401, 27, -401, -401, 62, 143, -401, 24, ++ -401, -401, -30, -401, -18, 12, 83, -401, 15, 15, ++ 15, 15, 15, 15, 67, 61, 15, 15, -401, 127, ++ -401, -401, -401, -401, -401, -401, -401, -401, -401, -401, ++ -401, -401, 144, -401, -401, -401, -401, -401, 204, -401, ++ -401, -401, -401, -401, 155, 136, 138, 34, 140, -401, ++ 147, 108, -401, 150, 156, 157, 158, 160, -401, 162, ++ 159, -401, -401, -401, -401, -401, 102, -13, 163, 164, ++ -401, -401, 165, -401, -401, 166, 170, 10, 235, 0, ++ -401, 141, -401, -401, -401, -401, 167, -401, 131, -401, ++ -401, -401, -401, 168, 131, 131, 131, 131, 131, 131, ++ -401, -401, -401, -401, -401, -401, -401, -401, 104, 97, ++ 114, 38, 169, 30, 131, 102, 171, -401, -401, -401, ++ -401, -401, -401, -401, -401, -401, 30, 131, 172, 155, ++ 175, -401, -401, -401, 173, -401, -401, -401, -401, -401, ++ -401, -401, 223, -401, -401, 123, 253, -401, 177, 149, ++ -401, 178, -10, 181, -401, 182, -401, -401, 134, -401, ++ -401, 167, -401, 183, 184, 185, 213, 99, 186, 154, ++ 187, 146, 153, 7, 188, 167, -401, -401, -401, -401, ++ -401, -401, -401, -401, -401, -401, 215, -401, 134, -401, ++ 190, -401, -401, 167, 191, 192, -401, 102, -48, -401, ++ 1, 195, 196, 214, 166, -401, 189, -401, -401, -401, ++ -401, -401, -401, 180, 131, -401, 194, 197, 102, 131, ++ 30, -401, 203, 205, 201, 131, -401, -401, -401, -401, ++ 285, 288, 289, -401, -401, -401, -401, 291, -401, -401, ++ -401, -401, 248, 291, 33, 206, 207, -401, 208, -401, ++ 167, 14, -401, -401, -401, 293, 292, 92, 209, -401, ++ 299, -401, 301, 299, -401, 216, 131, -401, -401, 217, ++ -401, -401, 221, 131, 131, -401, 212, -401, -401, -401, ++ -401, -401, -401, -401, 218, -401, -401, 220, 224, 225, ++ -401, 226, -401, 227, -401, 228, -401, 230, -401, 231, ++ -401, -401, -401, -401, -401, -401, -401, 304, 309, -401, ++ 312, -401, -401, -401, -401, -401, -401, -401, 232, -401, ++ -401, -401, -401, 161, 313, -401, 233, -401, 234, 238, ++ -401, 13, -401, -401, 137, -401, 242, -15, 243, 3, ++ -401, 314, -401, 133, 131, -401, -401, 296, 94, 146, ++ -401, 245, -401, 246, -401, 247, -401, -401, -401, -401, ++ -401, -401, -401, 249, -401, -401, -401, 131, -401, 332, ++ 337, -401, 131, -401, -401, -401, 131, 142, 114, 28, ++ -401, -401, -401, -401, -401, -401, -401, -401, 250, -401, ++ -401, -401, -401, -401, -401, -401, -401, -401, -401, -401, ++ -401, -401, -401, -401, -401, -401, -401, 331, -401, -401, ++ 68, -401, -401, -401, -401, 43, -401, -401, -401, -401, ++ 255, 256, 257, 258, -401, 300, 3, -401, -401, -401, ++ -401, -401, -401, 131, -401, 131, 201, 285, 288, 259, ++ -401, -401, 252, 264, 265, 263, 261, 266, 270, 313, ++ -401, 131, 133, -401, 285, -401, 288, 80, -401, -401, ++ -401, -401, 313, 267, -401 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -387, -387, -387, -387, -387, -387, -387, -387, -387, -387, - -387, -387, -387, -387, -387, -387, -387, -387, -387, -67, - -82, -387, -100, 152, -86, 201, -387, -387, -365, -387, - -11, -387, -387, -387, -387, -387, -387, -387, -387, 171, - -387, -387, -387, -118, -387, -387, 230, -387, -387, -387, - -387, -387, 292, -387, -387, -387, 107, -387, -387, -387, - -387, -387, -387, -387, -387, -387, -387, -51, -387, -88, - -387, -387, -387, -387, -387, -387, -387, -387, -387, -387, - -387, -304, 132, -387, -387, -387, -387, -387, -387, -387, - -387, -387, -387, -387, -387, -3, -387, -387, -361, -387, - -387, -387, -387, -387, -387, 297, -387, -387, -387, -387, - -387, -387, -387, -386, -376, 298, -387, -387, -139, -87, - -120, -89, -387, -387, -387, -387, -387, 257, -387, 178, - -387, -387, -387, -176, 196, -153, -387, -387, -387, -387, - -387, -387, -6 - -369, -369, -369, -369, -369, -369, -369, -369, -369, -369, - -369, -369, -369, -369, -369, -369, -369, -369, -369, -369, - -369, -94, -88, 133, -369, -369, -334, -369, -85, -369, - -369, -369, -369, -369, -369, -369, -369, 128, -369, -369, - -369, -369, -369, -369, -369, 251, -369, -369, -369, 77, - -369, -369, -369, -369, -369, -369, -369, -369, -369, -369, - -72, -369, -81, -369, -369, -369, -369, -369, -369, -369, - -369, -369, -369, -369, -305, 101, -369, -369, -369, -369, - -369, -369, -369, -369, -369, -369, -369, -369, -22, -369, - -369, -336, -369, -369, -369, -369, -369, -369, 254, -369, - -369, -369, -369, -369, -369, -369, -342, -368, 256, -369, - -369, -369, -80, -110, -82, -369, -369, -369, -369, 279, - -369, 257, -369, -369, -369, -161, 156, -146, -369, -369, - -369, -369, -369, -369 ++ -401, -401, -401, -401, -401, -401, -401, -401, -401, -401, ++ -401, -401, -401, -401, -401, -401, -401, -401, -401, -69, ++ -82, -401, -100, 151, -86, 210, -401, -401, -366, -401, ++ -54, -401, -401, -401, -401, -401, -401, -401, -401, 174, ++ -401, -401, -401, -118, -401, -401, 229, -401, -401, -401, ++ -401, -401, 295, -401, -401, -401, 110, -401, -401, -401, ++ -401, -401, -401, -401, -401, -401, -401, -51, -401, -88, ++ -401, -401, -401, -401, -401, -401, -401, -401, -401, -401, ++ -401, -311, 139, -401, -401, -401, -401, -401, -401, -401, ++ -401, -401, -401, -401, -401, -2, -401, -401, -400, -401, ++ -401, -401, -401, -401, -401, 298, -401, -401, -401, -401, ++ -401, -401, -401, -390, -295, 302, -401, -401, -136, -87, ++ -120, -89, -401, -401, -401, -401, -401, 251, -401, 176, ++ -401, -401, -401, -176, 198, -153, -401, -401, -401, -401, ++ -401, -401, -6 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule which number is the opposite. If zero, do what YYDEFACT says. If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -60 +#define YYTABLE_NINF -230 static const yytype_int16 yytable[] = { - 152, 146, 150, 52, 208, 254, 164, 209, 382, 167, - 116, 117, 158, 116, 117, 162, 428, 162, 239, 163, - 162, 165, 166, 233, 278, 118, 10, 11, 118, 13, - 139, 133, 137, 192, 145, 231, 149, 106, 107, 152, - 216, 148, 254, 150, 151, 396, 147, 350, 147, 108, - 385, 147, 108, 239, 244, 85, 86, 183, 280, 380, - 56, 139, 280, 87, 281, 184, 5, 153, 281, 221, - 198, 280, 248, 381, 421, 154, 109, 281, 185, 282, - 109, 186, 301, 7, 353, 88, 89, 110, 187, 10, - 432, 110, 210, 382, 57, 354, 222, 240, 155, 419, - 90, 302, 188, 49, 284, 383, 417, 111, 284, 51, - 111, 407, 156, 112, 431, 283, 429, 284, 66, 140, - 430, 291, 52, 351, 53, 189, 190, 434, 113, 69, - 70, 141, 113, 69, 70, 158, 113, 292, 293, 225, - 54, 226, 203, 66, 160, 264, 161, 159, 76, 204, - 263, 213, 162, 227, 269, 226, 397, 147, 214, 163, - 164, 165, 74, 166, 252, 167, 232, 227, 398, 233, - 234, 253, 310, 235, 168, 81, 1, 2, 294, 82, - 344, 236, 61, 62, 63, 64, 65, 345, 433, 73, - 401, 169, 170, 390, 408, 386, 75, 402, 78, 237, - 139, 409, 69, 70, 11, 12, 13, 316, 14, 15, - 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, - 26, 365, 366, 367, 368, 369, 370, 371, 372, 373, - 374, 375, 376, 193, 201, 202, 194, 195, 93, 94, - 95, 96, 334, 335, 336, 337, 346, 347, 92, 79, - 98, 99, 80, 100, 101, 102, 103, 104, 125, 126, - 127, 56, 130, 378, 391, 139, 358, 137, 143, -59, - 199, 206, 197, 220, 200, 208, 209, 211, 212, 245, - 267, 270, 217, 218, 219, 224, 230, 242, 247, 249, - 250, 259, 139, 265, 262, 260, 272, 316, 274, 276, - 278, 287, 288, 290, 297, 305, 299, 307, 304, 312, - 311, 318, 320, 321, 327, 317, 329, 322, 323, 331, - 324, 339, 325, 363, 326, 333, 341, 342, 416, 343, - 349, 379, 392, 387, 388, 389, 390, 394, 403, 404, - 410, 425, 423, 411, 412, 413, 422, 426, 424, 139, - 358, 137, 428, 427, 435, 258, 139, 309, 316, 415, - 128, 279, 400, 0, 84, 0, 134, 129, 135, 246, - 0, 0, 316 ++ 152, 146, 150, 52, 208, 254, 164, 209, 383, 167, ++ 116, 117, 158, 116, 117, 162, 430, 162, 239, 163, ++ 162, 165, 166, 125, 278, 118, 233, 5, 118, 13, + 14, 15, 267, 262, 16, 152, 17, 18, 19, 20, - 21, 22, 23, 24, 25, 26, 27, 58, 198, 119, - 271, 212, 119, 116, 117, 418, 199, 323, 324, 454, - 120, 118, 119, 120, 276, 310, 125, 5, 118, 200, - 456, 311, 201, 120, 277, 244, 468, 263, 451, 202, - 332, 7, 59, 121, 10, 11, 121, 122, 469, 275, - 122, 233, 119, 203, 466, 386, 465, 123, 325, 333, - 230, 68, 245, 120, 53, 124, 387, 322, 124, 471, - 292, 314, 207, 72, 73, 440, 204, 205, 124, 121, - 175, 88, 176, 10, 11, 211, 121, 89, 177, 293, - 122, 248, 173, 249, 168, 178, 179, 180, 289, 181, - 162, 182, 169, 71, 174, 250, 72, 73, 124, 299, - 183, 124, 153, 310, 310, 413, 342, 72, 73, 311, - 311, 312, 91, 92, 154, 170, 68, 184, 185, 414, - 93, 255, 376, 249, 256, 257, 430, 55, 258, 171, - 434, 441, 377, 56, 419, 250, 259, 152, 431, 415, - 435, 442, 94, 95, 348, 219, 236, 313, 349, 314, - 314, 416, 220, 237, 260, 1, 2, 96, 398, 399, - 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, - 63, 64, 65, 66, 67, 470, 57, 78, 79, 72, - 73, 422, 112, 217, 218, 113, 114, 99, 100, 101, - 102, 366, 367, 368, 369, 82, 80, 83, 71, 225, - 378, 379, 81, 84, 98, 143, 423, 86, 87, 104, - 105, 152, 391, 150, 106, 107, 108, 109, 136, 411, - 110, 137, 138, 215, 140, 141, 159, 213, 156, -66, - 210, 222, 216, 240, 243, 224, 229, 152, 234, 235, - 268, 58, 348, 241, 242, 247, 253, 265, 270, 429, - 272, 273, 283, 284, 288, 286, 297, 290, 295, -229, - 300, 291, 302, 304, 306, 308, 318, 317, 321, 328, - 335, 450, 336, 330, 338, 341, 343, 351, 354, 344, - 350, 355, 352, 361, 363, 371, 396, 412, 424, 356, - 357, 358, 384, 359, 381, 152, 391, 150, 426, 360, - 365, 373, 152, 374, 348, 375, 385, 420, 421, 437, - 443, 422, 436, 444, 445, 462, 446, 457, 447, 459, - 348, 458, 460, 461, 463, 464, 472, 452, 467, 142, - 340, 282, 294, 449, 433, 309, 147, 148, 0, 226, - 0, 285, 0, 0, 269, 0, 214 ++ 21, 22, 23, 24, 25, 26, 27, 419, 118, 119, ++ 271, 212, 119, 116, 117, 322, 323, 456, 310, 467, ++ 120, 276, 119, 120, 311, 387, 312, 198, 118, 207, ++ 7, 277, 473, 120, 470, 199, 388, 263, 53, 453, ++ 58, 55, 211, 121, 10, 11, 121, 122, 200, 275, ++ 122, 201, 119, 310, 233, 468, 324, 123, 202, 311, ++ 230, 68, 313, 120, 314, 124, 121, 321, 124, 442, ++ 292, 56, 203, 72, 73, 59, 72, 73, 124, 310, ++ 414, 124, 377, 10, 11, 311, 121, 331, 244, 293, ++ 122, 173, 378, 168, 415, 204, 205, 436, 289, 314, ++ 162, 169, 175, 174, 176, 88, 332, 437, 124, 299, ++ 177, 89, 443, 458, 416, 245, 341, 178, 179, 180, ++ 71, 181, 444, 182, 170, 314, 417, 68, 153, 91, ++ 92, 471, 183, 249, 72, 73, 432, 93, 171, 248, ++ 154, 249, 57, 420, 219, 250, 472, 152, 433, 184, ++ 185, 220, 424, 250, 347, 236, 1, 2, 348, 94, ++ 95, 255, 237, 112, 256, 257, 113, 114, 258, 99, ++ 100, 101, 102, 82, 96, 83, 259, 399, 400, 401, ++ 402, 403, 404, 405, 406, 407, 408, 409, 410, 63, ++ 64, 65, 66, 67, 260, 80, 78, 79, 367, 368, ++ 369, 370, 10, 11, 72, 73, 217, 218, 71, 225, ++ 379, 380, 81, 86, 84, 87, 98, 425, 143, 104, ++ 152, 392, 150, 110, 138, 105, 106, 107, 412, 108, ++ 141, 109, 136, 137, 215, 140, 222, 243, 156, 58, ++ -66, 268, 210, 159, 297, 216, 224, 229, 152, 213, ++ 234, 235, 288, 347, 240, 241, 242, 247, 253, 265, ++ 431, 270, 272, 273, 283, 284, 286, 295, 300, -229, ++ 290, 302, 304, 291, 306, 308, 327, 317, 318, 320, ++ 334, 329, 335, 452, 337, 343, 340, 360, 350, 342, ++ 349, 351, 362, 353, 354, 364, 372, 397, 355, 356, ++ 357, 385, 358, 359, 366, 374, 375, 152, 392, 150, ++ 376, 382, 386, 413, 152, 426, 347, 421, 422, 423, ++ 428, 424, 438, 439, 445, 446, 449, 464, 447, 448, ++ 459, 460, 347, 461, 462, 463, 466, 454, 465, 474, ++ 469, 294, 142, 339, 282, 451, 435, 147, 226, 285, ++ 214, 148, 309, 0, 0, 0, 269 }; static const yytype_int16 yycheck[] = { - 82, 82, 82, 113, 92, 166, 100, 22, 23, 103, - 156, 99, 22, 101, 102, 349, 98, 22, 100, 37, - 325, 103, 37, 25, 170, 28, 29, 28, 24, 25, - 64, 113, 24, 36, 30, 36, 0, 28, 30, 28, - 125, 24, 188, 39, 412, 36, 61, 30, 49, 32, - 61, 52, 34, 8, 61, 58, 59, 72, 59, 98, - 428, 72, 147, 59, 98, 72, 55, 69, 59, 411, - 73, 53, 73, 106, 70, 71, 410, 95, 70, 98, - 95, 386, 73, 98, 426, 68, 422, 70, 98, 26, - 424, 237, 98, 98, 98, 96, 97, 433, 113, 110, - 111, 38, 113, 110, 111, 33, 113, 40, 41, 24, - 98, 26, 60, 98, 27, 209, 29, 45, 98, 67, - 208, 60, 35, 38, 212, 26, 33, 209, 67, 42, - 43, 44, 106, 46, 107, 48, 47, 38, 45, 50, - 51, 114, 252, 54, 57, 108, 3, 4, 81, 112, - 107, 62, 19, 20, 21, 22, 23, 114, 104, 26, - 107, 74, 75, 109, 107, 326, 106, 114, 112, 80, - 252, 114, 110, 111, 5, 6, 7, 259, 9, 10, - 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 21, 83, 84, 85, 86, 87, 88, 89, 90, 91, - 92, 93, 94, 99, 22, 23, 102, 103, 99, 100, - 101, 102, 76, 77, 78, 79, 110, 111, 107, 112, - 107, 107, 112, 107, 107, 107, 107, 102, 107, 107, - 98, 64, 22, 321, 344, 317, 317, 317, 108, 108, - 98, 22, 108, 63, 109, 107, 107, 107, 107, 65, - 82, 22, 108, 108, 108, 108, 108, 108, 108, 108, - 108, 107, 344, 102, 109, 112, 22, 349, 22, 22, - 66, 108, 108, 108, 22, 22, 28, 22, 108, 102, - 109, 108, 107, 107, 22, 113, 22, 109, 109, 22, - 109, 22, 109, 22, 109, 109, 109, 109, 408, 109, - 107, 56, 22, 109, 109, 109, 109, 22, 109, 31, - 107, 109, 114, 108, 108, 65, 108, 104, 107, 401, - 401, 401, 104, 109, 109, 197, 408, 250, 410, 401, - 79, 230, 354, -1, 55, -1, 82, 80, 82, 183, - -1, -1, 424 + 89, 89, 89, 9, 124, 181, 106, 125, 23, 109, - 23, 24, 98, 23, 24, 104, 381, 106, 171, 105, - 109, 107, 108, 162, 23, 38, 99, 100, 38, 5, ++ 23, 24, 98, 23, 24, 104, 382, 106, 171, 105, ++ 109, 107, 108, 77, 23, 38, 162, 0, 38, 5, + 6, 7, 185, 26, 10, 124, 12, 13, 14, 15, - 16, 17, 18, 19, 20, 21, 22, 65, 29, 62, - 203, 137, 62, 23, 24, 359, 37, 41, 42, 445, - 73, 38, 62, 73, 109, 25, 77, 0, 38, 50, - 446, 31, 53, 73, 119, 29, 462, 70, 443, 60, - 35, 8, 100, 96, 99, 100, 96, 100, 464, 207, - 100, 230, 62, 74, 459, 62, 457, 110, 82, 54, - 110, 100, 56, 73, 108, 118, 73, 260, 118, 470, - 228, 71, 123, 113, 114, 419, 97, 98, 118, 96, - 28, 111, 30, 99, 100, 136, 96, 117, 36, 229, - 100, 25, 34, 27, 29, 43, 44, 45, 224, 47, - 229, 49, 37, 99, 46, 39, 113, 114, 118, 235, - 58, 118, 27, 25, 25, 26, 276, 113, 114, 31, - 31, 33, 29, 30, 39, 60, 100, 75, 76, 40, - 37, 48, 109, 27, 51, 52, 34, 99, 55, 74, - 109, 109, 119, 99, 360, 39, 63, 276, 46, 60, - 119, 119, 59, 60, 283, 61, 61, 69, 284, 71, - 71, 72, 68, 68, 81, 3, 4, 74, 84, 85, - 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, - 19, 20, 21, 22, 23, 106, 99, 26, 27, 113, - 114, 112, 101, 23, 24, 104, 105, 101, 102, 103, - 104, 77, 78, 79, 80, 9, 108, 11, 99, 100, - 113, 114, 108, 99, 109, 23, 376, 117, 117, 109, - 109, 350, 350, 350, 109, 109, 109, 109, 109, 355, - 104, 109, 99, 99, 109, 100, 115, 117, 111, 111, - 111, 23, 112, 111, 64, 109, 109, 376, 109, 109, - 66, 65, 381, 111, 111, 111, 111, 111, 111, 385, - 111, 111, 109, 109, 112, 117, 83, 116, 104, 104, - 23, 116, 23, 23, 23, 67, 23, 111, 111, 23, - 111, 441, 23, 29, 23, 110, 112, 110, 109, 104, - 118, 109, 111, 23, 23, 23, 23, 57, 23, 112, - 112, 112, 348, 112, 109, 434, 434, 434, 23, 112, - 112, 112, 441, 112, 443, 112, 109, 112, 112, 32, - 109, 112, 112, 109, 111, 106, 111, 111, 66, 109, - 459, 119, 109, 112, 112, 106, 112, 444, 460, 87, - 273, 210, 230, 434, 387, 253, 89, 89, -1, 159, - -1, 213, -1, -1, 198, -1, 139 ++ 16, 17, 18, 19, 20, 21, 22, 358, 38, 62, ++ 203, 137, 62, 23, 24, 41, 42, 447, 25, 459, ++ 73, 109, 62, 73, 31, 62, 33, 29, 38, 123, ++ 8, 119, 472, 73, 464, 37, 73, 70, 108, 445, ++ 65, 99, 136, 96, 99, 100, 96, 100, 50, 207, ++ 100, 53, 62, 25, 230, 461, 82, 110, 60, 31, ++ 110, 100, 69, 73, 71, 118, 96, 260, 118, 420, ++ 228, 99, 74, 113, 114, 100, 113, 114, 118, 25, ++ 26, 118, 109, 99, 100, 31, 96, 35, 29, 229, ++ 100, 34, 119, 29, 40, 97, 98, 109, 224, 71, ++ 229, 37, 28, 46, 30, 111, 54, 119, 118, 235, ++ 36, 117, 109, 448, 60, 56, 276, 43, 44, 45, ++ 99, 47, 119, 49, 60, 71, 72, 100, 27, 29, ++ 30, 466, 58, 27, 113, 114, 34, 37, 74, 25, ++ 39, 27, 99, 359, 61, 39, 106, 276, 46, 75, ++ 76, 68, 112, 39, 283, 61, 3, 4, 284, 59, ++ 60, 48, 68, 101, 51, 52, 104, 105, 55, 101, ++ 102, 103, 104, 9, 74, 11, 63, 84, 85, 86, ++ 87, 88, 89, 90, 91, 92, 93, 94, 95, 19, ++ 20, 21, 22, 23, 81, 108, 26, 27, 77, 78, ++ 79, 80, 99, 100, 113, 114, 23, 24, 99, 100, ++ 113, 114, 108, 117, 99, 117, 109, 377, 23, 109, ++ 349, 349, 349, 104, 99, 109, 109, 109, 354, 109, ++ 100, 109, 109, 109, 99, 109, 23, 64, 111, 65, ++ 111, 66, 111, 115, 83, 112, 109, 109, 377, 117, ++ 109, 109, 112, 382, 111, 111, 111, 111, 111, 111, ++ 386, 111, 111, 111, 109, 109, 117, 104, 23, 104, ++ 116, 23, 23, 116, 23, 67, 23, 111, 111, 111, ++ 111, 29, 23, 443, 23, 104, 110, 23, 110, 112, ++ 118, 111, 23, 109, 109, 23, 23, 23, 112, 112, ++ 112, 347, 112, 112, 112, 112, 112, 436, 436, 436, ++ 112, 109, 109, 57, 443, 23, 445, 112, 112, 112, ++ 23, 112, 112, 32, 109, 109, 66, 106, 111, 111, ++ 111, 119, 461, 109, 109, 112, 106, 446, 112, 112, ++ 462, 230, 87, 273, 210, 436, 388, 89, 159, 213, ++ 139, 89, 253, -1, -1, -1, 198 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ -static const yytype_uint8 yystos[] = +static const yytype_uint16 yystos[] = { - 0, 3, 4, 116, 117, 0, 118, 8, 119, 120, - 98, 5, 6, 7, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 20, 21, 121, 122, 123, - 124, 125, 126, 127, 128, 129, 130, 131, 132, 135, - 158, 159, 166, 167, 168, 230, 232, 235, 248, 106, - 233, 98, 98, 98, 98, 231, 64, 98, 138, 144, - 236, 138, 138, 138, 138, 138, 98, 139, 152, 110, - 111, 137, 229, 138, 106, 106, 98, 234, 112, 112, - 112, 108, 112, 170, 234, 28, 29, 36, 58, 59, - 73, 237, 107, 99, 100, 101, 102, 157, 107, 107, - 107, 107, 107, 107, 102, 154, 22, 23, 37, 61, - 72, 95, 98, 113, 143, 145, 160, 174, 177, 213, - 217, 220, 224, 226, 227, 107, 107, 98, 160, 236, - 22, 169, 173, 177, 213, 223, 225, 227, 228, 229, - 26, 38, 238, 108, 242, 137, 136, 229, 137, 136, - 137, 137, 136, 28, 36, 59, 73, 165, 33, 45, - 27, 29, 35, 42, 43, 44, 46, 48, 57, 74, - 75, 178, 180, 183, 185, 187, 191, 194, 196, 198, - 200, 203, 212, 28, 36, 49, 52, 59, 73, 96, - 97, 161, 228, 99, 102, 103, 156, 108, 143, 98, - 109, 22, 23, 60, 67, 239, 22, 245, 107, 107, - 143, 107, 107, 60, 67, 241, 242, 108, 108, 108, - 63, 28, 55, 195, 108, 24, 26, 38, 184, 240, - 108, 240, 47, 50, 51, 54, 62, 80, 207, 25, - 69, 199, 108, 244, 242, 65, 241, 108, 242, 108, - 108, 163, 107, 114, 22, 146, 147, 148, 152, 107, - 112, 171, 109, 137, 136, 102, 155, 82, 133, 137, - 22, 221, 22, 222, 22, 197, 22, 190, 66, 190, - 24, 30, 32, 68, 70, 179, 189, 108, 108, 208, - 108, 242, 40, 41, 81, 204, 205, 22, 247, 28, - 188, 34, 53, 192, 108, 22, 164, 22, 162, 164, - 228, 109, 102, 153, 140, 141, 229, 113, 108, 243, - 107, 107, 109, 109, 109, 109, 109, 22, 211, 22, - 209, 22, 210, 109, 76, 77, 78, 79, 193, 22, - 206, 109, 109, 109, 107, 114, 110, 111, 149, 107, - 22, 98, 142, 61, 72, 172, 175, 176, 177, 214, - 215, 218, 223, 22, 246, 83, 84, 85, 86, 87, - 88, 89, 90, 91, 92, 93, 94, 134, 137, 56, - 25, 39, 59, 71, 181, 189, 240, 109, 109, 109, - 109, 228, 22, 150, 22, 151, 141, 33, 45, 201, - 203, 107, 114, 109, 31, 182, 186, 189, 107, 114, - 107, 108, 108, 65, 202, 175, 228, 141, 216, 221, - 219, 222, 108, 114, 107, 109, 104, 109, 104, 206, - 141, 221, 222, 104, 206, 109 + 0, 3, 4, 121, 122, 0, 123, 8, 124, 125, + 99, 100, 262, 5, 6, 7, 10, 12, 13, 14, + 15, 16, 17, 18, 19, 20, 21, 22, 126, 127, + 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, + 138, 141, 170, 171, 178, 179, 180, 242, 244, 245, + 248, 261, 262, 108, 246, 99, 99, 99, 65, 100, + 145, 151, 249, 145, 145, 145, 145, 145, 100, 146, + 159, 99, 113, 114, 144, 166, 168, 241, 145, 145, + 108, 108, 9, 11, 99, 247, 117, 117, 111, 117, + 182, 29, 30, 37, 59, 60, 74, 250, 109, 101, + 102, 103, 104, 164, 109, 109, 109, 109, 109, 109, + 104, 161, 101, 104, 105, 163, 23, 24, 38, 62, + 73, 96, 100, 110, 118, 150, 152, 172, 186, 189, + 225, 229, 232, 236, 238, 239, 109, 109, 99, 243, + 109, 100, 172, 23, 181, 185, 189, 225, 235, 237, + 239, 240, 241, 27, 39, 251, 111, 255, 144, 115, + 165, 142, 241, 144, 142, 144, 144, 142, 29, 37, + 60, 74, 177, 34, 46, 28, 30, 36, 43, 44, + 45, 47, 49, 58, 75, 76, 190, 192, 195, 197, + 199, 203, 206, 208, 210, 212, 215, 224, 29, 37, + 50, 53, 60, 74, 97, 98, 173, 150, 240, 163, + 111, 150, 144, 117, 247, 99, 112, 23, 24, 61, + 68, 252, 23, 258, 109, 100, 166, 167, 169, 109, + 110, 143, 150, 238, 109, 109, 61, 68, 254, 255, + 111, 111, 111, 64, 29, 56, 207, 111, 25, 27, + 39, 196, 253, 111, 253, 48, 51, 52, 55, 63, + 81, 219, 26, 70, 211, 111, 257, 255, 66, 254, + 111, 255, 111, 111, 175, 163, 109, 119, 23, 153, + 154, 155, 159, 109, 109, 249, 117, 183, 112, 144, + 116, 116, 163, 142, 143, 104, 162, 83, 139, 144, + 23, 233, 23, 234, 23, 209, 23, 202, 67, 202, - 25, 31, 33, 69, 71, 191, 201, 111, 23, 220, - 221, 111, 255, 41, 42, 82, 216, 217, 23, 260, - 29, 200, 35, 54, 204, 111, 23, 176, 23, 174, - 176, 110, 240, 112, 104, 160, 147, 148, 241, 144, - 118, 110, 111, 256, 109, 109, 112, 112, 112, 112, - 112, 23, 223, 23, 222, 112, 77, 78, 79, 80, - 205, 23, 218, 112, 112, 112, 109, 119, 113, 114, - 156, 109, 23, 149, 262, 109, 62, 73, 184, 187, - 188, 189, 226, 227, 230, 235, 23, 259, 84, 85, - 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, - 140, 144, 57, 26, 40, 60, 72, 193, 201, 253, - 112, 112, 112, 240, 23, 157, 23, 158, 148, 144, - 34, 46, 213, 215, 109, 119, 112, 32, 194, 198, - 201, 109, 119, 109, 109, 111, 111, 66, 214, 187, - 240, 148, 139, 228, 233, 231, 234, 111, 119, 109, - 109, 112, 106, 112, 106, 218, 148, 140, 233, 234, - 106, 218, 112 ++ 25, 31, 33, 69, 71, 191, 201, 111, 111, 220, ++ 111, 255, 41, 42, 82, 216, 217, 23, 260, 29, ++ 200, 35, 54, 204, 111, 23, 176, 23, 174, 176, ++ 110, 240, 112, 104, 160, 147, 148, 241, 144, 118, ++ 110, 111, 256, 109, 109, 112, 112, 112, 112, 112, ++ 23, 223, 23, 221, 23, 222, 112, 77, 78, 79, ++ 80, 205, 23, 218, 112, 112, 112, 109, 119, 113, ++ 114, 156, 109, 23, 149, 262, 109, 62, 73, 184, ++ 187, 188, 189, 226, 227, 230, 235, 23, 259, 84, ++ 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, ++ 95, 140, 144, 57, 26, 40, 60, 72, 193, 201, ++ 253, 112, 112, 112, 112, 240, 23, 157, 23, 158, ++ 148, 144, 34, 46, 213, 215, 109, 119, 112, 32, ++ 194, 198, 201, 109, 119, 109, 109, 111, 111, 66, ++ 214, 187, 240, 148, 139, 228, 233, 231, 234, 111, ++ 119, 109, 109, 112, 106, 112, 106, 218, 148, 140, ++ 233, 234, 106, 218, 112 }; #define yyerrok (yyerrstatus = 0) @@@ -4175,12 -3894,12 +4175,12 @@@ yyreduce ;} break; - case 194: + case 208: /* Line 1455 of yacc.c */ -#line 1496 "program_parse.y" +#line 1689 "program_parse.y" { - (yyval.integer) = (yyvsp[(1) - (1)].integer); + (yyval.integer) = (yyvsp[(2) - (3)].integer); ;} break; diff --cc src/mesa/shader/program_parse.tab.h index c6ed6c777ea,dabb3bf1a36..860b6f886e9 --- a/src/mesa/shader/program_parse.tab.h +++ b/src/mesa/shader/program_parse.tab.h @@@ -58,92 -58,90 +58,92 @@@ ARL = 274, KIL = 275, SWZ = 276, - INTEGER = 277, - REAL = 278, - AMBIENT = 279, - ATTENUATION = 280, - BACK = 281, - CLIP = 282, - COLOR = 283, - DEPTH = 284, - DIFFUSE = 285, - DIRECTION = 286, - EMISSION = 287, - ENV = 288, - EYE = 289, - FOG = 290, - FOGCOORD = 291, - FRAGMENT = 292, - FRONT = 293, - HALF = 294, - INVERSE = 295, - INVTRANS = 296, - LIGHT = 297, - LIGHTMODEL = 298, - LIGHTPROD = 299, - LOCAL = 300, - MATERIAL = 301, - MAT_PROGRAM = 302, - MATRIX = 303, - MATRIXINDEX = 304, - MODELVIEW = 305, - MVP = 306, - NORMAL = 307, - OBJECT = 308, - PALETTE = 309, - PARAMS = 310, - PLANE = 311, - POINT_TOK = 312, - POINTSIZE = 313, - POSITION = 314, - PRIMARY = 315, - PROGRAM = 316, - PROJECTION = 317, - RANGE = 318, - RESULT = 319, - ROW = 320, - SCENECOLOR = 321, - SECONDARY = 322, - SHININESS = 323, - SIZE_TOK = 324, - SPECULAR = 325, - SPOT = 326, - STATE = 327, - TEXCOORD = 328, - TEXENV = 329, - TEXGEN = 330, - TEXGEN_Q = 331, - TEXGEN_R = 332, - TEXGEN_S = 333, - TEXGEN_T = 334, - TEXTURE = 335, - TRANSPOSE = 336, - TEXTURE_UNIT = 337, - TEX_1D = 338, - TEX_2D = 339, - TEX_3D = 340, - TEX_CUBE = 341, - TEX_RECT = 342, - TEX_SHADOW1D = 343, - TEX_SHADOW2D = 344, - TEX_SHADOWRECT = 345, - TEX_ARRAY1D = 346, - TEX_ARRAY2D = 347, - TEX_ARRAYSHADOW1D = 348, - TEX_ARRAYSHADOW2D = 349, - VERTEX = 350, - VTXATTRIB = 351, - WEIGHT = 352, - IDENTIFIER = 353, - MASK4 = 354, - MASK3 = 355, - MASK2 = 356, - MASK1 = 357, - SWIZZLE = 358, - DOT_DOT = 359, - DOT = 360 + TXD_OP = 277, + INTEGER = 278, + REAL = 279, + AMBIENT = 280, + ATTENUATION = 281, + BACK = 282, + CLIP = 283, + COLOR = 284, + DEPTH = 285, + DIFFUSE = 286, + DIRECTION = 287, + EMISSION = 288, + ENV = 289, + EYE = 290, + FOG = 291, + FOGCOORD = 292, + FRAGMENT = 293, + FRONT = 294, + HALF = 295, + INVERSE = 296, + INVTRANS = 297, + LIGHT = 298, + LIGHTMODEL = 299, + LIGHTPROD = 300, + LOCAL = 301, + MATERIAL = 302, + MAT_PROGRAM = 303, + MATRIX = 304, + MATRIXINDEX = 305, + MODELVIEW = 306, + MVP = 307, + NORMAL = 308, + OBJECT = 309, + PALETTE = 310, + PARAMS = 311, + PLANE = 312, - POINT = 313, ++ POINT_TOK = 313, + POINTSIZE = 314, + POSITION = 315, + PRIMARY = 316, + PROGRAM = 317, + PROJECTION = 318, + RANGE = 319, + RESULT = 320, + ROW = 321, + SCENECOLOR = 322, + SECONDARY = 323, + SHININESS = 324, - SIZE = 325, ++ SIZE_TOK = 325, + SPECULAR = 326, + SPOT = 327, + STATE = 328, + TEXCOORD = 329, + TEXENV = 330, + TEXGEN = 331, + TEXGEN_Q = 332, + TEXGEN_R = 333, + TEXGEN_S = 334, + TEXGEN_T = 335, + TEXTURE = 336, + TRANSPOSE = 337, + TEXTURE_UNIT = 338, + TEX_1D = 339, + TEX_2D = 340, + TEX_3D = 341, + TEX_CUBE = 342, + TEX_RECT = 343, + TEX_SHADOW1D = 344, + TEX_SHADOW2D = 345, + TEX_SHADOWRECT = 346, + TEX_ARRAY1D = 347, + TEX_ARRAY2D = 348, + TEX_ARRAYSHADOW1D = 349, + TEX_ARRAYSHADOW2D = 350, + VERTEX = 351, + VTXATTRIB = 352, + WEIGHT = 353, + IDENTIFIER = 354, + USED_IDENTIFIER = 355, + MASK4 = 356, + MASK3 = 357, + MASK2 = 358, + MASK1 = 359, + SWIZZLE = 360, + DOT_DOT = 361, + DOT = 362 }; #endif