summaryrefslogtreecommitdiffstats
path: root/src/mesa/shader/program_parse.tab.c
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2009-09-10 15:33:45 -0700
committerIan Romanick <[email protected]>2009-09-10 15:33:45 -0700
commitb8e1e8d2d8ae6ffbf8f271b46ee89788a926b3b0 (patch)
tree5db502ab80287bfc8ff61082784017c7448464f5 /src/mesa/shader/program_parse.tab.c
parent81722c5d7e8e93d837510b9e6e5d014ec64cf4b3 (diff)
parentd9dc4cb0e4f578da9e50c9d1ba6fd9c22ea2fca6 (diff)
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
Diffstat (limited to 'src/mesa/shader/program_parse.tab.c')
-rw-r--r--src/mesa/shader/program_parse.tab.c457
1 files changed, 228 insertions, 229 deletions
diff --git a/src/mesa/shader/program_parse.tab.c b/src/mesa/shader/program_parse.tab.c
index 33195c0b165..c51b4d2f282 100644
--- a/src/mesa/shader/program_parse.tab.c
+++ b/src/mesa/shader/program_parse.tab.c
@@ -261,7 +261,7 @@ static struct asm_instruction *asm_instruction_copy_ctor(
PALETTE = 310,
PARAMS = 311,
PLANE = 312,
- POINT = 313,
+ POINT_TOK = 313,
POINTSIZE = 314,
POSITION = 315,
PRIMARY = 316,
@@ -273,7 +273,7 @@ static struct asm_instruction *asm_instruction_copy_ctor(
SCENECOLOR = 322,
SECONDARY = 323,
SHININESS = 324,
- SIZE = 325,
+ SIZE_TOK = 325,
SPECULAR = 326,
SPOT = 327,
STATE = 328,
@@ -335,7 +335,7 @@ typedef union YYSTYPE
unsigned attrib;
int integer;
float real;
- unsigned state[5];
+ gl_state_index state[STATE_LENGTH];
int negate;
struct asm_vector vector;
gl_inst_opcode opcode;
@@ -607,7 +607,7 @@ union yyalloc
/* YYNRULES -- Number of rules. */
#define YYNRULES 282
/* YYNRULES -- Number of states. */
-#define YYNSTATES 473
+#define YYNSTATES 475
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
@@ -683,15 +683,15 @@ static const yytype_uint16 yyprhs[] =
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. */
@@ -755,28 +755,28 @@ static const yytype_int16 yyrhs[] =
-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. */
@@ -827,9 +827,9 @@ static const char *const yytname[] =
"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",
@@ -960,7 +960,7 @@ static const yytype_uint8 yyr2[] =
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,
@@ -1007,23 +1007,23 @@ static const yytype_uint16 yydefact[] =
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]. */
@@ -1031,94 +1031,94 @@ static const yytype_int16 yydefgoto[] =
{
-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 -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
+ 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
+ -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
@@ -1128,90 +1128,90 @@ static const yytype_int16 yypgoto[] =
#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,
+ 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[] =
{
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
@@ -1249,23 +1249,23 @@ static const yytype_uint16 yystos[] =
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)
@@ -4180,7 +4180,7 @@ yyreduce:
/* Line 1455 of yacc.c */
#line 1689 "program_parse.y"
{
- (yyval.integer) = (yyvsp[(1) - (1)].integer);
+ (yyval.integer) = (yyvsp[(2) - (3)].integer);
;}
break;
@@ -5316,8 +5316,7 @@ int add_state_reference(struct gl_program_parameter_list *param_list,
name = _mesa_program_state_string(tokens);
index = _mesa_add_parameter(param_list, PROGRAM_STATE_VAR, name,
- size, GL_NONE,
- NULL, (gl_state_index *) tokens, 0x0);
+ size, GL_NONE, NULL, tokens, 0x0);
param_list->StateFlags |= _mesa_program_state_flags(tokens);
/* free name string here since we duplicated it in add_parameter() */
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-30 06:33:21 +0000