summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/libEGL/Makefile4
-rw-r--r--lib/libGL/Makefile4
-rw-r--r--lib/libGL/generated/glsl/glcpp/glcpp-lex.c96
-rw-r--r--lib/libGL/generated/glsl/glcpp/glcpp-parse.c196
-rw-r--r--lib/libGL/generated/glsl/glsl_lexer.cpp476
-rw-r--r--lib/libGL/generated/glsl/glsl_parser.cpp1592
-rw-r--r--lib/libGL/generated/glsl/glsl_parser.h2
-rw-r--r--lib/libGL/generated/main/get_hash.h1074
-rw-r--r--lib/libGL/generated/program/lex.yy.c348
-rw-r--r--lib/libGL/generated/program/program_parse.tab.c470
-rw-r--r--lib/libGL/generated/program/program_parse.tab.h2
-rw-r--r--lib/libGL/mesa/Makefile.inc4
-rw-r--r--lib/libGLESv1_CM/Makefile4
-rw-r--r--lib/libGLESv2/Makefile4
14 files changed, 2152 insertions, 2124 deletions
diff --git a/lib/libEGL/Makefile b/lib/libEGL/Makefile
index c33c7b22c..3f1dd6f77 100644
--- a/lib/libEGL/Makefile
+++ b/lib/libEGL/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2013/09/05 20:23:03 todd Exp $
+# $OpenBSD: Makefile,v 1.3 2013/10/05 10:12:54 jsg Exp $
.include <bsd.xconf.mk>
LIB= EGL
@@ -9,7 +9,7 @@ MESA_INCLUDE= ${.CURDIR}/../../dist/Mesa/include
MESA_MAJOR= 9
MESA_MINOR= 2
-MESA_TINY= 0
+MESA_TINY= 1
DRI_DRIVER_INSTALL_DIR= ${X11BASE}/lib/modules/dri
EGL_DRIVER_SEARCH_DIR= ${X11BASE}/lib/modules/egl
diff --git a/lib/libGL/Makefile b/lib/libGL/Makefile
index 25b6baadb..ed52cd321 100644
--- a/lib/libGL/Makefile
+++ b/lib/libGL/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.37 2013/09/05 15:11:56 jsg Exp $
+# $OpenBSD: Makefile,v 1.38 2013/10/05 10:12:55 jsg Exp $
.include <bsd.xconf.mk>
.if ${XENOCARA_BUILD_GALLIUM:L} == "yes" || ${XENOCARA_BUILD_GALLIUM} == "llvm"
@@ -22,7 +22,7 @@ MESA_DRI= ${.CURDIR}/../../dist/Mesa/src/mesa/drivers/dri
# this needs to be updated in mesa/Makefile.inc as well
MESA_MAJOR= 9
MESA_MINOR= 2
-MESA_TINY= 0
+MESA_TINY= 1
DRI_DRIVER_INSTALL_DIR= ${X11BASE}/lib/modules/dri
diff --git a/lib/libGL/generated/glsl/glcpp/glcpp-lex.c b/lib/libGL/generated/glsl/glcpp/glcpp-lex.c
index 2e1434244..bebcf9ce7 100644
--- a/lib/libGL/generated/glsl/glcpp/glcpp-lex.c
+++ b/lib/libGL/generated/glsl/glcpp/glcpp-lex.c
@@ -557,8 +557,8 @@ static yyconst flex_int16_t yy_chk[365] =
#define yymore() yymore_used_but_not_detected
#define YY_MORE_ADJ 0
#define YY_RESTORE_YY_MORE_OFFSET
-#line 1 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
-#line 2 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 1 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 2 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
/*
* Copyright © 2010 Intel Corporation
*
@@ -879,7 +879,7 @@ YY_DECL
register int yy_act;
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-#line 94 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 94 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
/* Implicitly switch between SKIP and INITIAL (non-skipping);
* don't switch if some other state was explicitly set.
@@ -980,41 +980,41 @@ do_action: /* This label is used only to access EOF actions. */
case 1:
YY_RULE_SETUP
-#line 108 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 108 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{
}
YY_BREAK
/* Multi-line comments */
case 2:
YY_RULE_SETUP
-#line 112 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 112 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{ yy_push_state(COMMENT, yyscanner); }
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 113 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 113 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
YY_BREAK
case 4:
/* rule 4 can match eol */
YY_RULE_SETUP
-#line 114 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 114 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{ yylineno++; yycolumn = 0; return NEWLINE; }
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 115 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 115 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
YY_BREAK
case 6:
/* rule 6 can match eol */
YY_RULE_SETUP
-#line 116 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 116 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{ yylineno++; yycolumn = 0; return NEWLINE; }
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 117 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 117 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{
yy_pop_state(yyscanner);
if (yyextra->space_tokens)
@@ -1023,7 +1023,7 @@ YY_RULE_SETUP
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 123 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 123 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{
yylval->str = ralloc_strdup (yyextra, yytext);
yyextra->space_tokens = 0;
@@ -1034,7 +1034,7 @@ YY_RULE_SETUP
* Simply pass them through to the main compiler's lexer/parser. */
case 9:
YY_RULE_SETUP
-#line 131 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 131 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{
yylval->str = ralloc_strdup (yyextra, yytext);
yylineno++;
@@ -1044,7 +1044,7 @@ YY_RULE_SETUP
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 138 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 138 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{
return HASH_LINE;
}
@@ -1052,7 +1052,7 @@ YY_RULE_SETUP
case 11:
YY_RULE_SETUP
-#line 143 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 143 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{
yyextra->lexing_if = 1;
yyextra->space_tokens = 0;
@@ -1061,7 +1061,7 @@ YY_RULE_SETUP
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 149 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 149 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{
yyextra->lexing_if = 1;
yyextra->space_tokens = 0;
@@ -1074,7 +1074,7 @@ case 13:
yyg->yy_c_buf_p = yy_cp -= 1;
YY_DO_BEFORE_ACTION; /* set up yytext again */
YY_RULE_SETUP
-#line 155 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 155 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{
yyextra->lexing_if = 1;
yyextra->space_tokens = 0;
@@ -1087,7 +1087,7 @@ case 14:
yyg->yy_c_buf_p = yy_cp -= 1;
YY_DO_BEFORE_ACTION; /* set up yytext again */
YY_RULE_SETUP
-#line 161 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 161 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{
yyextra->lexing_if = 1;
yyextra->space_tokens = 0;
@@ -1096,7 +1096,7 @@ YY_RULE_SETUP
YY_BREAK
case 15:
YY_RULE_SETUP
-#line 167 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 167 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{
yyextra->space_tokens = 0;
return HASH_ELSE;
@@ -1104,7 +1104,7 @@ YY_RULE_SETUP
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 172 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 172 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{
yyextra->space_tokens = 0;
return HASH_ENDIF;
@@ -1113,12 +1113,12 @@ YY_RULE_SETUP
case 17:
YY_RULE_SETUP
-#line 178 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 178 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
;
YY_BREAK
case 18:
YY_RULE_SETUP
-#line 180 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 180 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{
char *p;
for (p = yytext; !isalpha(p[0]); p++); /* skip " # " */
@@ -1128,7 +1128,7 @@ YY_RULE_SETUP
YY_BREAK
case 19:
YY_RULE_SETUP
-#line 187 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 187 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{
yyextra->space_tokens = 0;
yy_push_state(DEFINE, yyscanner);
@@ -1140,7 +1140,7 @@ case 20:
yyg->yy_c_buf_p = yy_cp -= 1;
YY_DO_BEFORE_ACTION; /* set up yytext again */
YY_RULE_SETUP
-#line 193 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 193 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{
yy_pop_state(yyscanner);
yylval->str = ralloc_strdup (yyextra, yytext);
@@ -1149,7 +1149,7 @@ YY_RULE_SETUP
YY_BREAK
case 21:
YY_RULE_SETUP
-#line 199 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 199 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{
yy_pop_state(yyscanner);
yylval->str = ralloc_strdup (yyextra, yytext);
@@ -1158,7 +1158,7 @@ YY_RULE_SETUP
YY_BREAK
case 22:
YY_RULE_SETUP
-#line 205 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 205 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{
yyextra->space_tokens = 0;
return HASH_UNDEF;
@@ -1166,7 +1166,7 @@ YY_RULE_SETUP
YY_BREAK
case 23:
YY_RULE_SETUP
-#line 210 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 210 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{
yyextra->space_tokens = 0;
return HASH;
@@ -1174,7 +1174,7 @@ YY_RULE_SETUP
YY_BREAK
case 24:
YY_RULE_SETUP
-#line 215 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 215 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{
yylval->str = ralloc_strdup (yyextra, yytext);
return INTEGER_STRING;
@@ -1182,7 +1182,7 @@ YY_RULE_SETUP
YY_BREAK
case 25:
YY_RULE_SETUP
-#line 220 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 220 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{
yylval->str = ralloc_strdup (yyextra, yytext);
return INTEGER_STRING;
@@ -1190,7 +1190,7 @@ YY_RULE_SETUP
YY_BREAK
case 26:
YY_RULE_SETUP
-#line 225 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 225 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{
yylval->str = ralloc_strdup (yyextra, yytext);
return INTEGER_STRING;
@@ -1198,63 +1198,63 @@ YY_RULE_SETUP
YY_BREAK
case 27:
YY_RULE_SETUP
-#line 230 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 230 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{
return LEFT_SHIFT;
}
YY_BREAK
case 28:
YY_RULE_SETUP
-#line 234 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 234 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{
return RIGHT_SHIFT;
}
YY_BREAK
case 29:
YY_RULE_SETUP
-#line 238 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 238 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{
return LESS_OR_EQUAL;
}
YY_BREAK
case 30:
YY_RULE_SETUP
-#line 242 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 242 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{
return GREATER_OR_EQUAL;
}
YY_BREAK
case 31:
YY_RULE_SETUP
-#line 246 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 246 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{
return EQUAL;
}
YY_BREAK
case 32:
YY_RULE_SETUP
-#line 250 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 250 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{
return NOT_EQUAL;
}
YY_BREAK
case 33:
YY_RULE_SETUP
-#line 254 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 254 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{
return AND;
}
YY_BREAK
case 34:
YY_RULE_SETUP
-#line 258 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 258 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{
return OR;
}
YY_BREAK
case 35:
YY_RULE_SETUP
-#line 262 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 262 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{
if (parser->is_gles)
glcpp_error(yylloc, yyextra, "Token pasting (##) is illegal in GLES");
@@ -1263,14 +1263,14 @@ YY_RULE_SETUP
YY_BREAK
case 36:
YY_RULE_SETUP
-#line 268 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 268 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{
return DEFINED;
}
YY_BREAK
case 37:
YY_RULE_SETUP
-#line 272 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 272 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{
yylval->str = ralloc_strdup (yyextra, yytext);
return IDENTIFIER;
@@ -1278,14 +1278,14 @@ YY_RULE_SETUP
YY_BREAK
case 38:
YY_RULE_SETUP
-#line 277 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 277 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{
return yytext[0];
}
YY_BREAK
case 39:
YY_RULE_SETUP
-#line 281 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 281 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{
yylval->str = ralloc_strdup (yyextra, yytext);
return OTHER;
@@ -1293,7 +1293,7 @@ YY_RULE_SETUP
YY_BREAK
case 40:
YY_RULE_SETUP
-#line 286 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 286 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{
if (yyextra->space_tokens) {
return SPACE;
@@ -1303,7 +1303,7 @@ YY_RULE_SETUP
case 41:
/* rule 41 can match eol */
YY_RULE_SETUP
-#line 292 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 292 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{
yyextra->lexing_if = 0;
yylineno++;
@@ -1313,7 +1313,7 @@ YY_RULE_SETUP
YY_BREAK
/* Handle missing newline at EOF. */
case YY_STATE_EOF(INITIAL):
-#line 300 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 300 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{
BEGIN DONE; /* Don't keep matching this rule forever. */
yyextra->lexing_if = 0;
@@ -1326,7 +1326,7 @@ case YY_STATE_EOF(INITIAL):
warnings. */
case 42:
YY_RULE_SETUP
-#line 310 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 310 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
{
unput('.');
yy_top_state(yyextra);
@@ -1334,7 +1334,7 @@ YY_RULE_SETUP
YY_BREAK
case 43:
YY_RULE_SETUP
-#line 315 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 315 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
ECHO;
YY_BREAK
#line 1341 "glsl/glcpp/glcpp-lex.c"
@@ -2560,7 +2560,7 @@ void glcpp_free (void * ptr , yyscan_t yyscanner)
#define YYTABLES_NAME "yytables"
-#line 315 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
+#line 315 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-lex.l"
diff --git a/lib/libGL/generated/glsl/glcpp/glcpp-parse.c b/lib/libGL/generated/glsl/glcpp/glcpp-parse.c
index 12c00aefa..f00ee2b98 100644
--- a/lib/libGL/generated/glsl/glcpp/glcpp-parse.c
+++ b/lib/libGL/generated/glsl/glcpp/glcpp-parse.c
@@ -152,7 +152,7 @@
/* Copy the first part of user declarations. */
-#line 1 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 1 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
/*
* Copyright © 2010 Intel Corporation
@@ -1652,7 +1652,7 @@ YYLTYPE yylloc;
/* User initialization code. */
-#line 155 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 155 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
yylloc.first_line = 1;
yylloc.first_column = 1;
@@ -1846,14 +1846,14 @@ yyreduce:
switch (yyn)
{
case 4:
-#line 194 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 194 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
ralloc_asprintf_rewrite_tail (&parser->output, &parser->output_length, "\n");
;}
break;
case 5:
-#line 197 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 197 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
if (parser->skip_stack == NULL ||
parser->skip_stack->type == SKIP_NO_SKIP)
@@ -1865,7 +1865,7 @@ yyreduce:
break;
case 6:
-#line 205 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 205 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
_glcpp_parser_print_expanded_token_list (parser, (yyvsp[(1) - (1)].token_list));
ralloc_asprintf_rewrite_tail (&parser->output, &parser->output_length, "\n");
@@ -1874,21 +1874,21 @@ yyreduce:
break;
case 9:
-#line 215 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 215 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
_glcpp_parser_skip_stack_push_if (parser, & (yylsp[(1) - (3)]), (yyvsp[(2) - (3)].ival));
;}
break;
case 10:
-#line 218 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 218 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
_glcpp_parser_skip_stack_change_if (parser, & (yylsp[(1) - (3)]), "elif", (yyvsp[(2) - (3)].ival));
;}
break;
case 11:
-#line 221 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 221 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
parser->has_new_line_number = 1;
parser->new_line_number = (yyvsp[(2) - (3)].ival);
@@ -1900,7 +1900,7 @@ yyreduce:
break;
case 12:
-#line 229 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 229 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
parser->has_new_line_number = 1;
parser->new_line_number = (yyvsp[(2) - (4)].ival);
@@ -1914,28 +1914,28 @@ yyreduce:
break;
case 13:
-#line 242 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 242 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
_define_object_macro (parser, & (yylsp[(2) - (4)]), (yyvsp[(2) - (4)].str), (yyvsp[(3) - (4)].token_list));
;}
break;
case 14:
-#line 245 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 245 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
_define_function_macro (parser, & (yylsp[(2) - (6)]), (yyvsp[(2) - (6)].str), NULL, (yyvsp[(5) - (6)].token_list));
;}
break;
case 15:
-#line 248 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 248 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
_define_function_macro (parser, & (yylsp[(2) - (7)]), (yyvsp[(2) - (7)].str), (yyvsp[(4) - (7)].string_list), (yyvsp[(6) - (7)].token_list));
;}
break;
case 16:
-#line 251 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 251 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
macro_t *macro = hash_table_find (parser->defines, (yyvsp[(2) - (3)].str));
if (macro) {
@@ -1947,7 +1947,7 @@ yyreduce:
break;
case 17:
-#line 259 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 259 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
/* Be careful to only evaluate the 'if' expression if
* we are not skipping. When we are skipping, we
@@ -1971,7 +1971,7 @@ yyreduce:
break;
case 18:
-#line 279 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 279 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
/* #if without an expression is only an error if we
* are not skipping */
@@ -1985,7 +1985,7 @@ yyreduce:
break;
case 19:
-#line 289 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 289 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
macro_t *macro = hash_table_find (parser->defines, (yyvsp[(2) - (4)].str));
ralloc_free ((yyvsp[(2) - (4)].str));
@@ -1994,7 +1994,7 @@ yyreduce:
break;
case 20:
-#line 294 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 294 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
macro_t *macro = hash_table_find (parser->defines, (yyvsp[(2) - (4)].str));
ralloc_free ((yyvsp[(2) - (4)].str));
@@ -2003,7 +2003,7 @@ yyreduce:
break;
case 21:
-#line 299 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 299 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
/* Be careful to only evaluate the 'elif' expression
* if we are not skipping. When we are skipping, we
@@ -2027,7 +2027,7 @@ yyreduce:
break;
case 22:
-#line 319 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 319 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
/* #elif without an expression is an error unless we
* are skipping. */
@@ -2046,35 +2046,35 @@ yyreduce:
break;
case 23:
-#line 334 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 334 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
_glcpp_parser_skip_stack_change_if (parser, & (yylsp[(1) - (1)]), "else", 1);
;}
break;
case 25:
-#line 337 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 337 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
_glcpp_parser_skip_stack_pop (parser, & (yylsp[(1) - (1)]));
;}
break;
case 27:
-#line 340 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 340 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
_glcpp_parser_handle_version_declaration(parser, (yyvsp[(2) - (3)].ival), NULL);
;}
break;
case 28:
-#line 343 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 343 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
_glcpp_parser_handle_version_declaration(parser, (yyvsp[(2) - (4)].ival), (yyvsp[(3) - (4)].str));
;}
break;
case 30:
-#line 350 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 350 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
if (strlen ((yyvsp[(1) - (1)].str)) >= 3 && strncmp ((yyvsp[(1) - (1)].str), "0x", 2) == 0) {
(yyval.ival) = strtoll ((yyvsp[(1) - (1)].str) + 2, NULL, 16);
@@ -2087,14 +2087,14 @@ yyreduce:
break;
case 31:
-#line 359 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 359 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
(yyval.ival) = (yyvsp[(1) - (1)].ival);
;}
break;
case 33:
-#line 365 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 365 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
if (parser->is_gles)
glcpp_error(& (yylsp[(1) - (1)]), parser, "undefined macro %s in expression (illegal in GLES)", (yyvsp[(1) - (1)].str));
@@ -2103,112 +2103,112 @@ yyreduce:
break;
case 34:
-#line 370 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 370 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
(yyval.ival) = (yyvsp[(1) - (3)].ival) || (yyvsp[(3) - (3)].ival);
;}
break;
case 35:
-#line 373 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 373 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
(yyval.ival) = (yyvsp[(1) - (3)].ival) && (yyvsp[(3) - (3)].ival);
;}
break;
case 36:
-#line 376 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 376 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
(yyval.ival) = (yyvsp[(1) - (3)].ival) | (yyvsp[(3) - (3)].ival);
;}
break;
case 37:
-#line 379 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 379 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
(yyval.ival) = (yyvsp[(1) - (3)].ival) ^ (yyvsp[(3) - (3)].ival);
;}
break;
case 38:
-#line 382 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 382 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
(yyval.ival) = (yyvsp[(1) - (3)].ival) & (yyvsp[(3) - (3)].ival);
;}
break;
case 39:
-#line 385 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 385 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
(yyval.ival) = (yyvsp[(1) - (3)].ival) != (yyvsp[(3) - (3)].ival);
;}
break;
case 40:
-#line 388 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 388 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
(yyval.ival) = (yyvsp[(1) - (3)].ival) == (yyvsp[(3) - (3)].ival);
;}
break;
case 41:
-#line 391 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 391 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
(yyval.ival) = (yyvsp[(1) - (3)].ival) >= (yyvsp[(3) - (3)].ival);
;}
break;
case 42:
-#line 394 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 394 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
(yyval.ival) = (yyvsp[(1) - (3)].ival) <= (yyvsp[(3) - (3)].ival);
;}
break;
case 43:
-#line 397 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 397 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
(yyval.ival) = (yyvsp[(1) - (3)].ival) > (yyvsp[(3) - (3)].ival);
;}
break;
case 44:
-#line 400 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 400 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
(yyval.ival) = (yyvsp[(1) - (3)].ival) < (yyvsp[(3) - (3)].ival);
;}
break;
case 45:
-#line 403 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 403 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
(yyval.ival) = (yyvsp[(1) - (3)].ival) >> (yyvsp[(3) - (3)].ival);
;}
break;
case 46:
-#line 406 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 406 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
(yyval.ival) = (yyvsp[(1) - (3)].ival) << (yyvsp[(3) - (3)].ival);
;}
break;
case 47:
-#line 409 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 409 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
(yyval.ival) = (yyvsp[(1) - (3)].ival) - (yyvsp[(3) - (3)].ival);
;}
break;
case 48:
-#line 412 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 412 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
(yyval.ival) = (yyvsp[(1) - (3)].ival) + (yyvsp[(3) - (3)].ival);
;}
break;
case 49:
-#line 415 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 415 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
if ((yyvsp[(3) - (3)].ival) == 0) {
yyerror (& (yylsp[(1) - (3)]), parser,
@@ -2220,7 +2220,7 @@ yyreduce:
break;
case 50:
-#line 423 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 423 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
if ((yyvsp[(3) - (3)].ival) == 0) {
yyerror (& (yylsp[(1) - (3)]), parser,
@@ -2232,49 +2232,49 @@ yyreduce:
break;
case 51:
-#line 431 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 431 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
(yyval.ival) = (yyvsp[(1) - (3)].ival) * (yyvsp[(3) - (3)].ival);
;}
break;
case 52:
-#line 434 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 434 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
(yyval.ival) = ! (yyvsp[(2) - (2)].ival);
;}
break;
case 53:
-#line 437 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 437 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
(yyval.ival) = ~ (yyvsp[(2) - (2)].ival);
;}
break;
case 54:
-#line 440 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 440 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
(yyval.ival) = - (yyvsp[(2) - (2)].ival);
;}
break;
case 55:
-#line 443 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 443 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
(yyval.ival) = + (yyvsp[(2) - (2)].ival);
;}
break;
case 56:
-#line 446 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 446 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
(yyval.ival) = (yyvsp[(2) - (3)].ival);
;}
break;
case 57:
-#line 452 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 452 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
(yyval.string_list) = _string_list_create (parser);
_string_list_append_item ((yyval.string_list), (yyvsp[(1) - (1)].str));
@@ -2283,7 +2283,7 @@ yyreduce:
break;
case 58:
-#line 457 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 457 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
(yyval.string_list) = (yyvsp[(1) - (3)].string_list);
_string_list_append_item ((yyval.string_list), (yyvsp[(3) - (3)].str));
@@ -2292,31 +2292,31 @@ yyreduce:
break;
case 59:
-#line 465 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 465 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{ (yyval.token_list) = NULL; ;}
break;
case 61:
-#line 470 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 470 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
yyerror (& (yylsp[(1) - (2)]), parser, "Invalid tokens after #");
;}
break;
case 62:
-#line 476 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 476 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{ (yyval.token_list) = NULL; ;}
break;
case 65:
-#line 482 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 482 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
glcpp_warning(&(yylsp[(1) - (1)]), parser, "extra tokens at end of directive");
;}
break;
case 66:
-#line 489 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 489 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
int v = hash_table_find (parser->defines, (yyvsp[(2) - (2)].str)) ? 1 : 0;
(yyval.token) = _token_create_ival (parser, INTEGER, v);
@@ -2324,7 +2324,7 @@ yyreduce:
break;
case 67:
-#line 493 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 493 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
int v = hash_table_find (parser->defines, (yyvsp[(3) - (4)].str)) ? 1 : 0;
(yyval.token) = _token_create_ival (parser, INTEGER, v);
@@ -2332,7 +2332,7 @@ yyreduce:
break;
case 69:
-#line 502 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 502 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
(yyval.token_list) = _token_list_create (parser);
_token_list_append ((yyval.token_list), (yyvsp[(1) - (1)].token));
@@ -2340,7 +2340,7 @@ yyreduce:
break;
case 70:
-#line 506 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 506 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
(yyval.token_list) = (yyvsp[(1) - (2)].token_list);
_token_list_append ((yyval.token_list), (yyvsp[(2) - (2)].token));
@@ -2348,7 +2348,7 @@ yyreduce:
break;
case 71:
-#line 513 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 513 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
parser->space_tokens = 1;
(yyval.token_list) = _token_list_create (parser);
@@ -2357,7 +2357,7 @@ yyreduce:
break;
case 72:
-#line 518 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 518 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
(yyval.token_list) = (yyvsp[(1) - (2)].token_list);
_token_list_append ((yyval.token_list), (yyvsp[(2) - (2)].token));
@@ -2365,7 +2365,7 @@ yyreduce:
break;
case 73:
-#line 525 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 525 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
(yyval.token) = _token_create_str (parser, IDENTIFIER, (yyvsp[(1) - (1)].str));
(yyval.token)->location = yylloc;
@@ -2373,7 +2373,7 @@ yyreduce:
break;
case 74:
-#line 529 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 529 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
(yyval.token) = _token_create_str (parser, INTEGER_STRING, (yyvsp[(1) - (1)].str));
(yyval.token)->location = yylloc;
@@ -2381,7 +2381,7 @@ yyreduce:
break;
case 75:
-#line 533 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 533 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
(yyval.token) = _token_create_ival (parser, (yyvsp[(1) - (1)].ival), (yyvsp[(1) - (1)].ival));
(yyval.token)->location = yylloc;
@@ -2389,7 +2389,7 @@ yyreduce:
break;
case 76:
-#line 537 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 537 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
(yyval.token) = _token_create_str (parser, OTHER, (yyvsp[(1) - (1)].str));
(yyval.token)->location = yylloc;
@@ -2397,7 +2397,7 @@ yyreduce:
break;
case 77:
-#line 541 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 541 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{
(yyval.token) = _token_create_ival (parser, SPACE, SPACE);
(yyval.token)->location = yylloc;
@@ -2405,157 +2405,157 @@ yyreduce:
break;
case 78:
-#line 548 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 548 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{ (yyval.ival) = '['; ;}
break;
case 79:
-#line 549 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 549 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{ (yyval.ival) = ']'; ;}
break;
case 80:
-#line 550 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 550 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{ (yyval.ival) = '('; ;}
break;
case 81:
-#line 551 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 551 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{ (yyval.ival) = ')'; ;}
break;
case 82:
-#line 552 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 552 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{ (yyval.ival) = '{'; ;}
break;
case 83:
-#line 553 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 553 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{ (yyval.ival) = '}'; ;}
break;
case 84:
-#line 554 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 554 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{ (yyval.ival) = '.'; ;}
break;
case 85:
-#line 555 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 555 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{ (yyval.ival) = '&'; ;}
break;
case 86:
-#line 556 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 556 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{ (yyval.ival) = '*'; ;}
break;
case 87:
-#line 557 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 557 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{ (yyval.ival) = '+'; ;}
break;
case 88:
-#line 558 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 558 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{ (yyval.ival) = '-'; ;}
break;
case 89:
-#line 559 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 559 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{ (yyval.ival) = '~'; ;}
break;
case 90:
-#line 560 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 560 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{ (yyval.ival) = '!'; ;}
break;
case 91:
-#line 561 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 561 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{ (yyval.ival) = '/'; ;}
break;
case 92:
-#line 562 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 562 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{ (yyval.ival) = '%'; ;}
break;
case 93:
-#line 563 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 563 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{ (yyval.ival) = LEFT_SHIFT; ;}
break;
case 94:
-#line 564 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 564 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{ (yyval.ival) = RIGHT_SHIFT; ;}
break;
case 95:
-#line 565 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 565 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{ (yyval.ival) = '<'; ;}
break;
case 96:
-#line 566 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 566 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{ (yyval.ival) = '>'; ;}
break;
case 97:
-#line 567 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 567 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{ (yyval.ival) = LESS_OR_EQUAL; ;}
break;
case 98:
-#line 568 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 568 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{ (yyval.ival) = GREATER_OR_EQUAL; ;}
break;
case 99:
-#line 569 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 569 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{ (yyval.ival) = EQUAL; ;}
break;
case 100:
-#line 570 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 570 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{ (yyval.ival) = NOT_EQUAL; ;}
break;
case 101:
-#line 571 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 571 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{ (yyval.ival) = '^'; ;}
break;
case 102:
-#line 572 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 572 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{ (yyval.ival) = '|'; ;}
break;
case 103:
-#line 573 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 573 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{ (yyval.ival) = AND; ;}
break;
case 104:
-#line 574 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 574 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{ (yyval.ival) = OR; ;}
break;
case 105:
-#line 575 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 575 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{ (yyval.ival) = ';'; ;}
break;
case 106:
-#line 576 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 576 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{ (yyval.ival) = ','; ;}
break;
case 107:
-#line 577 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 577 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{ (yyval.ival) = '='; ;}
break;
case 108:
-#line 578 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 578 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
{ (yyval.ival) = PASTE; ;}
break;
@@ -2781,7 +2781,7 @@ yyreturn:
}
-#line 581 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
+#line 581 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glcpp/glcpp-parse.y"
string_list_t *
diff --git a/lib/libGL/generated/glsl/glsl_lexer.cpp b/lib/libGL/generated/glsl/glsl_lexer.cpp
index c405cf42f..65aa7aa85 100644
--- a/lib/libGL/generated/glsl/glsl_lexer.cpp
+++ b/lib/libGL/generated/glsl/glsl_lexer.cpp
@@ -1055,8 +1055,8 @@ static yyconst flex_int16_t yy_chk[1404] =
#define yymore() yymore_used_but_not_detected
#define YY_MORE_ADJ 0
#define YY_RESTORE_YY_MORE_OFFSET
-#line 1 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
-#line 2 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 1 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 2 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
/*
* Copyright © 2008, 2009 Intel Corporation
*
@@ -1445,7 +1445,7 @@ YY_DECL
register int yy_act;
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-#line 164 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 164 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
#line 1452 "glsl/glsl_lexer.cpp"
@@ -1534,7 +1534,7 @@ do_action: /* This label is used only to access EOF actions. */
case 1:
YY_RULE_SETUP
-#line 166 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 166 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
;
YY_BREAK
/* Preprocessor tokens. */
@@ -1543,17 +1543,17 @@ case 2:
yyg->yy_c_buf_p = yy_cp -= 1;
YY_DO_BEFORE_ACTION; /* set up yytext again */
YY_RULE_SETUP
-#line 169 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 169 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
;
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 170 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 170 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
{ BEGIN PP; return VERSION_TOK; }
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 171 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 171 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
{ BEGIN PP; return EXTENSION; }
YY_BREAK
case 5:
@@ -1561,7 +1561,7 @@ case 5:
yyg->yy_c_buf_p = yy_cp -= 1;
YY_DO_BEFORE_ACTION; /* set up yytext again */
YY_RULE_SETUP
-#line 172 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 172 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
{
/* Eat characters until the first digit is
* encountered
@@ -1583,7 +1583,7 @@ case 6:
yyg->yy_c_buf_p = yy_cp -= 1;
YY_DO_BEFORE_ACTION; /* set up yytext again */
YY_RULE_SETUP
-#line 187 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 187 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
{
/* Eat characters until the first digit is
* encountered
@@ -1601,7 +1601,7 @@ YY_RULE_SETUP
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 201 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 201 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
{
BEGIN PP;
return PRAGMA_DEBUG_ON;
@@ -1609,7 +1609,7 @@ YY_RULE_SETUP
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 205 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 205 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
{
BEGIN PP;
return PRAGMA_DEBUG_OFF;
@@ -1617,7 +1617,7 @@ YY_RULE_SETUP
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 209 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 209 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
{
BEGIN PP;
return PRAGMA_OPTIMIZE_ON;
@@ -1625,7 +1625,7 @@ YY_RULE_SETUP
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 213 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 213 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
{
BEGIN PP;
return PRAGMA_OPTIMIZE_OFF;
@@ -1633,7 +1633,7 @@ YY_RULE_SETUP
YY_BREAK
case 11:
YY_RULE_SETUP
-#line 217 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 217 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
{
BEGIN PP;
return PRAGMA_INVARIANT_ALL;
@@ -1641,38 +1641,38 @@ YY_RULE_SETUP
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 221 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 221 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
{ BEGIN PRAGMA; }
YY_BREAK
case 13:
/* rule 13 can match eol */
YY_RULE_SETUP
-#line 223 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 223 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
{ BEGIN 0; yylineno++; yycolumn = 0; }
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 224 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 224 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
{ }
YY_BREAK
case 15:
YY_RULE_SETUP
-#line 226 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 226 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
{ }
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 227 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 227 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
{ }
YY_BREAK
case 17:
YY_RULE_SETUP
-#line 228 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 228 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return COLON;
YY_BREAK
case 18:
YY_RULE_SETUP
-#line 229 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 229 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
{
yylval->identifier = strdup(yytext);
return IDENTIFIER;
@@ -1680,7 +1680,7 @@ YY_RULE_SETUP
YY_BREAK
case 19:
YY_RULE_SETUP
-#line 233 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 233 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
{
yylval->n = strtol(yytext, NULL, 10);
return INTCONSTANT;
@@ -1689,431 +1689,431 @@ YY_RULE_SETUP
case 20:
/* rule 20 can match eol */
YY_RULE_SETUP
-#line 237 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 237 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
{ BEGIN 0; yylineno++; yycolumn = 0; return EOL; }
YY_BREAK
case 21:
/* rule 21 can match eol */
YY_RULE_SETUP
-#line 239 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 239 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
{ yylineno++; yycolumn = 0; }
YY_BREAK
case 22:
YY_RULE_SETUP
-#line 241 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 241 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
DEPRECATED_ES_KEYWORD(ATTRIBUTE);
YY_BREAK
case 23:
YY_RULE_SETUP
-#line 242 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 242 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return CONST_TOK;
YY_BREAK
case 24:
YY_RULE_SETUP
-#line 243 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 243 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return BOOL_TOK;
YY_BREAK
case 25:
YY_RULE_SETUP
-#line 244 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 244 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return FLOAT_TOK;
YY_BREAK
case 26:
YY_RULE_SETUP
-#line 245 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 245 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return INT_TOK;
YY_BREAK
case 27:
YY_RULE_SETUP
-#line 246 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 246 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 130, 300, UINT_TOK);
YY_BREAK
case 28:
YY_RULE_SETUP
-#line 248 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 248 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return BREAK;
YY_BREAK
case 29:
YY_RULE_SETUP
-#line 249 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 249 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return CONTINUE;
YY_BREAK
case 30:
YY_RULE_SETUP
-#line 250 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 250 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return DO;
YY_BREAK
case 31:
YY_RULE_SETUP
-#line 251 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 251 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return WHILE;
YY_BREAK
case 32:
YY_RULE_SETUP
-#line 252 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 252 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return ELSE;
YY_BREAK
case 33:
YY_RULE_SETUP
-#line 253 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 253 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return FOR;
YY_BREAK
case 34:
YY_RULE_SETUP
-#line 254 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 254 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return IF;
YY_BREAK
case 35:
YY_RULE_SETUP
-#line 255 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 255 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return DISCARD;
YY_BREAK
case 36:
YY_RULE_SETUP
-#line 256 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 256 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return RETURN;
YY_BREAK
case 37:
YY_RULE_SETUP
-#line 258 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 258 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return BVEC2;
YY_BREAK
case 38:
YY_RULE_SETUP
-#line 259 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 259 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return BVEC3;
YY_BREAK
case 39:
YY_RULE_SETUP
-#line 260 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 260 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return BVEC4;
YY_BREAK
case 40:
YY_RULE_SETUP
-#line 261 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 261 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return IVEC2;
YY_BREAK
case 41:
YY_RULE_SETUP
-#line 262 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 262 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return IVEC3;
YY_BREAK
case 42:
YY_RULE_SETUP
-#line 263 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 263 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return IVEC4;
YY_BREAK
case 43:
YY_RULE_SETUP
-#line 264 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 264 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 130, 300, UVEC2);
YY_BREAK
case 44:
YY_RULE_SETUP
-#line 265 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 265 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 130, 300, UVEC3);
YY_BREAK
case 45:
YY_RULE_SETUP
-#line 266 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 266 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 130, 300, UVEC4);
YY_BREAK
case 46:
YY_RULE_SETUP
-#line 267 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 267 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return VEC2;
YY_BREAK
case 47:
YY_RULE_SETUP
-#line 268 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 268 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return VEC3;
YY_BREAK
case 48:
YY_RULE_SETUP
-#line 269 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 269 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return VEC4;
YY_BREAK
case 49:
YY_RULE_SETUP
-#line 270 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 270 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return MAT2X2;
YY_BREAK
case 50:
YY_RULE_SETUP
-#line 271 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 271 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return MAT3X3;
YY_BREAK
case 51:
YY_RULE_SETUP
-#line 272 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 272 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return MAT4X4;
YY_BREAK
case 52:
YY_RULE_SETUP
-#line 273 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 273 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(120, 300, 120, 300, MAT2X2);
YY_BREAK
case 53:
YY_RULE_SETUP
-#line 274 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 274 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(120, 300, 120, 300, MAT2X3);
YY_BREAK
case 54:
YY_RULE_SETUP
-#line 275 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 275 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(120, 300, 120, 300, MAT2X4);
YY_BREAK
case 55:
YY_RULE_SETUP
-#line 276 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 276 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(120, 300, 120, 300, MAT3X2);
YY_BREAK
case 56:
YY_RULE_SETUP
-#line 277 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 277 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(120, 300, 120, 300, MAT3X3);
YY_BREAK
case 57:
YY_RULE_SETUP
-#line 278 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 278 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(120, 300, 120, 300, MAT3X4);
YY_BREAK
case 58:
YY_RULE_SETUP
-#line 279 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 279 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(120, 300, 120, 300, MAT4X2);
YY_BREAK
case 59:
YY_RULE_SETUP
-#line 280 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 280 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(120, 300, 120, 300, MAT4X3);
YY_BREAK
case 60:
YY_RULE_SETUP
-#line 281 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 281 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(120, 300, 120, 300, MAT4X4);
YY_BREAK
case 61:
YY_RULE_SETUP
-#line 283 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 283 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return IN_TOK;
YY_BREAK
case 62:
YY_RULE_SETUP
-#line 284 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 284 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return OUT_TOK;
YY_BREAK
case 63:
YY_RULE_SETUP
-#line 285 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 285 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return INOUT_TOK;
YY_BREAK
case 64:
YY_RULE_SETUP
-#line 286 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 286 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return UNIFORM;
YY_BREAK
case 65:
YY_RULE_SETUP
-#line 287 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 287 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
DEPRECATED_ES_KEYWORD(VARYING);
YY_BREAK
case 66:
YY_RULE_SETUP
-#line 288 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 288 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(120, 300, 120, 300, CENTROID);
YY_BREAK
case 67:
YY_RULE_SETUP
-#line 289 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 289 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(120, 100, 120, 100, INVARIANT);
YY_BREAK
case 68:
YY_RULE_SETUP
-#line 290 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 290 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 100, 130, 300, FLAT);
YY_BREAK
case 69:
YY_RULE_SETUP
-#line 291 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 291 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 130, 300, SMOOTH);
YY_BREAK
case 70:
YY_RULE_SETUP
-#line 292 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 292 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 130, 0, NOPERSPECTIVE);
YY_BREAK
case 71:
YY_RULE_SETUP
-#line 294 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 294 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
DEPRECATED_ES_KEYWORD(SAMPLER1D);
YY_BREAK
case 72:
YY_RULE_SETUP
-#line 295 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 295 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return SAMPLER2D;
YY_BREAK
case 73:
YY_RULE_SETUP
-#line 296 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 296 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return SAMPLER3D;
YY_BREAK
case 74:
YY_RULE_SETUP
-#line 297 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 297 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return SAMPLERCUBE;
YY_BREAK
case 75:
YY_RULE_SETUP
-#line 298 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 298 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 130, 0, SAMPLER1DARRAY);
YY_BREAK
case 76:
YY_RULE_SETUP
-#line 299 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 299 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 130, 300, SAMPLER2DARRAY);
YY_BREAK
case 77:
YY_RULE_SETUP
-#line 300 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 300 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
DEPRECATED_ES_KEYWORD(SAMPLER1DSHADOW);
YY_BREAK
case 78:
YY_RULE_SETUP
-#line 301 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 301 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return SAMPLER2DSHADOW;
YY_BREAK
case 79:
YY_RULE_SETUP
-#line 302 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 302 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 130, 300, SAMPLERCUBESHADOW);
YY_BREAK
case 80:
YY_RULE_SETUP
-#line 303 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 303 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 130, 0, SAMPLER1DARRAYSHADOW);
YY_BREAK
case 81:
YY_RULE_SETUP
-#line 304 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 304 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 130, 300, SAMPLER2DARRAYSHADOW);
YY_BREAK
case 82:
YY_RULE_SETUP
-#line 305 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 305 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 130, 0, ISAMPLER1D);
YY_BREAK
case 83:
YY_RULE_SETUP
-#line 306 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 306 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 130, 300, ISAMPLER2D);
YY_BREAK
case 84:
YY_RULE_SETUP
-#line 307 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 307 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 130, 300, ISAMPLER3D);
YY_BREAK
case 85:
YY_RULE_SETUP
-#line 308 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 308 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 130, 300, ISAMPLERCUBE);
YY_BREAK
case 86:
YY_RULE_SETUP
-#line 309 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 309 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 130, 0, ISAMPLER1DARRAY);
YY_BREAK
case 87:
YY_RULE_SETUP
-#line 310 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 310 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 130, 300, ISAMPLER2DARRAY);
YY_BREAK
case 88:
YY_RULE_SETUP
-#line 311 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 311 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 130, 0, USAMPLER1D);
YY_BREAK
case 89:
YY_RULE_SETUP
-#line 312 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 312 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 130, 300, USAMPLER2D);
YY_BREAK
case 90:
YY_RULE_SETUP
-#line 313 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 313 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 130, 300, USAMPLER3D);
YY_BREAK
case 91:
YY_RULE_SETUP
-#line 314 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 314 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 130, 300, USAMPLERCUBE);
YY_BREAK
case 92:
YY_RULE_SETUP
-#line 315 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 315 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 130, 0, USAMPLER1DARRAY);
YY_BREAK
case 93:
YY_RULE_SETUP
-#line 316 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 316 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 130, 300, USAMPLER2DARRAY);
YY_BREAK
/* additional keywords in ARB_texture_multisample, included in GLSL 1.50 */
/* these are reserved but not defined in GLSL 3.00 */
case 94:
YY_RULE_SETUP
-#line 320 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 320 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD_WITH_ALT(150, 300, 150, 0, yyextra->ARB_texture_multisample_enable, SAMPLER2DMS);
YY_BREAK
case 95:
YY_RULE_SETUP
-#line 321 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 321 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD_WITH_ALT(150, 300, 150, 0, yyextra->ARB_texture_multisample_enable, ISAMPLER2DMS);
YY_BREAK
case 96:
YY_RULE_SETUP
-#line 322 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 322 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD_WITH_ALT(150, 300, 150, 0, yyextra->ARB_texture_multisample_enable, USAMPLER2DMS);
YY_BREAK
case 97:
YY_RULE_SETUP
-#line 323 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 323 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD_WITH_ALT(150, 300, 150, 0, yyextra->ARB_texture_multisample_enable, SAMPLER2DMSARRAY);
YY_BREAK
case 98:
YY_RULE_SETUP
-#line 324 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 324 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD_WITH_ALT(150, 300, 150, 0, yyextra->ARB_texture_multisample_enable, ISAMPLER2DMSARRAY);
YY_BREAK
case 99:
YY_RULE_SETUP
-#line 325 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 325 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD_WITH_ALT(150, 300, 150, 0, yyextra->ARB_texture_multisample_enable, USAMPLER2DMSARRAY);
YY_BREAK
/* keywords available with ARB_texture_cube_map_array_enable extension on desktop GLSL */
case 100:
YY_RULE_SETUP
-#line 328 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 328 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD_WITH_ALT(400, 0, 400, 0, yyextra->ARB_texture_cube_map_array_enable, SAMPLERCUBEARRAY);
YY_BREAK
case 101:
YY_RULE_SETUP
-#line 329 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 329 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD_WITH_ALT(400, 0, 400, 0, yyextra->ARB_texture_cube_map_array_enable, ISAMPLERCUBEARRAY);
YY_BREAK
case 102:
YY_RULE_SETUP
-#line 330 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 330 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD_WITH_ALT(400, 0, 400, 0, yyextra->ARB_texture_cube_map_array_enable, USAMPLERCUBEARRAY);
YY_BREAK
case 103:
YY_RULE_SETUP
-#line 331 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 331 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD_WITH_ALT(400, 0, 400, 0, yyextra->ARB_texture_cube_map_array_enable, SAMPLERCUBEARRAYSHADOW);
YY_BREAK
case 104:
YY_RULE_SETUP
-#line 333 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 333 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
{
if (yyextra->OES_EGL_image_external_enable)
return SAMPLEREXTERNALOES;
@@ -2123,17 +2123,17 @@ YY_RULE_SETUP
YY_BREAK
case 105:
YY_RULE_SETUP
-#line 341 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 341 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return STRUCT;
YY_BREAK
case 106:
YY_RULE_SETUP
-#line 342 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 342 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return VOID_TOK;
YY_BREAK
case 107:
YY_RULE_SETUP
-#line 344 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 344 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
{
if ((yyextra->is_version(140, 300))
|| yyextra->AMD_conservative_depth_enable
@@ -2151,133 +2151,133 @@ YY_RULE_SETUP
YY_BREAK
case 108:
YY_RULE_SETUP
-#line 359 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 359 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return INC_OP;
YY_BREAK
case 109:
YY_RULE_SETUP
-#line 360 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 360 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return DEC_OP;
YY_BREAK
case 110:
YY_RULE_SETUP
-#line 361 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 361 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return LE_OP;
YY_BREAK
case 111:
YY_RULE_SETUP
-#line 362 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 362 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return GE_OP;
YY_BREAK
case 112:
YY_RULE_SETUP
-#line 363 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 363 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return EQ_OP;
YY_BREAK
case 113:
YY_RULE_SETUP
-#line 364 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 364 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return NE_OP;
YY_BREAK
case 114:
YY_RULE_SETUP
-#line 365 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 365 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return AND_OP;
YY_BREAK
case 115:
YY_RULE_SETUP
-#line 366 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 366 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return OR_OP;
YY_BREAK
case 116:
YY_RULE_SETUP
-#line 367 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 367 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return XOR_OP;
YY_BREAK
case 117:
YY_RULE_SETUP
-#line 368 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 368 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return LEFT_OP;
YY_BREAK
case 118:
YY_RULE_SETUP
-#line 369 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 369 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return RIGHT_OP;
YY_BREAK
case 119:
YY_RULE_SETUP
-#line 371 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 371 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return MUL_ASSIGN;
YY_BREAK
case 120:
YY_RULE_SETUP
-#line 372 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 372 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return DIV_ASSIGN;
YY_BREAK
case 121:
YY_RULE_SETUP
-#line 373 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 373 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return ADD_ASSIGN;
YY_BREAK
case 122:
YY_RULE_SETUP
-#line 374 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 374 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return MOD_ASSIGN;
YY_BREAK
case 123:
YY_RULE_SETUP
-#line 375 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 375 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return LEFT_ASSIGN;
YY_BREAK
case 124:
YY_RULE_SETUP
-#line 376 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 376 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return RIGHT_ASSIGN;
YY_BREAK
case 125:
YY_RULE_SETUP
-#line 377 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 377 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return AND_ASSIGN;
YY_BREAK
case 126:
YY_RULE_SETUP
-#line 378 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 378 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return XOR_ASSIGN;
YY_BREAK
case 127:
YY_RULE_SETUP
-#line 379 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 379 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return OR_ASSIGN;
YY_BREAK
case 128:
YY_RULE_SETUP
-#line 380 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 380 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
return SUB_ASSIGN;
YY_BREAK
case 129:
YY_RULE_SETUP
-#line 382 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 382 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
{
return LITERAL_INTEGER(10);
}
YY_BREAK
case 130:
YY_RULE_SETUP
-#line 385 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 385 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
{
return LITERAL_INTEGER(16);
}
YY_BREAK
case 131:
YY_RULE_SETUP
-#line 388 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 388 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
{
return LITERAL_INTEGER(8);
}
YY_BREAK
case 132:
YY_RULE_SETUP
-#line 392 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 392 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
{
yylval->real = glsl_strtof(yytext, NULL);
return FLOATCONSTANT;
@@ -2285,7 +2285,7 @@ YY_RULE_SETUP
YY_BREAK
case 133:
YY_RULE_SETUP
-#line 396 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 396 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
{
yylval->real = glsl_strtof(yytext, NULL);
return FLOATCONSTANT;
@@ -2293,7 +2293,7 @@ YY_RULE_SETUP
YY_BREAK
case 134:
YY_RULE_SETUP
-#line 400 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 400 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
{
yylval->real = glsl_strtof(yytext, NULL);
return FLOATCONSTANT;
@@ -2301,7 +2301,7 @@ YY_RULE_SETUP
YY_BREAK
case 135:
YY_RULE_SETUP
-#line 404 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 404 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
{
yylval->real = glsl_strtof(yytext, NULL);
return FLOATCONSTANT;
@@ -2309,7 +2309,7 @@ YY_RULE_SETUP
YY_BREAK
case 136:
YY_RULE_SETUP
-#line 408 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 408 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
{
yylval->real = glsl_strtof(yytext, NULL);
return FLOATCONSTANT;
@@ -2317,7 +2317,7 @@ YY_RULE_SETUP
YY_BREAK
case 137:
YY_RULE_SETUP
-#line 413 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 413 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
{
yylval->n = 1;
return BOOLCONSTANT;
@@ -2325,7 +2325,7 @@ YY_RULE_SETUP
YY_BREAK
case 138:
YY_RULE_SETUP
-#line 417 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 417 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
{
yylval->n = 0;
return BOOLCONSTANT;
@@ -2334,476 +2334,476 @@ YY_RULE_SETUP
/* Reserved words in GLSL 1.10. */
case 139:
YY_RULE_SETUP
-#line 424 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 424 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 0, 0, ASM);
YY_BREAK
case 140:
YY_RULE_SETUP
-#line 425 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 425 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 0, 0, CLASS);
YY_BREAK
case 141:
YY_RULE_SETUP
-#line 426 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 426 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 0, 0, UNION);
YY_BREAK
case 142:
YY_RULE_SETUP
-#line 427 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 427 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 0, 0, ENUM);
YY_BREAK
case 143:
YY_RULE_SETUP
-#line 428 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 428 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 0, 0, TYPEDEF);
YY_BREAK
case 144:
YY_RULE_SETUP
-#line 429 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 429 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 0, 0, TEMPLATE);
YY_BREAK
case 145:
YY_RULE_SETUP
-#line 430 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 430 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 0, 0, THIS);
YY_BREAK
case 146:
YY_RULE_SETUP
-#line 431 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 431 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD_WITH_ALT(110, 100, 140, 300, yyextra->ARB_uniform_buffer_object_enable, PACKED_TOK);
YY_BREAK
case 147:
YY_RULE_SETUP
-#line 432 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 432 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 0, 0, GOTO);
YY_BREAK
case 148:
YY_RULE_SETUP
-#line 433 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 433 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 130, 300, SWITCH);
YY_BREAK
case 149:
YY_RULE_SETUP
-#line 434 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 434 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 130, 300, DEFAULT);
YY_BREAK
case 150:
YY_RULE_SETUP
-#line 435 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 435 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 0, 0, INLINE_TOK);
YY_BREAK
case 151:
YY_RULE_SETUP
-#line 436 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 436 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 0, 0, NOINLINE);
YY_BREAK
case 152:
YY_RULE_SETUP
-#line 437 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 437 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 0, 0, VOLATILE);
YY_BREAK
case 153:
YY_RULE_SETUP
-#line 438 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 438 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 0, 0, PUBLIC_TOK);
YY_BREAK
case 154:
YY_RULE_SETUP
-#line 439 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 439 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 0, 0, STATIC);
YY_BREAK
case 155:
YY_RULE_SETUP
-#line 440 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 440 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 0, 0, EXTERN);
YY_BREAK
case 156:
YY_RULE_SETUP
-#line 441 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 441 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 0, 0, EXTERNAL);
YY_BREAK
case 157:
YY_RULE_SETUP
-#line 442 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 442 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 0, 0, INTERFACE);
YY_BREAK
case 158:
YY_RULE_SETUP
-#line 443 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 443 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 0, 0, LONG_TOK);
YY_BREAK
case 159:
YY_RULE_SETUP
-#line 444 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 444 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 0, 0, SHORT_TOK);
YY_BREAK
case 160:
YY_RULE_SETUP
-#line 445 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 445 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 400, 0, DOUBLE_TOK);
YY_BREAK
case 161:
YY_RULE_SETUP
-#line 446 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 446 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 0, 0, HALF);
YY_BREAK
case 162:
YY_RULE_SETUP
-#line 447 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 447 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 0, 0, FIXED_TOK);
YY_BREAK
case 163:
YY_RULE_SETUP
-#line 448 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 448 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 0, 0, UNSIGNED);
YY_BREAK
case 164:
YY_RULE_SETUP
-#line 449 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 449 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 0, 0, INPUT_TOK);
YY_BREAK
case 165:
YY_RULE_SETUP
-#line 450 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 450 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 0, 0, OUTPUT);
YY_BREAK
case 166:
YY_RULE_SETUP
-#line 451 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 451 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 0, 0, HVEC2);
YY_BREAK
case 167:
YY_RULE_SETUP
-#line 452 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 452 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 0, 0, HVEC3);
YY_BREAK
case 168:
YY_RULE_SETUP
-#line 453 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 453 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 0, 0, HVEC4);
YY_BREAK
case 169:
YY_RULE_SETUP
-#line 454 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 454 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 400, 0, DVEC2);
YY_BREAK
case 170:
YY_RULE_SETUP
-#line 455 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 455 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 400, 0, DVEC3);
YY_BREAK
case 171:
YY_RULE_SETUP
-#line 456 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 456 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 400, 0, DVEC4);
YY_BREAK
case 172:
YY_RULE_SETUP
-#line 457 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 457 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 0, 0, FVEC2);
YY_BREAK
case 173:
YY_RULE_SETUP
-#line 458 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 458 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 0, 0, FVEC3);
YY_BREAK
case 174:
YY_RULE_SETUP
-#line 459 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 459 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 0, 0, FVEC4);
YY_BREAK
case 175:
YY_RULE_SETUP
-#line 460 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 460 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
DEPRECATED_ES_KEYWORD(SAMPLER2DRECT);
YY_BREAK
case 176:
YY_RULE_SETUP
-#line 461 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 461 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 0, 0, SAMPLER3DRECT);
YY_BREAK
case 177:
YY_RULE_SETUP
-#line 462 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 462 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
DEPRECATED_ES_KEYWORD(SAMPLER2DRECTSHADOW);
YY_BREAK
case 178:
YY_RULE_SETUP
-#line 463 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 463 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 0, 0, SIZEOF);
YY_BREAK
case 179:
YY_RULE_SETUP
-#line 464 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 464 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 0, 0, CAST);
YY_BREAK
case 180:
YY_RULE_SETUP
-#line 465 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 465 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 0, 0, NAMESPACE);
YY_BREAK
case 181:
YY_RULE_SETUP
-#line 466 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 466 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(110, 100, 0, 0, USING);
YY_BREAK
/* Additional reserved words in GLSL 1.20. */
case 182:
YY_RULE_SETUP
-#line 469 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 469 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(120, 100, 130, 100, LOWP);
YY_BREAK
case 183:
YY_RULE_SETUP
-#line 470 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 470 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(120, 100, 130, 100, MEDIUMP);
YY_BREAK
case 184:
YY_RULE_SETUP
-#line 471 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 471 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(120, 100, 130, 100, HIGHP);
YY_BREAK
case 185:
YY_RULE_SETUP
-#line 472 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 472 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(120, 100, 130, 100, PRECISION);
YY_BREAK
/* Additional reserved words in GLSL 1.30. */
case 186:
YY_RULE_SETUP
-#line 475 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 475 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 130, 300, CASE);
YY_BREAK
case 187:
YY_RULE_SETUP
-#line 476 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 476 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 0, 0, COMMON);
YY_BREAK
case 188:
YY_RULE_SETUP
-#line 477 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 477 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 0, 0, PARTITION);
YY_BREAK
case 189:
YY_RULE_SETUP
-#line 478 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 478 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 0, 0, ACTIVE);
YY_BREAK
case 190:
YY_RULE_SETUP
-#line 479 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 479 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 100, 0, 0, SUPERP);
YY_BREAK
case 191:
YY_RULE_SETUP
-#line 480 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 480 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 140, 0, SAMPLERBUFFER);
YY_BREAK
case 192:
YY_RULE_SETUP
-#line 481 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 481 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 0, 0, FILTER);
YY_BREAK
case 193:
YY_RULE_SETUP
-#line 482 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 482 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 0, 0, IMAGE1D);
YY_BREAK
case 194:
YY_RULE_SETUP
-#line 483 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 483 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 0, 0, IMAGE2D);
YY_BREAK
case 195:
YY_RULE_SETUP
-#line 484 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 484 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 0, 0, IMAGE3D);
YY_BREAK
case 196:
YY_RULE_SETUP
-#line 485 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 485 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 0, 0, IMAGECUBE);
YY_BREAK
case 197:
YY_RULE_SETUP
-#line 486 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 486 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 0, 0, IIMAGE1D);
YY_BREAK
case 198:
YY_RULE_SETUP
-#line 487 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 487 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 0, 0, IIMAGE2D);
YY_BREAK
case 199:
YY_RULE_SETUP
-#line 488 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 488 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 0, 0, IIMAGE3D);
YY_BREAK
case 200:
YY_RULE_SETUP
-#line 489 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 489 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 0, 0, IIMAGECUBE);
YY_BREAK
case 201:
YY_RULE_SETUP
-#line 490 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 490 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 0, 0, UIMAGE1D);
YY_BREAK
case 202:
YY_RULE_SETUP
-#line 491 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 491 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 0, 0, UIMAGE2D);
YY_BREAK
case 203:
YY_RULE_SETUP
-#line 492 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 492 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 0, 0, UIMAGE3D);
YY_BREAK
case 204:
YY_RULE_SETUP
-#line 493 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 493 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 0, 0, UIMAGECUBE);
YY_BREAK
case 205:
YY_RULE_SETUP
-#line 494 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 494 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 0, 0, IMAGE1DARRAY);
YY_BREAK
case 206:
YY_RULE_SETUP
-#line 495 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 495 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 0, 0, IMAGE2DARRAY);
YY_BREAK
case 207:
YY_RULE_SETUP
-#line 496 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 496 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 0, 0, IIMAGE1DARRAY);
YY_BREAK
case 208:
YY_RULE_SETUP
-#line 497 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 497 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 0, 0, IIMAGE2DARRAY);
YY_BREAK
case 209:
YY_RULE_SETUP
-#line 498 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 498 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 0, 0, UIMAGE1DARRAY);
YY_BREAK
case 210:
YY_RULE_SETUP
-#line 499 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 499 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 0, 0, UIMAGE2DARRAY);
YY_BREAK
case 211:
YY_RULE_SETUP
-#line 500 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 500 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 0, 0, IMAGE1DSHADOW);
YY_BREAK
case 212:
YY_RULE_SETUP
-#line 501 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 501 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 0, 0, IMAGE2DSHADOW);
YY_BREAK
case 213:
YY_RULE_SETUP
-#line 502 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 502 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 0, 0, IMAGE1DARRAYSHADOW);
YY_BREAK
case 214:
YY_RULE_SETUP
-#line 503 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 503 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 0, 0, IMAGE2DARRAYSHADOW);
YY_BREAK
case 215:
YY_RULE_SETUP
-#line 504 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 504 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 0, 0, IMAGEBUFFER);
YY_BREAK
case 216:
YY_RULE_SETUP
-#line 505 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 505 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 0, 0, IIMAGEBUFFER);
YY_BREAK
case 217:
YY_RULE_SETUP
-#line 506 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 506 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(130, 300, 0, 0, UIMAGEBUFFER);
YY_BREAK
case 218:
YY_RULE_SETUP
-#line 507 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 507 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD_WITH_ALT(130, 0, 140, 0, yyextra->ARB_uniform_buffer_object_enable && !yyextra->es_shader, ROW_MAJOR);
YY_BREAK
/* Additional reserved words in GLSL 1.40 */
case 219:
YY_RULE_SETUP
-#line 510 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 510 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(140, 300, 140, 0, ISAMPLER2DRECT);
YY_BREAK
case 220:
YY_RULE_SETUP
-#line 511 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 511 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(140, 300, 140, 0, USAMPLER2DRECT);
YY_BREAK
case 221:
YY_RULE_SETUP
-#line 512 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 512 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(140, 300, 140, 0, ISAMPLERBUFFER);
YY_BREAK
case 222:
YY_RULE_SETUP
-#line 513 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 513 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(140, 300, 140, 0, USAMPLERBUFFER);
YY_BREAK
/* Additional reserved words in GLSL ES 3.00 */
case 223:
YY_RULE_SETUP
-#line 516 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 516 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(0, 300, 0, 0, COHERENT);
YY_BREAK
case 224:
YY_RULE_SETUP
-#line 517 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 517 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(0, 300, 0, 0, RESTRICT);
YY_BREAK
case 225:
YY_RULE_SETUP
-#line 518 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 518 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(0, 300, 0, 0, READONLY);
YY_BREAK
case 226:
YY_RULE_SETUP
-#line 519 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 519 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(0, 300, 0, 0, WRITEONLY);
YY_BREAK
case 227:
YY_RULE_SETUP
-#line 520 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 520 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(0, 300, 0, 0, RESOURCE);
YY_BREAK
case 228:
YY_RULE_SETUP
-#line 521 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 521 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(0, 300, 0, 0, ATOMIC_UINT);
YY_BREAK
case 229:
YY_RULE_SETUP
-#line 522 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 522 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(0, 300, 0, 0, PATCH);
YY_BREAK
case 230:
YY_RULE_SETUP
-#line 523 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 523 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(0, 300, 0, 0, SAMPLE);
YY_BREAK
case 231:
YY_RULE_SETUP
-#line 524 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 524 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
KEYWORD(0, 300, 0, 0, SUBROUTINE);
YY_BREAK
case 232:
YY_RULE_SETUP
-#line 527 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 527 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
{
struct _mesa_glsl_parse_state *state = yyextra;
void *ctx = state;
@@ -2813,12 +2813,12 @@ YY_RULE_SETUP
YY_BREAK
case 233:
YY_RULE_SETUP
-#line 534 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 534 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
{ return yytext[0]; }
YY_BREAK
case 234:
YY_RULE_SETUP
-#line 536 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 536 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
ECHO;
YY_BREAK
#line 2825 "glsl/glsl_lexer.cpp"
@@ -3964,7 +3964,7 @@ void _mesa_glsl_lexer_free (void * ptr , yyscan_t yyscanner)
#define YYTABLES_NAME "yytables"
-#line 536 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
+#line 536 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_lexer.ll"
diff --git a/lib/libGL/generated/glsl/glsl_parser.cpp b/lib/libGL/generated/glsl/glsl_parser.cpp
index f07522e16..803dae506 100644
--- a/lib/libGL/generated/glsl/glsl_parser.cpp
+++ b/lib/libGL/generated/glsl/glsl_parser.cpp
@@ -518,7 +518,7 @@
/* Copy the first part of user declarations. */
-#line 1 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
/*
* Copyright © 2008, 2009 Intel Corporation
@@ -586,7 +586,7 @@ _mesa_glsl_lex(YYSTYPE *val, YYLTYPE *loc, _mesa_glsl_parse_state *state)
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
-#line 65 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 65 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
int n;
float real;
@@ -865,7 +865,7 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 5
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 3501
+#define YYLAST 3639
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 245
@@ -1052,7 +1052,7 @@ static const yytype_int16 yyrhs[] =
-1, 86, -1, 87, -1, 88, -1, 89, -1, 126,
-1, 125, -1, 124, -1, 91, 251, 243, 314, 244,
-1, 91, 243, 314, 244, -1, 315, -1, 314, 315,
- -1, 309, 316, 242, -1, 317, -1, 316, 226, 317,
+ -1, 299, 316, 242, -1, 317, -1, 316, 226, 317,
-1, 251, -1, 251, 223, 286, 224, -1, 283, -1,
243, 319, 244, -1, 243, 319, 226, 244, -1, 318,
-1, 319, 226, 318, -1, 287, -1, 323, -1, 322,
@@ -1108,15 +1108,15 @@ static const yytype_uint16 yyrline[] =
1594, 1595, 1596, 1597, 1598, 1599, 1600, 1601, 1602, 1603,
1604, 1605, 1606, 1607, 1608, 1609, 1610, 1611, 1612, 1613,
1614, 1615, 1616, 1617, 1618, 1622, 1627, 1632, 1640, 1648,
- 1657, 1662, 1670, 1685, 1690, 1698, 1704, 1713, 1714, 1718,
- 1725, 1732, 1739, 1745, 1746, 1750, 1751, 1752, 1753, 1754,
- 1755, 1759, 1766, 1765, 1779, 1780, 1784, 1790, 1799, 1809,
- 1821, 1827, 1836, 1845, 1850, 1858, 1862, 1880, 1888, 1893,
- 1901, 1906, 1914, 1922, 1930, 1938, 1946, 1954, 1962, 1969,
- 1976, 1986, 1987, 1991, 1993, 1999, 2004, 2013, 2019, 2025,
- 2031, 2037, 2046, 2047, 2048, 2049, 2053, 2067, 2071, 2082,
- 2179, 2184, 2189, 2198, 2202, 2207, 2212, 2223, 2228, 2236,
- 2260
+ 1657, 1662, 1670, 1689, 1694, 1702, 1708, 1717, 1718, 1722,
+ 1729, 1736, 1743, 1749, 1750, 1754, 1755, 1756, 1757, 1758,
+ 1759, 1763, 1770, 1769, 1783, 1784, 1788, 1794, 1803, 1813,
+ 1825, 1831, 1840, 1849, 1854, 1862, 1866, 1884, 1892, 1897,
+ 1905, 1910, 1918, 1926, 1934, 1942, 1950, 1958, 1966, 1973,
+ 1980, 1990, 1991, 1995, 1997, 2003, 2008, 2017, 2023, 2029,
+ 2035, 2041, 2050, 2051, 2052, 2053, 2057, 2071, 2075, 2086,
+ 2183, 2188, 2193, 2202, 2206, 2211, 2216, 2227, 2232, 2240,
+ 2264
};
#endif
@@ -1401,75 +1401,75 @@ static const yytype_int16 yydefgoto[] =
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -392
+#define YYPACT_NINF -401
static const yytype_int16 yypact[] =
{
- -100, -8, 108, -392, -50, -392, 3, -392, -392, -392,
- -392, 9, 127, 3234, -392, -392, 24, -392, -392, -392,
- -392, -392, -392, -392, -392, -392, -392, -392, -392, -392,
- -392, -392, -392, -392, -392, -392, 66, 68, 74, -392,
- -392, -392, -392, -392, -392, -392, -392, -392, -392, -392,
- -392, -392, -392, -392, -392, -392, -392, -392, -392, -392,
- -392, -392, -392, -392, -392, -392, -392, -392, -392, -392,
- -392, -392, -392, -392, -392, -392, -392, -392, -392, -392,
- -392, -392, -392, -392, -392, -392, -392, -392, -392, -392,
- -392, -392, -392, -80, -392, -392, 289, -392, -392, -392,
- 109, 39, 41, 51, 60, 92, 15, -392, 3234, -392,
- -209, 8, 12, 2, -166, -392, 150, 215, 312, 1319,
- 312, 312, -392, 17, -392, 312, -392, -392, -392, -392,
- -392, 154, -392, 127, 1319, 13, -392, -392, -392, -392,
- -392, 312, -392, 312, -392, 1319, -392, -392, -392, -392,
- -392, -64, -392, -392, 484, -392, -392, 34, 34, -392,
- -392, -392, -392, 1319, 34, 34, 127, -392, 43, 49,
- -161, 50, -95, -392, -392, -392, -392, -392, -392, 2373,
- -392, 30, 141, 127, 593, -392, 1319, 33, -392, -392,
- 35, -113, -392, -392, 36, 38, 1451, 63, 65, 47,
- 2255, 77, 80, -392, -392, -392, -392, -392, 1801, 1801,
- 1801, -392, -392, -392, -392, -392, 55, -392, 83, -392,
- -33, -392, -392, -392, 59, -112, 3006, 84, -63, 1801,
- 27, -46, -21, -81, 37, 71, 58, 70, 199, 198,
- -90, -392, -392, -165, -392, 72, 1067, 91, -392, -392,
- -392, -392, 726, -392, -392, -392, -392, -392, -392, -392,
- -392, -392, 127, -392, -392, -153, 2694, 2147, -392, -392,
- -392, -392, -392, 89, -392, 3360, -392, 94, -151, -392,
- -392, -392, 835, -392, 78, -392, -64, -392, -392, 225,
- 1920, 1801, -392, -392, -142, 1801, 2483, -392, -392, -97,
- -392, 1451, -392, -392, 1801, 150, -392, -392, 1801, 97,
- -392, -392, -392, -392, -392, -392, -392, -392, -392, -392,
- -392, -392, -392, 1801, -392, 1801, 1801, 1801, 1801, 1801,
- 1801, 1801, 1801, 1801, 1801, 1801, 1801, 1801, 1801, 1801,
- 1801, 1801, 1801, 1801, 1801, 1801, -392, -392, -392, 101,
- 2795, 2147, 79, 107, 2147, -392, -392, -392, 127, 88,
- 3360, 1801, 127, -392, -392, -392, -392, -392, -392, 112,
- -392, -392, 2483, -87, -392, -82, 110, 127, 113, -392,
- 968, 119, 110, -392, 132, -392, 133, -65, 3116, -392,
- -392, -392, -392, -392, 27, 27, -46, -46, -21, -21,
- -21, -21, -81, -81, 37, 71, 58, 70, 199, 198,
- -139, -392, 1801, 93, 130, -392, 2147, 117, -392, -152,
- -137, 266, -392, 139, -392, 1801, -392, 122, 144, 1451,
- 125, 129, 1692, -392, -392, -392, -392, -392, 1801, 149,
- -392, 1801, 148, 2147, 134, -392, 2147, 2029, -392, -392,
- 153, 131, -392, -57, 1801, 1692, 365, -392, -15, -392,
- 2147, -392, -392, -392, -392, -392, -392, -392, 2147, -392,
- -392, -392, 2905, -392, 137, 110, -392, 1451, 1801, 140,
- -392, -392, 1210, 1451, -7, -392, -392, -392, 157, -392,
- -392, -133, -392, -392, -392, -392, -392, 1451, -392, -392
+ -110, -39, 82, -401, -21, -401, -22, -401, -401, -401,
+ -401, -23, -5, 3372, -401, -401, -16, -401, -401, -401,
+ -401, -401, -401, -401, -401, -401, -401, -401, -401, -401,
+ -401, -401, -401, -401, -401, -401, 23, 34, 50, -401,
+ -401, -401, -401, -401, -401, -401, -401, -401, -401, -401,
+ -401, -401, -401, -401, -401, -401, -401, -401, -401, -401,
+ -401, -401, -401, -401, -401, -401, -401, -401, -401, -401,
+ -401, -401, -401, -401, -401, -401, -401, -401, -401, -401,
+ -401, -401, -401, -401, -401, -401, -401, -401, -401, -401,
+ -401, -401, -401, -71, -401, -401, 289, -401, -401, -401,
+ 134, 5, 15, 36, 41, 43, -43, -401, 3372, -401,
+ -61, -38, -36, 2, -197, -401, 170, 215, 312, 835,
+ 312, 312, -401, -6, -401, 312, -401, -401, -401, -401,
+ -401, 129, -401, -5, 3498, -10, -401, -401, -401, -401,
+ -401, 312, -401, 312, -401, 835, -401, -401, -401, -401,
+ -401, -42, -401, -401, 484, -401, -401, 37, 37, -401,
+ -401, -401, -401, 835, 37, 37, -5, -401, 6, 7,
+ -190, 9, -95, -401, -401, -401, -401, -401, -401, 2511,
+ -401, -3, 105, -5, 1095, -401, 3498, 3, -401, -401,
+ 26, -142, -401, -401, 8, 14, 1589, 47, 49, 29,
+ 2393, 55, 59, -401, -401, -401, -401, -401, 1939, 1939,
+ 1939, -401, -401, -401, -401, -401, 0, -401, 60, -401,
+ -83, -401, -401, -401, 62, -121, 3144, 65, 360, 1939,
+ 42, -171, 57, -80, 56, 53, 58, 40, 188, 187,
+ -81, -401, -401, -165, -401, 63, 583, 80, -401, -401,
+ -401, -401, 726, -401, -401, -401, -401, -401, -401, -401,
+ -401, -401, -5, -401, -401, -177, 2832, 2285, -401, -401,
+ -401, -401, -401, 83, -401, 3498, -401, 81, -159, -401,
+ -401, -401, 1219, -401, 94, -401, -42, -401, -401, 216,
+ 2058, 1939, -401, -401, -157, 1939, 2621, -401, -401, -113,
+ -401, 1589, -401, -401, 1939, 170, -401, -401, 1939, 86,
+ -401, -401, -401, -401, -401, -401, -401, -401, -401, -401,
+ -401, -401, -401, 1939, -401, 1939, 1939, 1939, 1939, 1939,
+ 1939, 1939, 1939, 1939, 1939, 1939, 1939, 1939, 1939, 1939,
+ 1939, 1939, 1939, 1939, 1939, 1939, -401, -401, -401, 87,
+ 2933, 2285, 71, 89, 2285, -401, -401, -401, -5, 70,
+ 3498, 1939, -5, -401, -401, -401, -401, -401, -401, 97,
+ -401, -401, 2621, -104, -401, -97, 93, -5, 98, -401,
+ 968, 100, 93, -401, 110, -401, 111, -91, 3254, -401,
+ -401, -401, -401, -401, 42, 42, -171, -171, 57, 57,
+ 57, 57, -80, -80, 56, 53, 58, 40, 188, 187,
+ -178, -401, 1939, 91, 112, -401, 2285, 102, -401, -176,
+ -150, 238, -401, 130, -401, 1939, -401, 113, 131, 1589,
+ 92, 116, 1830, -401, -401, -401, -401, -401, 1939, 136,
+ -401, 1939, 137, 2285, 119, -401, 2285, 2167, -401, -401,
+ 139, 121, -401, -69, 1939, 1830, 352, -401, -15, -401,
+ 2285, -401, -401, -401, -401, -401, -401, -401, 2285, -401,
+ -401, -401, 3043, -401, 124, 93, -401, 1589, 1939, 128,
+ -401, -401, 1348, 1589, -7, -401, -401, -401, 146, -401,
+ -401, -140, -401, -401, -401, -401, -401, 1589, -401, -401
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -392, -392, -392, -392, -392, -392, 1, -392, -392, -88,
- -392, -392, -392, -392, -392, -392, -392, -392, -392, -392,
- -392, -392, -392, -392, -130, -392, -114, -103, -146, -70,
- 46, 52, 48, 45, 56, 54, -392, -170, -51, -392,
- -193, -246, 10, 11, -392, -392, -392, -392, 232, -42,
- -392, -392, -392, -392, -248, -11, -392, -392, 114, -392,
- -392, -78, -392, -392, -13, -392, -392, -27, -392, 207,
- -162, 44, 32, -86, -392, 111, -186, -391, -392, -392,
- -56, 293, 103, 115, -392, -392, 53, -392, -392, -76,
- -392, -77, -392, -392, -392, -392, -392, -392, 300, -392,
- -392, -98, -392, -392, 62, -392, -392
+ -401, -401, -401, -401, -401, -401, 1, -401, -401, -82,
+ -401, -401, -401, -401, -401, -401, -401, -401, -401, -401,
+ -401, -401, -401, -401, -130, -401, -114, -109, -146, -101,
+ 33, 38, 32, 35, 44, 30, -401, -170, -51, -401,
+ -193, -246, 25, 31, -401, -401, -401, -401, 222, -77,
+ -401, -401, -401, -401, -126, -11, -401, -401, 103, -401,
+ -401, -78, -401, -401, -13, -401, -401, 217, -401, 194,
+ -168, 39, 22, -323, -401, 101, -186, -400, -401, -401,
+ -67, 283, 99, 104, -401, -401, 27, -401, -401, -84,
+ -401, -79, -401, -401, -401, -401, -401, -401, 293, -401,
+ -401, -102, -401, -401, 46, -401, -401
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
@@ -1479,55 +1479,55 @@ static const yytype_int16 yypgoto[] =
#define YYTABLE_NINF -333
static const yytype_int16 yytable[] =
{
- 122, -332, 117, 478, 479, 11, 158, 294, 142, 272,
- 289, 478, 479, 16, 7, 8, 9, 299, 144, 174,
- 353, 343, 281, 109, 110, 332, 333, 358, 171, 1,
- 7, 8, 9, 153, 154, 159, 160, 161, 158, 173,
- 175, 461, 177, 178, 7, 8, 9, 180, 377, 271,
- 312, 313, 314, 315, 316, 317, 318, 319, 320, 321,
- 166, 345, 266, 144, 461, 173, 348, 159, 160, 161,
- 350, 302, 303, 145, 447, 362, 167, 346, 297, 298,
- 267, 330, 331, 10, 345, 188, 165, 345, 351, 362,
- 4, 363, 448, 345, 135, 122, 272, 117, 373, 324,
- 374, 441, 375, 376, 414, 449, 176, 499, 5, 285,
- 307, 382, 358, 286, 308, 423, 259, 170, 109, 110,
- 281, 183, 263, 264, 377, 379, 97, 98, 99, 345,
- 165, 165, 187, 12, 182, 429, 271, 165, 165, 345,
- 430, 247, 15, 246, 345, 336, 337, 269, 174, 344,
- 262, 410, 190, 334, 335, 189, 133, 437, 97, 98,
- 99, 438, -330, 134, -331, 474, 442, 265, 173, 345,
- -332, 183, 146, 183, 147, 310, 365, 366, 322, 376,
- 272, 328, 329, 247, 148, 246, 398, 399, 400, 401,
- 304, 272, 305, 149, 348, 391, 392, 393, 271, 271,
+ 122, -332, 117, 478, 479, 11, 158, 294, 183, 272,
+ 289, 478, 479, 16, 142, 174, 281, 299, 144, 1,
+ 353, 302, 303, 7, 8, 9, 332, 333, 415, 166,
+ 343, 418, 461, 266, 171, 159, 160, 161, 109, 173,
+ 175, 158, 177, 178, 110, 167, 350, 180, 345, 271,
+ 447, 267, 7, 8, 9, 461, 328, 329, 183, 4,
+ 183, 345, 441, 144, 351, 173, 348, 362, 448, 345,
+ 159, 160, 161, 7, 8, 9, 362, 346, 297, 298,
+ 285, 259, 5, 363, 286, 374, 345, 263, 264, 7,
+ 8, 9, 449, 445, 135, 122, 272, 117, 373, 324,
+ 499, 307, 375, 376, 414, 308, 176, 188, 12, 379,
+ 15, 382, 10, 345, 281, 423, 133, 170, 429, -330,
+ 467, 122, 345, 469, 471, 430, 97, 98, 99, 345,
+ -331, 437, 187, 109, 182, 438, 271, 485, 146, 110,
+ 304, 247, 305, 246, 174, 486, -332, 269, 147, 358,
+ 262, 410, 190, 474, 334, 335, 183, 345, 344, 330,
+ 331, 97, 98, 99, 336, 337, 442, 265, 173, 148,
+ 377, 122, 134, 122, 149, 310, 150, 189, 151, 376,
+ 272, 153, 154, 247, 156, 246, 398, 399, 400, 401,
+ 157, 272, 365, 366, 348, 391, 392, 393, 271, 271,
271, 271, 271, 271, 271, 271, 271, 271, 271, 271,
- 271, 271, 271, 271, 394, 395, 355, 384, 17, 18,
- 271, 7, 8, 9, -116, 150, 488, 396, 397, 480,
- 156, 271, 453, 97, 98, 99, 151, 496, 157, 247,
- 179, 246, 272, 456, 168, 8, 169, 35, 36, 37,
- 181, 172, 39, 40, 41, 42, 186, 389, 325, 326,
- 327, 475, 122, 349, -20, 415, 402, 403, 418, 183,
- -21, 268, 390, 275, 276, 283, 284, 247, 287, 246,
- 288, 306, 271, 247, 290, 491, 291, 190, 247, 292,
- 246, 490, 17, 18, 411, 339, 493, 495, 295, 300,
- 355, 296, 272, 355, -46, 311, 383, 338, 340, 341,
- 342, 495, -45, 357, 153, 17, 18, 361, 369, -40,
- 416, 35, 136, 137, 412, 138, 39, 40, 41, 42,
- 445, 417, 421, 425, 443, 432, 345, 440, 141, 97,
- 98, 99, 271, 434, 35, 136, 137, 122, 138, 39,
- 40, 41, 42, 435, 444, 436, 106, 467, 446, 247,
- 469, 471, 450, 452, 454, 355, 455, 247, 458, 246,
- 460, -50, 466, 473, 485, 468, 472, 477, 431, 489,
- 492, 498, 486, 139, 404, 140, 407, 464, 406, 258,
- 465, 405, 355, 282, 424, 355, 355, 409, 408, 476,
- 368, 370, 420, 155, 380, 371, 494, 497, 152, 355,
+ 271, 271, 271, 271, 394, 395, 355, 179, 17, 18,
+ 271, 396, 397, 384, -116, 181, 488, -20, -21, 480,
+ 268, 271, 453, 186, 358, 402, 403, 496, 276, 247,
+ 275, 246, 272, 456, 300, 283, 377, 35, 36, 37,
+ 287, 172, 39, 40, 41, 42, 288, 389, 97, 98,
+ 99, 475, 122, 349, 168, 8, 169, 284, 290, 122,
+ 291, 292, 390, 325, 326, 327, 295, 247, 340, 246,
+ 296, -46, 271, 247, 306, 491, 311, 190, 247, 338,
+ 246, 490, 17, 18, 411, 339, 493, 495, 341, 342,
+ 355, -45, 272, 355, 361, 153, 383, 357, -40, 369,
+ 412, 495, 416, 417, 421, 17, 18, 145, 425, 345,
+ 432, 35, 136, 137, 434, 138, 39, 40, 41, 42,
+ 165, 435, 443, 436, 450, 458, 444, 440, 141, 97,
+ 98, 99, 271, 446, 35, 136, 137, 122, 138, 39,
+ 40, 41, 42, 455, 452, 454, 106, 460, -50, 247,
+ 468, 466, 472, 473, 477, 355, 489, 247, 492, 246,
+ 498, 404, 406, 409, 165, 165, 407, 405, 431, 258,
+ 282, 165, 165, 139, 424, 140, 408, 464, 476, 368,
+ 465, 370, 355, 155, 371, 355, 355, 420, 494, 426,
+ 380, 152, 0, 0, 0, 497, 422, 0, 0, 355,
0, 0, 141, 97, 98, 99, 247, 355, 246, 247,
- 0, 246, 422, 0, 0, 426, 0, 0, 0, 0,
+ 0, 246, 0, 0, 0, 0, 0, 0, 0, 0,
106, 0, 0, 0, 0, 141, 97, 98, 99, 0,
0, 0, 247, 0, 246, 0, 0, 0, 0, 0,
0, 0, 0, 106, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 247, 0, 246, 0, 0, 247,
- 247, 246, 246, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 247, 0, 246, 17, 18, 19,
+ 247, 246, 246, 312, 313, 314, 315, 316, 317, 318,
+ 319, 320, 321, 0, 247, 0, 246, 17, 18, 19,
20, 21, 22, 194, 195, 196, 0, 197, 198, 199,
200, 201, 0, 0, 23, 24, 25, 26, 27, 28,
29, 30, 31, 32, 33, 34, 35, 36, 37, 0,
@@ -1537,21 +1537,21 @@ static const yytype_int16 yytable[] =
68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
78, 79, 80, 81, 82, 83, 84, 85, 86, 87,
88, 89, 90, 91, 92, 93, 94, 202, 139, 95,
- 140, 203, 204, 205, 206, 207, 0, 0, 208, 209,
- 0, 0, 0, 0, 0, 0, 0, 0, 19, 20,
- 21, 22, 0, 0, 0, 0, 0, 96, 97, 98,
- 99, 0, 100, 23, 24, 25, 26, 27, 28, 29,
- 30, 31, 32, 33, 34, 106, 0, 0, 0, 0,
- 0, 0, 0, 0, 43, 44, 45, 46, 47, 48,
- 49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
- 59, 60, 61, 62, 63, 64, 65, 66, 67, 68,
- 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,
- 79, 80, 81, 82, 83, 84, 85, 86, 87, 88,
- 89, 90, 91, 92, 93, 94, 0, 0, 95, 0,
+ 140, 203, 204, 205, 206, 207, 17, 18, 208, 209,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 210, 0, 0, 0, 0,
+ 0, 322, 0, 0, 0, 0, 0, 96, 97, 98,
+ 99, 0, 100, 0, 0, 35, 36, 37, 0, 38,
+ 39, 40, 41, 42, 0, 106, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 210, 141, 97, 98, 99,
0, 211, 212, 213, 214, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 215, 216, 217, 17,
+ 0, 0, 0, 0, 106, 0, 215, 216, 217, 17,
18, 19, 20, 21, 22, 194, 195, 196, 0, 197,
198, 199, 200, 201, 0, 0, 23, 24, 25, 26,
27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
@@ -1562,7 +1562,7 @@ static const yytype_int16 yytable[] =
76, 77, 78, 79, 80, 81, 82, 83, 84, 85,
86, 87, 88, 89, 90, 91, 92, 93, 94, 202,
139, 95, 140, 203, 204, 205, 206, 207, 0, 0,
- 208, 209, 0, 0, 0, 0, 0, 280, 0, 0,
+ 208, 209, 0, 0, 0, 0, 0, 0, 0, 0,
19, 20, 21, 22, 0, 0, 0, 0, 0, 96,
97, 98, 99, 0, 100, 23, 24, 25, 26, 27,
28, 29, 30, 31, 32, 33, 34, 106, 0, 0,
@@ -1586,10 +1586,48 @@ static const yytype_int16 yytable[] =
74, 75, 76, 77, 78, 79, 80, 81, 82, 83,
84, 85, 86, 87, 88, 89, 90, 91, 92, 93,
94, 202, 139, 95, 140, 203, 204, 205, 206, 207,
- 17, 18, 208, 209, 0, 0, 0, 0, 0, 364,
+ 0, 0, 208, 209, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 96, 97, 98, 99, 0, 100, 0, 0, 35,
- 36, 37, 0, 38, 39, 40, 41, 42, 0, 106,
+ 0, 96, 97, 98, 99, 0, 100, 0, 17, 18,
+ 19, 20, 21, 22, 0, 0, 0, 0, 0, 106,
+ 0, 0, 0, 0, 0, 23, 24, 25, 26, 27,
+ 28, 29, 30, 31, 32, 33, 34, 35, 136, 137,
+ 0, 138, 39, 40, 41, 42, 43, 44, 45, 46,
+ 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
+ 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
+ 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
+ 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
+ 87, 88, 89, 90, 91, 92, 93, 94, 0, 210,
+ 95, 0, 0, 0, 0, 211, 212, 213, 214, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 215, 216, 433, 0, 0, 0, 0, 0, 141, 97,
+ 98, 99, 17, 18, 19, 20, 21, 22, 0, 0,
+ 0, 0, 0, 0, 0, 0, 106, 0, 0, 23,
+ 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
+ 34, 35, 136, 137, 0, 138, 39, 40, 41, 42,
+ 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
+ 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
+ 63, 64, 65, 66, 67, 68, 69, 70, 71, 72,
+ 73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
+ 83, 84, 85, 86, 87, 88, 89, 90, 91, 92,
+ 93, 94, 0, 0, 95, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 280,
+ 0, 0, 141, 97, 98, 99, 0, 0, 0, 0,
+ 0, 17, 18, 19, 20, 21, 22, 194, 195, 196,
+ 106, 197, 198, 199, 200, 201, 478, 479, 23, 24,
+ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
+ 35, 36, 37, 0, 38, 39, 40, 41, 42, 43,
+ 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
+ 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
+ 74, 75, 76, 77, 78, 79, 80, 81, 82, 83,
+ 84, 85, 86, 87, 88, 89, 90, 91, 92, 93,
+ 94, 202, 139, 95, 140, 203, 204, 205, 206, 207,
+ 0, 0, 208, 209, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 364, 0, 0, 0, 0, 0, 0,
+ 0, 96, 97, 98, 99, 0, 100, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 106,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1598,81 +1636,34 @@ static const yytype_int16 yytable[] =
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 210,
- 141, 97, 98, 99, 0, 211, 212, 213, 214, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 106, 0,
- 215, 216, 433, 17, 18, 19, 20, 21, 22, 194,
- 195, 196, 0, 197, 198, 199, 200, 201, 478, 479,
- 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
- 33, 34, 35, 36, 37, 0, 38, 39, 40, 41,
- 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
- 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
- 62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
- 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
- 82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
- 92, 93, 94, 202, 139, 95, 140, 203, 204, 205,
- 206, 207, 0, 0, 208, 209, 0, 0, 0, 0,
- 0, 0, 0, 0, 19, 20, 21, 22, 0, 0,
- 0, 0, 0, 96, 97, 98, 99, 0, 100, 23,
+ 0, 0, 0, 0, 0, 211, 212, 213, 214, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 215, 216, 17, 18, 19, 20, 21, 22, 194, 195,
+ 196, 0, 197, 198, 199, 200, 201, 0, 0, 23,
24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
- 34, 106, 0, 0, 0, 0, 0, 0, 0, 0,
+ 34, 35, 36, 37, 0, 38, 39, 40, 41, 42,
43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
63, 64, 65, 66, 67, 68, 69, 70, 71, 72,
73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
83, 84, 85, 86, 87, 88, 89, 90, 91, 92,
- 93, 94, 0, 0, 95, 0, 0, 0, 0, 0,
+ 93, 94, 202, 139, 95, 140, 203, 204, 205, 206,
+ 207, 0, 0, 208, 209, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 210, 0, 0, 0, 0, 0, 211, 212, 213,
- 214, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 215, 216, 17, 18, 19, 20, 21, 22,
- 194, 195, 196, 0, 197, 198, 199, 200, 201, 0,
- 0, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 35, 36, 37, 0, 38, 39, 40,
- 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
- 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
- 61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
- 71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
- 81, 82, 83, 84, 85, 86, 87, 88, 89, 90,
- 91, 92, 93, 94, 202, 139, 95, 140, 203, 204,
- 205, 206, 207, 0, 0, 208, 209, 0, 0, 0,
+ 0, 0, 96, 97, 98, 99, 0, 100, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 96, 97, 98, 99, 0, 100,
+ 106, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 106, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 210, 0, 0, 0, 0, 0, 211, 212, 213, 214,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 210, 0, 0, 0, 0, 0, 211, 212,
- 213, 214, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 215, 216, 17, 18, 19, 20, 21,
- 22, 194, 195, 196, 0, 197, 198, 199, 200, 201,
- 0, 0, 23, 24, 25, 26, 27, 28, 29, 30,
- 31, 32, 33, 34, 35, 36, 37, 0, 38, 39,
- 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
- 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
- 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
- 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
- 90, 91, 92, 93, 94, 202, 139, 95, 140, 203,
- 204, 205, 206, 207, 0, 0, 208, 209, 0, 0,
- 0, 0, 0, 0, 0, 0, 19, 20, 21, 22,
- 0, 0, 0, 0, 0, 96, 97, 98, 99, 0,
- 100, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, 106, 0, 0, 0, 0, 0, 0,
- 0, 0, 43, 44, 45, 46, 47, 48, 49, 50,
- 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
- 61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
- 71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
- 81, 82, 83, 84, 85, 86, 87, 88, 89, 90,
- 91, 92, 93, 94, 0, 139, 95, 140, 203, 204,
- 205, 206, 207, 0, 0, 208, 209, 0, 0, 0,
- 0, 0, 0, 210, 0, 0, 0, 0, 0, 211,
- 212, 213, 214, 17, 18, 19, 20, 21, 22, 0,
- 0, 0, 0, 0, 215, 154, 0, 0, 0, 0,
+ 0, 215, 216, 17, 18, 19, 20, 21, 22, 194,
+ 195, 196, 0, 197, 198, 199, 200, 201, 0, 0,
23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
33, 34, 35, 36, 37, 0, 38, 39, 40, 41,
42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
@@ -1680,9 +1671,9 @@ static const yytype_int16 yytable[] =
62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
- 92, 93, 94, 0, 139, 95, 140, 203, 204, 205,
- 206, 207, 210, 0, 208, 209, 0, 0, 211, 212,
- 213, 214, 0, 0, 19, 20, 21, 22, 0, 0,
+ 92, 93, 94, 202, 139, 95, 140, 203, 204, 205,
+ 206, 207, 0, 0, 208, 209, 0, 0, 0, 0,
+ 0, 0, 0, 0, 19, 20, 21, 22, 0, 0,
0, 0, 0, 96, 97, 98, 99, 0, 100, 23,
24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
34, 106, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -1694,9 +1685,20 @@ static const yytype_int16 yytable[] =
93, 94, 0, 139, 95, 140, 203, 204, 205, 206,
207, 0, 0, 208, 209, 0, 0, 0, 0, 0,
0, 210, 0, 0, 0, 0, 0, 211, 212, 213,
- 214, 0, 19, 20, 21, 22, 0, 0, 0, 0,
- 0, 0, 215, 0, 0, 0, 0, 23, 24, 25,
- 26, 27, 28, 29, 30, 31, 32, 33, 34, 0,
+ 214, 17, 18, 19, 20, 21, 22, 0, 0, 0,
+ 0, 0, 215, 154, 0, 0, 0, 0, 23, 24,
+ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
+ 35, 36, 37, 0, 38, 39, 40, 41, 42, 43,
+ 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
+ 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
+ 74, 75, 76, 77, 78, 79, 80, 81, 82, 83,
+ 84, 85, 86, 87, 88, 89, 90, 91, 92, 93,
+ 94, 0, 139, 95, 140, 203, 204, 205, 206, 207,
+ 210, 0, 208, 209, 0, 0, 211, 212, 213, 214,
+ 0, 0, 19, 20, 21, 22, 0, 0, 0, 0,
+ 0, 96, 97, 98, 99, 0, 100, 23, 24, 25,
+ 26, 27, 28, 29, 30, 31, 32, 33, 34, 106,
0, 0, 0, 0, 0, 0, 0, 0, 43, 44,
45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
@@ -1704,9 +1706,10 @@ static const yytype_int16 yytable[] =
75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
85, 86, 87, 88, 89, 90, 91, 92, 93, 94,
0, 139, 95, 140, 203, 204, 205, 206, 207, 0,
- 210, 208, 209, 0, 0, 0, 211, 212, 213, 214,
+ 0, 208, 209, 0, 0, 0, 0, 0, 0, 210,
+ 0, 0, 0, 0, 0, 211, 212, 213, 214, 0,
19, 20, 21, 22, 0, 0, 0, 0, 0, 0,
- 0, 0, 354, 470, 0, 23, 24, 25, 26, 27,
+ 215, 0, 0, 0, 0, 23, 24, 25, 26, 27,
28, 29, 30, 31, 32, 33, 34, 0, 0, 0,
0, 0, 0, 0, 0, 0, 43, 44, 45, 46,
47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
@@ -1714,11 +1717,10 @@ static const yytype_int16 yytable[] =
67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
87, 88, 89, 90, 91, 92, 93, 94, 0, 139,
- 95, 140, 203, 204, 205, 206, 207, 0, 0, 208,
- 209, 0, 0, 0, 0, 0, 0, 0, 210, 0,
- 0, 0, 0, 0, 211, 212, 213, 214, 19, 20,
+ 95, 140, 203, 204, 205, 206, 207, 0, 210, 208,
+ 209, 0, 0, 0, 211, 212, 213, 214, 19, 20,
21, 22, 0, 0, 0, 0, 0, 0, 0, 0,
- 354, 0, 0, 23, 24, 25, 26, 27, 28, 29,
+ 354, 470, 0, 23, 24, 25, 26, 27, 28, 29,
30, 31, 32, 33, 34, 0, 0, 0, 0, 0,
0, 0, 0, 0, 43, 44, 45, 46, 47, 48,
49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
@@ -1726,30 +1728,73 @@ static const yytype_int16 yytable[] =
69, 70, 71, 72, 73, 74, 75, 76, 77, 78,
79, 80, 81, 82, 83, 84, 85, 86, 87, 88,
89, 90, 91, 92, 93, 94, 0, 139, 95, 140,
- 203, 204, 205, 206, 207, 0, 210, 208, 209, 0,
- 0, 0, 211, 212, 213, 214, 17, 18, 19, 20,
- 21, 22, 0, 0, 0, 0, 0, 293, 0, 0,
- 0, 0, 0, 23, 24, 25, 26, 27, 28, 29,
- 30, 31, 32, 33, 34, 35, 136, 137, 0, 138,
- 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
- 49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
- 59, 60, 61, 62, 63, 64, 65, 66, 67, 68,
- 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,
- 79, 80, 81, 82, 83, 84, 85, 86, 87, 88,
- 89, 90, 91, 92, 93, 94, 0, 139, 95, 140,
203, 204, 205, 206, 207, 0, 0, 208, 209, 0,
- 0, 0, 0, 0, 210, 0, 0, 270, 0, 0,
- 211, 212, 213, 214, 0, 0, 141, 97, 98, 99,
+ 0, 0, 0, 0, 0, 0, 210, 0, 0, 0,
+ 0, 0, 211, 212, 213, 214, 19, 20, 21, 22,
+ 0, 0, 0, 0, 0, 0, 0, 0, 354, 0,
+ 0, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 43, 44, 45, 46, 47, 48, 49, 50,
+ 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
+ 61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
+ 71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
+ 81, 82, 83, 84, 85, 86, 87, 88, 89, 90,
+ 91, 92, 93, 94, 0, 139, 95, 140, 203, 204,
+ 205, 206, 207, 0, 210, 208, 209, 0, 0, 0,
+ 211, 212, 213, 214, 17, 18, 19, 20, 21, 22,
+ 0, 0, 0, 0, 0, 293, 0, 0, 0, 0,
+ 0, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, 35, 136, 137, 0, 138, 39, 40,
+ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
+ 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
+ 61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
+ 71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
+ 81, 82, 83, 84, 85, 86, 87, 88, 89, 90,
+ 91, 92, 93, 94, 0, 139, 95, 140, 203, 204,
+ 205, 206, 207, 0, 0, 208, 209, 0, 0, 0,
+ 0, 0, 210, 0, 0, 270, 0, 0, 211, 212,
+ 213, 214, 0, 0, 141, 97, 98, 99, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 106, 0, 0, 0, 0, 0,
+ 0, 0, 106, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 19,
- 20, 21, 22, 0, 210, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 19, 20, 21,
+ 22, 0, 210, 0, 0, 0, 0, 0, 211, 212,
+ 213, 214, 23, 24, 25, 26, 27, 28, 29, 30,
+ 31, 32, 33, 34, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 43, 44, 45, 46, 47, 48, 49,
+ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
+ 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+ 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
+ 90, 91, 92, 93, 94, 0, 139, 95, 140, 203,
+ 204, 205, 206, 207, 0, 0, 208, 209, 19, 20,
+ 21, 22, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 23, 24, 25, 26, 27, 28, 29,
+ 30, 31, 32, 33, 34, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 43, 44, 45, 46, 47, 48,
+ 49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
+ 59, 60, 61, 62, 63, 64, 65, 66, 67, 68,
+ 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,
+ 79, 80, 81, 82, 83, 84, 85, 86, 87, 88,
+ 89, 90, 91, 92, 93, 94, 0, 139, 95, 140,
+ 203, 204, 205, 206, 207, 0, 0, 208, 209, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 19, 20,
+ 21, 22, 0, 210, 0, 0, 352, 0, 0, 211,
+ 212, 213, 214, 23, 24, 25, 26, 27, 28, 29,
+ 30, 31, 32, 33, 34, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 43, 44, 45, 46, 47, 48,
+ 49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
+ 59, 60, 61, 62, 63, 64, 65, 66, 67, 68,
+ 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,
+ 79, 80, 81, 82, 83, 84, 85, 86, 87, 88,
+ 89, 90, 91, 92, 93, 94, 0, 139, 95, 140,
+ 203, 204, 205, 206, 207, 0, 0, 208, 209, 19,
+ 20, 21, 22, 0, 210, 0, 0, 413, 0, 0,
211, 212, 213, 214, 23, 24, 25, 26, 27, 28,
29, 30, 31, 32, 33, 34, 0, 0, 0, 0,
0, 0, 0, 0, 0, 43, 44, 45, 46, 47,
@@ -1757,132 +1802,100 @@ static const yytype_int16 yytable[] =
58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
78, 79, 80, 81, 82, 83, 84, 85, 86, 87,
- 88, 89, 90, 91, 92, 93, 94, 0, 139, 95,
+ 88, 89, 90, 91, 92, 93, 309, 0, 139, 95,
140, 203, 204, 205, 206, 207, 0, 0, 208, 209,
- 19, 20, 21, 22, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 23, 24, 25, 26, 27,
- 28, 29, 30, 31, 32, 33, 34, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 43, 44, 45, 46,
- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
- 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
- 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
- 87, 88, 89, 90, 91, 92, 93, 94, 0, 139,
- 95, 140, 203, 204, 205, 206, 207, 0, 0, 208,
- 209, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 19, 20, 21, 22, 0, 210, 0, 0, 352, 0,
- 0, 211, 212, 213, 214, 23, 24, 25, 26, 27,
- 28, 29, 30, 31, 32, 33, 34, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 43, 44, 45, 46,
- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
- 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
- 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
- 87, 88, 89, 90, 91, 92, 93, 94, 0, 139,
- 95, 140, 203, 204, 205, 206, 207, 0, 0, 208,
- 209, 19, 20, 21, 22, 0, 210, 0, 0, 413,
- 0, 0, 211, 212, 213, 214, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 43, 44, 45,
- 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
- 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
- 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
- 76, 77, 78, 79, 80, 81, 82, 83, 84, 85,
- 86, 87, 88, 89, 90, 91, 92, 93, 309, 0,
- 139, 95, 140, 203, 204, 205, 206, 207, 0, 0,
- 208, 209, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 19, 20, 21, 22, 0, 210, 0, 0, 487,
- 0, 0, 211, 212, 213, 214, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 43, 44, 45,
- 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
- 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
- 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
- 76, 77, 78, 79, 80, 81, 82, 83, 84, 85,
- 86, 87, 88, 89, 90, 91, 92, 93, 439, 0,
- 139, 95, 140, 203, 204, 205, 206, 207, 0, 0,
- 208, 209, 0, 0, 0, 0, 0, 210, 0, 0,
- 0, 0, 0, 211, 212, 213, 214, 17, 18, 19,
- 20, 21, 22, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 23, 24, 25, 26, 27, 28,
- 29, 30, 31, 32, 33, 34, 35, 36, 37, 0,
- 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 19,
+ 20, 21, 22, 0, 210, 0, 0, 487, 0, 0,
+ 211, 212, 213, 214, 23, 24, 25, 26, 27, 28,
+ 29, 30, 31, 32, 33, 34, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 43, 44, 45, 46, 47,
48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
78, 79, 80, 81, 82, 83, 84, 85, 86, 87,
- 88, 89, 90, 91, 92, 93, 94, 0, 0, 95,
- 0, 0, 0, 0, 0, 0, 0, 210, 0, 0,
- 0, 0, 0, 211, 212, 213, 214, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 96, 97, 98,
- 99, 0, 100, 17, 18, 19, 20, 21, 22, 0,
- 101, 102, 103, 104, 105, 106, 0, 0, 0, 0,
- 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
- 33, 34, 35, 136, 137, 0, 138, 39, 40, 41,
- 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
- 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
- 62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
- 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
- 82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
- 92, 93, 94, 0, 0, 95, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 88, 89, 90, 91, 92, 93, 439, 0, 139, 95,
+ 140, 203, 204, 205, 206, 207, 0, 0, 208, 209,
+ 0, 0, 0, 0, 0, 210, 0, 0, 0, 0,
+ 0, 211, 212, 213, 214, 17, 18, 19, 20, 21,
+ 22, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 23, 24, 25, 26, 27, 28, 29, 30,
+ 31, 32, 33, 34, 35, 36, 37, 0, 38, 39,
+ 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
+ 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
+ 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+ 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
+ 90, 91, 92, 93, 94, 0, 0, 95, 0, 0,
+ 0, 0, 0, 0, 0, 210, 0, 0, 0, 0,
+ 0, 211, 212, 213, 214, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 96, 97, 98, 99, 0,
+ 100, 17, 18, 19, 20, 21, 22, 0, 101, 102,
+ 103, 104, 105, 106, 0, 0, 0, 0, 23, 24,
+ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
+ 35, 136, 137, 0, 138, 39, 40, 41, 42, 43,
+ 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
+ 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
+ 74, 75, 76, 77, 78, 79, 80, 81, 82, 83,
+ 84, 85, 86, 87, 88, 89, 90, 91, 92, 93,
+ 94, 0, 0, 95, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 141, 97, 98, 99, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 106
+ 0, 141, 97, 98, 99, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 106
};
static const yytype_int16 yycheck[] =
{
- 13, 96, 13, 18, 19, 4, 4, 200, 96, 179,
- 196, 18, 19, 12, 94, 95, 96, 210, 96, 117,
- 266, 111, 184, 13, 13, 106, 107, 275, 116, 129,
- 94, 95, 96, 242, 243, 33, 34, 35, 4, 117,
- 118, 432, 120, 121, 94, 95, 96, 125, 296, 179,
- 113, 114, 115, 116, 117, 118, 119, 120, 121, 122,
- 226, 226, 223, 141, 455, 143, 252, 33, 34, 35,
- 223, 104, 105, 100, 226, 226, 242, 242, 208, 209,
- 241, 102, 103, 133, 226, 149, 113, 226, 241, 226,
- 98, 242, 244, 226, 93, 108, 266, 108, 291, 229,
- 242, 240, 295, 296, 350, 242, 119, 240, 0, 222,
- 222, 304, 360, 226, 226, 361, 158, 116, 108, 108,
- 282, 134, 164, 165, 372, 222, 124, 125, 126, 226,
- 157, 158, 145, 130, 133, 222, 266, 164, 165, 226,
- 222, 154, 133, 154, 226, 108, 109, 242, 246, 239,
- 163, 344, 151, 234, 235, 219, 132, 222, 124, 125,
- 126, 226, 96, 243, 96, 222, 412, 166, 246, 226,
- 96, 184, 133, 186, 133, 226, 98, 99, 241, 372,
- 350, 227, 228, 196, 133, 196, 332, 333, 334, 335,
- 223, 361, 225, 133, 380, 325, 326, 327, 328, 329,
+ 13, 96, 13, 18, 19, 4, 4, 200, 134, 179,
+ 196, 18, 19, 12, 96, 117, 184, 210, 96, 129,
+ 266, 104, 105, 94, 95, 96, 106, 107, 351, 226,
+ 111, 354, 432, 223, 116, 33, 34, 35, 13, 117,
+ 118, 4, 120, 121, 13, 242, 223, 125, 226, 179,
+ 226, 241, 94, 95, 96, 455, 227, 228, 184, 98,
+ 186, 226, 240, 141, 241, 143, 252, 226, 244, 226,
+ 33, 34, 35, 94, 95, 96, 226, 242, 208, 209,
+ 222, 158, 0, 242, 226, 242, 226, 164, 165, 94,
+ 95, 96, 242, 416, 93, 108, 266, 108, 291, 229,
+ 240, 222, 295, 296, 350, 226, 119, 149, 130, 222,
+ 133, 304, 133, 226, 282, 361, 132, 116, 222, 96,
+ 443, 134, 226, 446, 447, 222, 124, 125, 126, 226,
+ 96, 222, 145, 108, 133, 226, 266, 460, 133, 108,
+ 223, 154, 225, 154, 246, 468, 96, 242, 133, 275,
+ 163, 344, 151, 222, 234, 235, 282, 226, 239, 102,
+ 103, 124, 125, 126, 108, 109, 412, 166, 246, 133,
+ 296, 184, 243, 186, 133, 226, 133, 219, 221, 372,
+ 350, 242, 243, 196, 222, 196, 332, 333, 334, 335,
+ 226, 361, 98, 99, 380, 325, 326, 327, 328, 329,
330, 331, 332, 333, 334, 335, 336, 337, 338, 339,
- 340, 341, 342, 343, 328, 329, 267, 305, 3, 4,
- 350, 94, 95, 96, 222, 133, 472, 330, 331, 244,
- 222, 361, 425, 124, 125, 126, 221, 244, 226, 252,
- 223, 252, 412, 429, 94, 95, 96, 32, 33, 34,
- 96, 36, 37, 38, 39, 40, 243, 308, 231, 232,
- 233, 454, 275, 262, 221, 351, 336, 337, 354, 282,
- 221, 221, 323, 243, 133, 242, 241, 290, 242, 290,
- 242, 222, 412, 296, 221, 478, 221, 286, 301, 242,
- 301, 477, 3, 4, 345, 237, 482, 483, 221, 244,
- 351, 221, 472, 354, 221, 221, 305, 236, 238, 110,
- 112, 497, 221, 224, 242, 3, 4, 223, 93, 222,
- 241, 32, 33, 34, 223, 36, 37, 38, 39, 40,
- 416, 224, 244, 221, 241, 222, 226, 388, 123, 124,
- 125, 126, 472, 224, 32, 33, 34, 360, 36, 37,
- 38, 39, 40, 221, 224, 222, 141, 443, 241, 372,
- 446, 447, 96, 224, 242, 416, 222, 380, 243, 380,
- 241, 222, 224, 242, 460, 241, 223, 12, 377, 242,
- 240, 224, 468, 94, 338, 96, 341, 438, 340, 157,
- 441, 339, 443, 186, 362, 446, 447, 343, 342, 455,
- 286, 290, 358, 110, 301, 290, 482, 484, 108, 460,
+ 340, 341, 342, 343, 328, 329, 267, 223, 3, 4,
+ 350, 330, 331, 305, 222, 96, 472, 221, 221, 244,
+ 221, 361, 425, 243, 360, 336, 337, 244, 133, 252,
+ 243, 252, 412, 429, 244, 242, 372, 32, 33, 34,
+ 242, 36, 37, 38, 39, 40, 242, 308, 124, 125,
+ 126, 454, 275, 262, 94, 95, 96, 241, 221, 282,
+ 221, 242, 323, 231, 232, 233, 221, 290, 238, 290,
+ 221, 221, 412, 296, 222, 478, 221, 286, 301, 236,
+ 301, 477, 3, 4, 345, 237, 482, 483, 110, 112,
+ 351, 221, 472, 354, 223, 242, 305, 224, 222, 93,
+ 223, 497, 241, 224, 244, 3, 4, 100, 221, 226,
+ 222, 32, 33, 34, 224, 36, 37, 38, 39, 40,
+ 113, 221, 241, 222, 96, 243, 224, 388, 123, 124,
+ 125, 126, 472, 241, 32, 33, 34, 360, 36, 37,
+ 38, 39, 40, 222, 224, 242, 141, 241, 222, 372,
+ 241, 224, 223, 242, 12, 416, 242, 380, 240, 380,
+ 224, 338, 340, 343, 157, 158, 341, 339, 377, 157,
+ 186, 164, 165, 94, 362, 96, 342, 438, 455, 286,
+ 441, 290, 443, 110, 290, 446, 447, 358, 482, 372,
+ 301, 108, -1, -1, -1, 484, 360, -1, -1, 460,
-1, -1, 123, 124, 125, 126, 429, 468, 429, 432,
- -1, 432, 360, -1, -1, 372, -1, -1, -1, -1,
+ -1, 432, -1, -1, -1, -1, -1, -1, -1, -1,
141, -1, -1, -1, -1, 123, 124, 125, 126, -1,
-1, -1, 455, -1, 455, -1, -1, -1, -1, -1,
-1, -1, -1, 141, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, 477, -1, 477, -1, -1, 482,
- 483, 482, 483, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 497, -1, 497, 3, 4, 5,
+ 483, 482, 483, 113, 114, 115, 116, 117, 118, 119,
+ 120, 121, 122, -1, 497, -1, 497, 3, 4, 5,
6, 7, 8, 9, 10, 11, -1, 13, 14, 15,
16, 17, -1, -1, 20, 21, 22, 23, 24, 25,
26, 27, 28, 29, 30, 31, 32, 33, 34, -1,
@@ -1892,21 +1905,21 @@ static const yytype_int16 yycheck[] =
66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
76, 77, 78, 79, 80, 81, 82, 83, 84, 85,
86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
- 96, 97, 98, 99, 100, 101, -1, -1, 104, 105,
- -1, -1, -1, -1, -1, -1, -1, -1, 5, 6,
- 7, 8, -1, -1, -1, -1, -1, 123, 124, 125,
- 126, -1, 128, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 141, -1, -1, -1, -1,
- -1, -1, -1, -1, 41, 42, 43, 44, 45, 46,
- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
- 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
- 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
- 87, 88, 89, 90, 91, 92, -1, -1, 95, -1,
+ 96, 97, 98, 99, 100, 101, 3, 4, 104, 105,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 221, -1, -1, -1, -1,
+ -1, 241, -1, -1, -1, -1, -1, 123, 124, 125,
+ 126, -1, 128, -1, -1, 32, 33, 34, -1, 36,
+ 37, 38, 39, 40, -1, 141, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 221, 123, 124, 125, 126,
-1, 227, 228, 229, 230, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 242, 243, 244, 3,
+ -1, -1, -1, -1, 141, -1, 242, 243, 244, 3,
4, 5, 6, 7, 8, 9, 10, 11, -1, 13,
14, 15, 16, 17, -1, -1, 20, 21, 22, 23,
24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
@@ -1917,7 +1930,7 @@ static const yytype_int16 yycheck[] =
74, 75, 76, 77, 78, 79, 80, 81, 82, 83,
84, 85, 86, 87, 88, 89, 90, 91, 92, 93,
94, 95, 96, 97, 98, 99, 100, 101, -1, -1,
- 104, 105, -1, -1, -1, -1, -1, 244, -1, -1,
+ 104, 105, -1, -1, -1, -1, -1, -1, -1, -1,
5, 6, 7, 8, -1, -1, -1, -1, -1, 123,
124, 125, 126, -1, 128, 20, 21, 22, 23, 24,
25, 26, 27, 28, 29, 30, 31, 141, -1, -1,
@@ -1941,10 +1954,48 @@ static const yytype_int16 yycheck[] =
72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
92, 93, 94, 95, 96, 97, 98, 99, 100, 101,
- 3, 4, 104, 105, -1, -1, -1, -1, -1, 244,
+ -1, -1, 104, 105, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 123, 124, 125, 126, -1, 128, -1, -1, 32,
- 33, 34, -1, 36, 37, 38, 39, 40, -1, 141,
+ -1, 123, 124, 125, 126, -1, 128, -1, 3, 4,
+ 5, 6, 7, 8, -1, -1, -1, -1, -1, 141,
+ -1, -1, -1, -1, -1, 20, 21, 22, 23, 24,
+ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
+ -1, 36, 37, 38, 39, 40, 41, 42, 43, 44,
+ 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
+ 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
+ 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
+ 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
+ 85, 86, 87, 88, 89, 90, 91, 92, -1, 221,
+ 95, -1, -1, -1, -1, 227, 228, 229, 230, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 242, 243, 244, -1, -1, -1, -1, -1, 123, 124,
+ 125, 126, 3, 4, 5, 6, 7, 8, -1, -1,
+ -1, -1, -1, -1, -1, -1, 141, -1, -1, 20,
+ 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
+ 31, 32, 33, 34, -1, 36, 37, 38, 39, 40,
+ 41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
+ 51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
+ 61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
+ 71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
+ 81, 82, 83, 84, 85, 86, 87, 88, 89, 90,
+ 91, 92, -1, -1, 95, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 244,
+ -1, -1, 123, 124, 125, 126, -1, -1, -1, -1,
+ -1, 3, 4, 5, 6, 7, 8, 9, 10, 11,
+ 141, 13, 14, 15, 16, 17, 18, 19, 20, 21,
+ 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, -1, 36, 37, 38, 39, 40, 41,
+ 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
+ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
+ 62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
+ 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
+ 82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
+ 92, 93, 94, 95, 96, 97, 98, 99, 100, 101,
+ -1, -1, 104, 105, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 244, -1, -1, -1, -1, -1, -1,
+ -1, 123, 124, 125, 126, -1, 128, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 141,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -1953,81 +2004,34 @@ static const yytype_int16 yycheck[] =
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, 221,
- 123, 124, 125, 126, -1, 227, 228, 229, 230, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 141, -1,
- 242, 243, 244, 3, 4, 5, 6, 7, 8, 9,
- 10, 11, -1, 13, 14, 15, 16, 17, 18, 19,
- 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
- 30, 31, 32, 33, 34, -1, 36, 37, 38, 39,
- 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
- 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
- 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
- 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
- 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
- 100, 101, -1, -1, 104, 105, -1, -1, -1, -1,
- -1, -1, -1, -1, 5, 6, 7, 8, -1, -1,
- -1, -1, -1, 123, 124, 125, 126, -1, 128, 20,
+ -1, -1, -1, -1, -1, 227, 228, 229, 230, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 242, 243, 3, 4, 5, 6, 7, 8, 9, 10,
+ 11, -1, 13, 14, 15, 16, 17, -1, -1, 20,
21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
- 31, 141, -1, -1, -1, -1, -1, -1, -1, -1,
+ 31, 32, 33, 34, -1, 36, 37, 38, 39, 40,
41, 42, 43, 44, 45, 46, 47, 48, 49, 50,
51, 52, 53, 54, 55, 56, 57, 58, 59, 60,
61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
71, 72, 73, 74, 75, 76, 77, 78, 79, 80,
81, 82, 83, 84, 85, 86, 87, 88, 89, 90,
- 91, 92, -1, -1, 95, -1, -1, -1, -1, -1,
+ 91, 92, 93, 94, 95, 96, 97, 98, 99, 100,
+ 101, -1, -1, 104, 105, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 221, -1, -1, -1, -1, -1, 227, 228, 229,
- 230, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 242, 243, 3, 4, 5, 6, 7, 8,
- 9, 10, 11, -1, 13, 14, 15, 16, 17, -1,
- -1, 20, 21, 22, 23, 24, 25, 26, 27, 28,
- 29, 30, 31, 32, 33, 34, -1, 36, 37, 38,
- 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
- 49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
- 59, 60, 61, 62, 63, 64, 65, 66, 67, 68,
- 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,
- 79, 80, 81, 82, 83, 84, 85, 86, 87, 88,
- 89, 90, 91, 92, 93, 94, 95, 96, 97, 98,
- 99, 100, 101, -1, -1, 104, 105, -1, -1, -1,
+ -1, -1, 123, 124, 125, 126, -1, 128, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 123, 124, 125, 126, -1, 128,
+ 141, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 141, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 221, -1, -1, -1, -1, -1, 227, 228, 229, 230,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 221, -1, -1, -1, -1, -1, 227, 228,
- 229, 230, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 242, 243, 3, 4, 5, 6, 7,
- 8, 9, 10, 11, -1, 13, 14, 15, 16, 17,
- -1, -1, 20, 21, 22, 23, 24, 25, 26, 27,
- 28, 29, 30, 31, 32, 33, 34, -1, 36, 37,
- 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
- 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
- 68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
- 78, 79, 80, 81, 82, 83, 84, 85, 86, 87,
- 88, 89, 90, 91, 92, 93, 94, 95, 96, 97,
- 98, 99, 100, 101, -1, -1, 104, 105, -1, -1,
- -1, -1, -1, -1, -1, -1, 5, 6, 7, 8,
- -1, -1, -1, -1, -1, 123, 124, 125, 126, -1,
- 128, 20, 21, 22, 23, 24, 25, 26, 27, 28,
- 29, 30, 31, 141, -1, -1, -1, -1, -1, -1,
- -1, -1, 41, 42, 43, 44, 45, 46, 47, 48,
- 49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
- 59, 60, 61, 62, 63, 64, 65, 66, 67, 68,
- 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,
- 79, 80, 81, 82, 83, 84, 85, 86, 87, 88,
- 89, 90, 91, 92, -1, 94, 95, 96, 97, 98,
- 99, 100, 101, -1, -1, 104, 105, -1, -1, -1,
- -1, -1, -1, 221, -1, -1, -1, -1, -1, 227,
- 228, 229, 230, 3, 4, 5, 6, 7, 8, -1,
- -1, -1, -1, -1, 242, 243, -1, -1, -1, -1,
+ -1, 242, 243, 3, 4, 5, 6, 7, 8, 9,
+ 10, 11, -1, 13, 14, 15, 16, 17, -1, -1,
20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
30, 31, 32, 33, 34, -1, 36, 37, 38, 39,
40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
@@ -2035,9 +2039,9 @@ static const yytype_int16 yycheck[] =
60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
- 90, 91, 92, -1, 94, 95, 96, 97, 98, 99,
- 100, 101, 221, -1, 104, 105, -1, -1, 227, 228,
- 229, 230, -1, -1, 5, 6, 7, 8, -1, -1,
+ 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
+ 100, 101, -1, -1, 104, 105, -1, -1, -1, -1,
+ -1, -1, -1, -1, 5, 6, 7, 8, -1, -1,
-1, -1, -1, 123, 124, 125, 126, -1, 128, 20,
21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
31, 141, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -2049,9 +2053,20 @@ static const yytype_int16 yycheck[] =
91, 92, -1, 94, 95, 96, 97, 98, 99, 100,
101, -1, -1, 104, 105, -1, -1, -1, -1, -1,
-1, 221, -1, -1, -1, -1, -1, 227, 228, 229,
- 230, -1, 5, 6, 7, 8, -1, -1, -1, -1,
- -1, -1, 242, -1, -1, -1, -1, 20, 21, 22,
- 23, 24, 25, 26, 27, 28, 29, 30, 31, -1,
+ 230, 3, 4, 5, 6, 7, 8, -1, -1, -1,
+ -1, -1, 242, 243, -1, -1, -1, -1, 20, 21,
+ 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, -1, 36, 37, 38, 39, 40, 41,
+ 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
+ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
+ 62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
+ 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
+ 82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
+ 92, -1, 94, 95, 96, 97, 98, 99, 100, 101,
+ 221, -1, 104, 105, -1, -1, 227, 228, 229, 230,
+ -1, -1, 5, 6, 7, 8, -1, -1, -1, -1,
+ -1, 123, 124, 125, 126, -1, 128, 20, 21, 22,
+ 23, 24, 25, 26, 27, 28, 29, 30, 31, 141,
-1, -1, -1, -1, -1, -1, -1, -1, 41, 42,
43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
@@ -2059,9 +2074,10 @@ static const yytype_int16 yycheck[] =
73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
83, 84, 85, 86, 87, 88, 89, 90, 91, 92,
-1, 94, 95, 96, 97, 98, 99, 100, 101, -1,
- 221, 104, 105, -1, -1, -1, 227, 228, 229, 230,
+ -1, 104, 105, -1, -1, -1, -1, -1, -1, 221,
+ -1, -1, -1, -1, -1, 227, 228, 229, 230, -1,
5, 6, 7, 8, -1, -1, -1, -1, -1, -1,
- -1, -1, 243, 244, -1, 20, 21, 22, 23, 24,
+ 242, -1, -1, -1, -1, 20, 21, 22, 23, 24,
25, 26, 27, 28, 29, 30, 31, -1, -1, -1,
-1, -1, -1, -1, -1, -1, 41, 42, 43, 44,
45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
@@ -2069,11 +2085,10 @@ static const yytype_int16 yycheck[] =
65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
85, 86, 87, 88, 89, 90, 91, 92, -1, 94,
- 95, 96, 97, 98, 99, 100, 101, -1, -1, 104,
- 105, -1, -1, -1, -1, -1, -1, -1, 221, -1,
- -1, -1, -1, -1, 227, 228, 229, 230, 5, 6,
+ 95, 96, 97, 98, 99, 100, 101, -1, 221, 104,
+ 105, -1, -1, -1, 227, 228, 229, 230, 5, 6,
7, 8, -1, -1, -1, -1, -1, -1, -1, -1,
- 243, -1, -1, 20, 21, 22, 23, 24, 25, 26,
+ 243, 244, -1, 20, 21, 22, 23, 24, 25, 26,
27, 28, 29, 30, 31, -1, -1, -1, -1, -1,
-1, -1, -1, -1, 41, 42, 43, 44, 45, 46,
47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
@@ -2081,30 +2096,73 @@ static const yytype_int16 yycheck[] =
67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
87, 88, 89, 90, 91, 92, -1, 94, 95, 96,
- 97, 98, 99, 100, 101, -1, 221, 104, 105, -1,
- -1, -1, 227, 228, 229, 230, 3, 4, 5, 6,
- 7, 8, -1, -1, -1, -1, -1, 242, -1, -1,
- -1, -1, -1, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, -1, 36,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
- 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
- 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
- 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
- 87, 88, 89, 90, 91, 92, -1, 94, 95, 96,
97, 98, 99, 100, 101, -1, -1, 104, 105, -1,
- -1, -1, -1, -1, 221, -1, -1, 224, -1, -1,
- 227, 228, 229, 230, -1, -1, 123, 124, 125, 126,
+ -1, -1, -1, -1, -1, -1, 221, -1, -1, -1,
+ -1, -1, 227, 228, 229, 230, 5, 6, 7, 8,
+ -1, -1, -1, -1, -1, -1, -1, -1, 243, -1,
+ -1, 20, 21, 22, 23, 24, 25, 26, 27, 28,
+ 29, 30, 31, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 41, 42, 43, 44, 45, 46, 47, 48,
+ 49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
+ 59, 60, 61, 62, 63, 64, 65, 66, 67, 68,
+ 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,
+ 79, 80, 81, 82, 83, 84, 85, 86, 87, 88,
+ 89, 90, 91, 92, -1, 94, 95, 96, 97, 98,
+ 99, 100, 101, -1, 221, 104, 105, -1, -1, -1,
+ 227, 228, 229, 230, 3, 4, 5, 6, 7, 8,
+ -1, -1, -1, -1, -1, 242, -1, -1, -1, -1,
+ -1, 20, 21, 22, 23, 24, 25, 26, 27, 28,
+ 29, 30, 31, 32, 33, 34, -1, 36, 37, 38,
+ 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
+ 49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
+ 59, 60, 61, 62, 63, 64, 65, 66, 67, 68,
+ 69, 70, 71, 72, 73, 74, 75, 76, 77, 78,
+ 79, 80, 81, 82, 83, 84, 85, 86, 87, 88,
+ 89, 90, 91, 92, -1, 94, 95, 96, 97, 98,
+ 99, 100, 101, -1, -1, 104, 105, -1, -1, -1,
+ -1, -1, 221, -1, -1, 224, -1, -1, 227, 228,
+ 229, 230, -1, -1, 123, 124, 125, 126, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 141, -1, -1, -1, -1, -1,
+ -1, -1, 141, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 5,
- 6, 7, 8, -1, 221, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 5, 6, 7,
+ 8, -1, 221, -1, -1, -1, -1, -1, 227, 228,
+ 229, 230, 20, 21, 22, 23, 24, 25, 26, 27,
+ 28, 29, 30, 31, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
+ 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
+ 68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
+ 78, 79, 80, 81, 82, 83, 84, 85, 86, 87,
+ 88, 89, 90, 91, 92, -1, 94, 95, 96, 97,
+ 98, 99, 100, 101, -1, -1, 104, 105, 5, 6,
+ 7, 8, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 20, 21, 22, 23, 24, 25, 26,
+ 27, 28, 29, 30, 31, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 41, 42, 43, 44, 45, 46,
+ 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
+ 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
+ 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
+ 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
+ 87, 88, 89, 90, 91, 92, -1, 94, 95, 96,
+ 97, 98, 99, 100, 101, -1, -1, 104, 105, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 5, 6,
+ 7, 8, -1, 221, -1, -1, 224, -1, -1, 227,
+ 228, 229, 230, 20, 21, 22, 23, 24, 25, 26,
+ 27, 28, 29, 30, 31, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 41, 42, 43, 44, 45, 46,
+ 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
+ 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
+ 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
+ 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
+ 87, 88, 89, 90, 91, 92, -1, 94, 95, 96,
+ 97, 98, 99, 100, 101, -1, -1, 104, 105, 5,
+ 6, 7, 8, -1, 221, -1, -1, 224, -1, -1,
227, 228, 229, 230, 20, 21, 22, 23, 24, 25,
26, 27, 28, 29, 30, 31, -1, -1, -1, -1,
-1, -1, -1, -1, -1, 41, 42, 43, 44, 45,
@@ -2114,77 +2172,45 @@ static const yytype_int16 yycheck[] =
76, 77, 78, 79, 80, 81, 82, 83, 84, 85,
86, 87, 88, 89, 90, 91, 92, -1, 94, 95,
96, 97, 98, 99, 100, 101, -1, -1, 104, 105,
- 5, 6, 7, 8, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 20, 21, 22, 23, 24,
- 25, 26, 27, 28, 29, 30, 31, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 41, 42, 43, 44,
- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
- 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
- 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
- 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
- 85, 86, 87, 88, 89, 90, 91, 92, -1, 94,
- 95, 96, 97, 98, 99, 100, 101, -1, -1, 104,
- 105, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 5, 6, 7, 8, -1, 221, -1, -1, 224, -1,
- -1, 227, 228, 229, 230, 20, 21, 22, 23, 24,
- 25, 26, 27, 28, 29, 30, 31, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 41, 42, 43, 44,
- 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
- 55, 56, 57, 58, 59, 60, 61, 62, 63, 64,
- 65, 66, 67, 68, 69, 70, 71, 72, 73, 74,
- 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
- 85, 86, 87, 88, 89, 90, 91, 92, -1, 94,
- 95, 96, 97, 98, 99, 100, 101, -1, -1, 104,
- 105, 5, 6, 7, 8, -1, 221, -1, -1, 224,
- -1, -1, 227, 228, 229, 230, 20, 21, 22, 23,
- 24, 25, 26, 27, 28, 29, 30, 31, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 41, 42, 43,
- 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
- 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
- 74, 75, 76, 77, 78, 79, 80, 81, 82, 83,
- 84, 85, 86, 87, 88, 89, 90, 91, 92, -1,
- 94, 95, 96, 97, 98, 99, 100, 101, -1, -1,
- 104, 105, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 5, 6, 7, 8, -1, 221, -1, -1, 224,
- -1, -1, 227, 228, 229, 230, 20, 21, 22, 23,
- 24, 25, 26, 27, 28, 29, 30, 31, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 41, 42, 43,
- 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,
- 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
- 64, 65, 66, 67, 68, 69, 70, 71, 72, 73,
- 74, 75, 76, 77, 78, 79, 80, 81, 82, 83,
- 84, 85, 86, 87, 88, 89, 90, 91, 92, -1,
- 94, 95, 96, 97, 98, 99, 100, 101, -1, -1,
- 104, 105, -1, -1, -1, -1, -1, 221, -1, -1,
- -1, -1, -1, 227, 228, 229, 230, 3, 4, 5,
- 6, 7, 8, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 20, 21, 22, 23, 24, 25,
- 26, 27, 28, 29, 30, 31, 32, 33, 34, -1,
- 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 5,
+ 6, 7, 8, -1, 221, -1, -1, 224, -1, -1,
+ 227, 228, 229, 230, 20, 21, 22, 23, 24, 25,
+ 26, 27, 28, 29, 30, 31, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 41, 42, 43, 44, 45,
46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
76, 77, 78, 79, 80, 81, 82, 83, 84, 85,
- 86, 87, 88, 89, 90, 91, 92, -1, -1, 95,
- -1, -1, -1, -1, -1, -1, -1, 221, -1, -1,
- -1, -1, -1, 227, 228, 229, 230, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 123, 124, 125,
- 126, -1, 128, 3, 4, 5, 6, 7, 8, -1,
- 136, 137, 138, 139, 140, 141, -1, -1, -1, -1,
- 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
- 30, 31, 32, 33, 34, -1, 36, 37, 38, 39,
- 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
- 50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
- 60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
- 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
- 80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
- 90, 91, 92, -1, -1, 95, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 86, 87, 88, 89, 90, 91, 92, -1, 94, 95,
+ 96, 97, 98, 99, 100, 101, -1, -1, 104, 105,
+ -1, -1, -1, -1, -1, 221, -1, -1, -1, -1,
+ -1, 227, 228, 229, 230, 3, 4, 5, 6, 7,
+ 8, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 20, 21, 22, 23, 24, 25, 26, 27,
+ 28, 29, 30, 31, 32, 33, 34, -1, 36, 37,
+ 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
+ 58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
+ 68, 69, 70, 71, 72, 73, 74, 75, 76, 77,
+ 78, 79, 80, 81, 82, 83, 84, 85, 86, 87,
+ 88, 89, 90, 91, 92, -1, -1, 95, -1, -1,
+ -1, -1, -1, -1, -1, 221, -1, -1, -1, -1,
+ -1, 227, 228, 229, 230, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 123, 124, 125, 126, -1,
+ 128, 3, 4, 5, 6, 7, 8, -1, 136, 137,
+ 138, 139, 140, 141, -1, -1, -1, -1, 20, 21,
+ 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 33, 34, -1, 36, 37, 38, 39, 40, 41,
+ 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,
+ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
+ 62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
+ 72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
+ 82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
+ 92, -1, -1, 95, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 123, 124, 125, 126, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 141
+ -1, 123, 124, 125, 126, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 141
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -2209,7 +2235,7 @@ static const yytype_uint16 yystos[] =
133, 221, 343, 242, 243, 326, 222, 226, 4, 33,
34, 35, 293, 294, 295, 312, 226, 242, 94, 96,
251, 254, 36, 306, 346, 306, 309, 306, 306, 223,
- 306, 96, 251, 309, 314, 315, 243, 309, 149, 219,
+ 306, 96, 251, 299, 314, 315, 243, 309, 149, 219,
251, 301, 303, 304, 9, 10, 11, 13, 14, 15,
16, 17, 93, 97, 98, 99, 100, 101, 104, 105,
221, 227, 228, 229, 230, 242, 243, 244, 254, 255,
@@ -2902,7 +2928,7 @@ YYLTYPE yylloc;
/* User initialization code. */
-#line 54 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 54 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
yylloc.first_line = 1;
yylloc.first_column = 1;
@@ -2911,7 +2937,7 @@ YYLTYPE yylloc;
yylloc.source = 0;
}
/* Line 1078 of yacc.c. */
-#line 2915 "glsl/glsl_parser.cpp"
+#line 2941 "glsl/glsl_parser.cpp"
yylsp[0] = yylloc;
goto yysetstate;
@@ -3096,14 +3122,14 @@ yyreduce:
switch (yyn)
{
case 2:
-#line 263 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 263 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
_mesa_glsl_initialize_types(state);
;}
break;
case 3:
-#line 267 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 267 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
delete state->symbols;
state->symbols = new(ralloc_parent(state)) glsl_symbol_table;
@@ -3112,7 +3138,7 @@ yyreduce:
break;
case 5:
-#line 277 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 277 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
state->process_version_directive(&(yylsp[(2) - (3)]), (yyvsp[(2) - (3)].n), NULL);
if (state->error) {
@@ -3122,7 +3148,7 @@ yyreduce:
break;
case 6:
-#line 284 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 284 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
state->process_version_directive(&(yylsp[(2) - (4)]), (yyvsp[(2) - (4)].n), (yyvsp[(3) - (4)].identifier));
if (state->error) {
@@ -3132,7 +3158,7 @@ yyreduce:
break;
case 11:
-#line 298 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 298 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
if (!state->is_version(120, 100)) {
_mesa_glsl_warning(& (yylsp[(1) - (2)]), state,
@@ -3146,7 +3172,7 @@ yyreduce:
break;
case 17:
-#line 323 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 323 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
if (!_mesa_glsl_process_extension((yyvsp[(2) - (5)].identifier), & (yylsp[(2) - (5)]), (yyvsp[(4) - (5)].identifier), & (yylsp[(4) - (5)]), state)) {
YYERROR;
@@ -3155,7 +3181,7 @@ yyreduce:
break;
case 18:
-#line 332 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 332 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
/* FINISHME: The NULL test is required because pragmas are set to
* FINISHME: NULL. (See production rule for external_declaration.)
@@ -3166,7 +3192,7 @@ yyreduce:
break;
case 19:
-#line 340 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 340 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
/* FINISHME: The NULL test is required because pragmas are set to
* FINISHME: NULL. (See production rule for external_declaration.)
@@ -3177,7 +3203,7 @@ yyreduce:
break;
case 22:
-#line 356 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 356 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression(ast_identifier, NULL, NULL, NULL);
@@ -3187,7 +3213,7 @@ yyreduce:
break;
case 23:
-#line 363 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 363 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression(ast_int_constant, NULL, NULL, NULL);
@@ -3197,7 +3223,7 @@ yyreduce:
break;
case 24:
-#line 370 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 370 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression(ast_uint_constant, NULL, NULL, NULL);
@@ -3207,7 +3233,7 @@ yyreduce:
break;
case 25:
-#line 377 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 377 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression(ast_float_constant, NULL, NULL, NULL);
@@ -3217,7 +3243,7 @@ yyreduce:
break;
case 26:
-#line 384 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 384 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression(ast_bool_constant, NULL, NULL, NULL);
@@ -3227,14 +3253,14 @@ yyreduce:
break;
case 27:
-#line 391 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 391 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.expression) = (yyvsp[(2) - (3)].expression);
;}
break;
case 29:
-#line 399 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 399 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression(ast_array_index, (yyvsp[(1) - (4)].expression), (yyvsp[(3) - (4)].expression), NULL);
@@ -3243,14 +3269,14 @@ yyreduce:
break;
case 30:
-#line 405 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 405 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.expression) = (yyvsp[(1) - (1)].expression);
;}
break;
case 31:
-#line 409 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 409 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression(ast_field_selection, (yyvsp[(1) - (3)].expression), NULL, NULL);
@@ -3260,7 +3286,7 @@ yyreduce:
break;
case 32:
-#line 416 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 416 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression(ast_post_inc, (yyvsp[(1) - (2)].expression), NULL, NULL);
@@ -3269,7 +3295,7 @@ yyreduce:
break;
case 33:
-#line 422 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 422 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression(ast_post_dec, (yyvsp[(1) - (2)].expression), NULL, NULL);
@@ -3278,7 +3304,7 @@ yyreduce:
break;
case 37:
-#line 440 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 440 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression(ast_field_selection, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression), NULL);
@@ -3287,7 +3313,7 @@ yyreduce:
break;
case 42:
-#line 459 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 459 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.expression) = (yyvsp[(1) - (2)].expression);
(yyval.expression)->set_location(yylloc);
@@ -3296,7 +3322,7 @@ yyreduce:
break;
case 43:
-#line 465 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 465 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.expression) = (yyvsp[(1) - (3)].expression);
(yyval.expression)->set_location(yylloc);
@@ -3305,7 +3331,7 @@ yyreduce:
break;
case 45:
-#line 481 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 481 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_function_expression((yyvsp[(1) - (1)].type_specifier));
@@ -3314,7 +3340,7 @@ yyreduce:
break;
case 46:
-#line 487 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 487 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
ast_expression *callee = new(ctx) ast_expression((yyvsp[(1) - (1)].identifier));
@@ -3324,7 +3350,7 @@ yyreduce:
break;
case 47:
-#line 494 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 494 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
ast_expression *callee = new(ctx) ast_expression((yyvsp[(1) - (1)].identifier));
@@ -3334,7 +3360,7 @@ yyreduce:
break;
case 52:
-#line 514 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 514 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.expression) = (yyvsp[(1) - (2)].expression);
(yyval.expression)->set_location(yylloc);
@@ -3343,7 +3369,7 @@ yyreduce:
break;
case 53:
-#line 520 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 520 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.expression) = (yyvsp[(1) - (3)].expression);
(yyval.expression)->set_location(yylloc);
@@ -3352,7 +3378,7 @@ yyreduce:
break;
case 54:
-#line 532 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 532 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
ast_expression *callee = new(ctx) ast_expression((yyvsp[(1) - (2)].identifier));
@@ -3362,7 +3388,7 @@ yyreduce:
break;
case 56:
-#line 544 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 544 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression(ast_pre_inc, (yyvsp[(2) - (2)].expression), NULL, NULL);
@@ -3371,7 +3397,7 @@ yyreduce:
break;
case 57:
-#line 550 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 550 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression(ast_pre_dec, (yyvsp[(2) - (2)].expression), NULL, NULL);
@@ -3380,7 +3406,7 @@ yyreduce:
break;
case 58:
-#line 556 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 556 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression((yyvsp[(1) - (2)].n), (yyvsp[(2) - (2)].expression), NULL, NULL);
@@ -3389,27 +3415,27 @@ yyreduce:
break;
case 59:
-#line 565 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 565 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.n) = ast_plus; ;}
break;
case 60:
-#line 566 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 566 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.n) = ast_neg; ;}
break;
case 61:
-#line 567 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 567 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.n) = ast_logic_not; ;}
break;
case 62:
-#line 568 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 568 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.n) = ast_bit_not; ;}
break;
case 64:
-#line 574 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 574 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_mul, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3418,7 +3444,7 @@ yyreduce:
break;
case 65:
-#line 580 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 580 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_div, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3427,7 +3453,7 @@ yyreduce:
break;
case 66:
-#line 586 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 586 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_mod, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3436,7 +3462,7 @@ yyreduce:
break;
case 68:
-#line 596 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 596 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_add, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3445,7 +3471,7 @@ yyreduce:
break;
case 69:
-#line 602 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 602 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_sub, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3454,7 +3480,7 @@ yyreduce:
break;
case 71:
-#line 612 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 612 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_lshift, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3463,7 +3489,7 @@ yyreduce:
break;
case 72:
-#line 618 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 618 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_rshift, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3472,7 +3498,7 @@ yyreduce:
break;
case 74:
-#line 628 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 628 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_less, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3481,7 +3507,7 @@ yyreduce:
break;
case 75:
-#line 634 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 634 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_greater, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3490,7 +3516,7 @@ yyreduce:
break;
case 76:
-#line 640 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 640 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_lequal, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3499,7 +3525,7 @@ yyreduce:
break;
case 77:
-#line 646 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 646 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_gequal, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3508,7 +3534,7 @@ yyreduce:
break;
case 79:
-#line 656 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 656 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_equal, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3517,7 +3543,7 @@ yyreduce:
break;
case 80:
-#line 662 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 662 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_nequal, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3526,7 +3552,7 @@ yyreduce:
break;
case 82:
-#line 672 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 672 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_bit_and, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3535,7 +3561,7 @@ yyreduce:
break;
case 84:
-#line 682 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 682 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_bit_xor, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3544,7 +3570,7 @@ yyreduce:
break;
case 86:
-#line 692 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 692 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_bit_or, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3553,7 +3579,7 @@ yyreduce:
break;
case 88:
-#line 702 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 702 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_logic_and, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3562,7 +3588,7 @@ yyreduce:
break;
case 90:
-#line 712 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 712 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_logic_xor, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3571,7 +3597,7 @@ yyreduce:
break;
case 92:
-#line 722 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 722 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression_bin(ast_logic_or, (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression));
@@ -3580,7 +3606,7 @@ yyreduce:
break;
case 94:
-#line 732 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 732 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression(ast_conditional, (yyvsp[(1) - (5)].expression), (yyvsp[(3) - (5)].expression), (yyvsp[(5) - (5)].expression));
@@ -3589,7 +3615,7 @@ yyreduce:
break;
case 96:
-#line 742 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 742 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_expression((yyvsp[(2) - (3)].n), (yyvsp[(1) - (3)].expression), (yyvsp[(3) - (3)].expression), NULL);
@@ -3598,69 +3624,69 @@ yyreduce:
break;
case 97:
-#line 750 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 750 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.n) = ast_assign; ;}
break;
case 98:
-#line 751 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 751 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.n) = ast_mul_assign; ;}
break;
case 99:
-#line 752 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 752 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.n) = ast_div_assign; ;}
break;
case 100:
-#line 753 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 753 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.n) = ast_mod_assign; ;}
break;
case 101:
-#line 754 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 754 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.n) = ast_add_assign; ;}
break;
case 102:
-#line 755 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 755 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.n) = ast_sub_assign; ;}
break;
case 103:
-#line 756 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 756 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.n) = ast_ls_assign; ;}
break;
case 104:
-#line 757 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 757 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.n) = ast_rs_assign; ;}
break;
case 105:
-#line 758 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 758 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.n) = ast_and_assign; ;}
break;
case 106:
-#line 759 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 759 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.n) = ast_xor_assign; ;}
break;
case 107:
-#line 760 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 760 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.n) = ast_or_assign; ;}
break;
case 108:
-#line 765 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 765 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.expression) = (yyvsp[(1) - (1)].expression);
;}
break;
case 109:
-#line 769 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 769 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
if ((yyvsp[(1) - (3)].expression)->oper != ast_sequence) {
@@ -3676,7 +3702,7 @@ yyreduce:
break;
case 111:
-#line 789 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 789 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
state->symbols->pop_scope();
(yyval.node) = (yyvsp[(1) - (2)].function);
@@ -3684,14 +3710,14 @@ yyreduce:
break;
case 112:
-#line 794 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 794 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.node) = (yyvsp[(1) - (2)].declarator_list);
;}
break;
case 113:
-#line 798 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 798 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyvsp[(3) - (4)].type_specifier)->default_precision = (yyvsp[(2) - (4)].n);
(yyval.node) = (yyvsp[(3) - (4)].type_specifier);
@@ -3699,14 +3725,14 @@ yyreduce:
break;
case 114:
-#line 803 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 803 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.node) = (yyvsp[(1) - (1)].node);
;}
break;
case 118:
-#line 819 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 819 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.function) = (yyvsp[(1) - (2)].function);
(yyval.function)->parameters.push_tail(& (yyvsp[(2) - (2)].parameter_declarator)->link);
@@ -3714,7 +3740,7 @@ yyreduce:
break;
case 119:
-#line 824 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 824 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.function) = (yyvsp[(1) - (3)].function);
(yyval.function)->parameters.push_tail(& (yyvsp[(3) - (3)].parameter_declarator)->link);
@@ -3722,7 +3748,7 @@ yyreduce:
break;
case 120:
-#line 832 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 832 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.function) = new(ctx) ast_function();
@@ -3736,7 +3762,7 @@ yyreduce:
break;
case 121:
-#line 846 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 846 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.parameter_declarator) = new(ctx) ast_parameter_declarator();
@@ -3749,7 +3775,7 @@ yyreduce:
break;
case 122:
-#line 856 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 856 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.parameter_declarator) = new(ctx) ast_parameter_declarator();
@@ -3764,7 +3790,7 @@ yyreduce:
break;
case 123:
-#line 871 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 871 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.parameter_declarator) = (yyvsp[(2) - (2)].parameter_declarator);
(yyval.parameter_declarator)->type->qualifier = (yyvsp[(1) - (2)].type_qualifier);
@@ -3772,7 +3798,7 @@ yyreduce:
break;
case 124:
-#line 876 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 876 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.parameter_declarator) = new(ctx) ast_parameter_declarator();
@@ -3784,14 +3810,14 @@ yyreduce:
break;
case 125:
-#line 888 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 888 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
;}
break;
case 126:
-#line 892 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 892 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
if ((yyvsp[(2) - (2)].type_qualifier).flags.q.constant)
_mesa_glsl_error(&(yylsp[(1) - (2)]), state, "duplicate const qualifier.\n");
@@ -3802,7 +3828,7 @@ yyreduce:
break;
case 127:
-#line 900 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 900 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
if (((yyvsp[(1) - (2)].type_qualifier).flags.q.in || (yyvsp[(1) - (2)].type_qualifier).flags.q.out) && ((yyvsp[(2) - (2)].type_qualifier).flags.q.in || (yyvsp[(2) - (2)].type_qualifier).flags.q.out))
_mesa_glsl_error(&(yylsp[(1) - (2)]), state, "duplicate in/out/inout qualifier\n");
@@ -3817,7 +3843,7 @@ yyreduce:
break;
case 128:
-#line 912 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 912 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
if ((yyvsp[(2) - (2)].type_qualifier).precision != ast_precision_none)
_mesa_glsl_error(&(yylsp[(1) - (2)]), state, "Duplicate precision qualifier.\n");
@@ -3831,7 +3857,7 @@ yyreduce:
break;
case 129:
-#line 925 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 925 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
(yyval.type_qualifier).flags.q.in = 1;
@@ -3839,7 +3865,7 @@ yyreduce:
break;
case 130:
-#line 930 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 930 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
(yyval.type_qualifier).flags.q.out = 1;
@@ -3847,7 +3873,7 @@ yyreduce:
break;
case 131:
-#line 935 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 935 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
(yyval.type_qualifier).flags.q.in = 1;
@@ -3856,7 +3882,7 @@ yyreduce:
break;
case 134:
-#line 949 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 949 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(3) - (3)].identifier), false, NULL, NULL);
@@ -3869,7 +3895,7 @@ yyreduce:
break;
case 135:
-#line 959 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 959 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(3) - (5)].identifier), true, NULL, NULL);
@@ -3882,7 +3908,7 @@ yyreduce:
break;
case 136:
-#line 969 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 969 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(3) - (6)].identifier), true, (yyvsp[(5) - (6)].expression), NULL);
@@ -3895,7 +3921,7 @@ yyreduce:
break;
case 137:
-#line 979 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 979 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(3) - (7)].identifier), true, NULL, (yyvsp[(7) - (7)].expression));
@@ -3913,7 +3939,7 @@ yyreduce:
break;
case 138:
-#line 994 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 994 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(3) - (8)].identifier), true, (yyvsp[(5) - (8)].expression), (yyvsp[(8) - (8)].expression));
@@ -3931,7 +3957,7 @@ yyreduce:
break;
case 139:
-#line 1009 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1009 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(3) - (5)].identifier), false, NULL, (yyvsp[(5) - (5)].expression));
@@ -3948,7 +3974,7 @@ yyreduce:
break;
case 140:
-#line 1027 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1027 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
/* Empty declaration list is valid. */
@@ -3958,7 +3984,7 @@ yyreduce:
break;
case 141:
-#line 1034 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1034 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(2) - (2)].identifier), false, NULL, NULL);
@@ -3970,7 +3996,7 @@ yyreduce:
break;
case 142:
-#line 1043 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1043 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(2) - (4)].identifier), true, NULL, NULL);
@@ -3982,7 +4008,7 @@ yyreduce:
break;
case 143:
-#line 1052 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1052 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(2) - (5)].identifier), true, (yyvsp[(4) - (5)].expression), NULL);
@@ -3994,7 +4020,7 @@ yyreduce:
break;
case 144:
-#line 1061 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1061 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(2) - (6)].identifier), true, NULL, (yyvsp[(6) - (6)].expression));
@@ -4011,7 +4037,7 @@ yyreduce:
break;
case 145:
-#line 1075 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1075 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(2) - (7)].identifier), true, (yyvsp[(4) - (7)].expression), (yyvsp[(7) - (7)].expression));
@@ -4028,7 +4054,7 @@ yyreduce:
break;
case 146:
-#line 1089 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1089 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(2) - (4)].identifier), false, NULL, (yyvsp[(4) - (4)].expression));
@@ -4043,7 +4069,7 @@ yyreduce:
break;
case 147:
-#line 1101 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1101 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(2) - (2)].identifier), false, NULL, NULL);
@@ -4057,7 +4083,7 @@ yyreduce:
break;
case 148:
-#line 1115 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1115 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.fully_specified_type) = new(ctx) ast_fully_specified_type();
@@ -4067,7 +4093,7 @@ yyreduce:
break;
case 149:
-#line 1122 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1122 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.fully_specified_type) = new(ctx) ast_fully_specified_type();
@@ -4078,14 +4104,14 @@ yyreduce:
break;
case 150:
-#line 1133 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1133 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.type_qualifier) = (yyvsp[(3) - (4)].type_qualifier);
;}
break;
case 152:
-#line 1141 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1141 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.type_qualifier) = (yyvsp[(1) - (3)].type_qualifier);
if (!(yyval.type_qualifier).merge_qualifier(& (yylsp[(3) - (3)]), state, (yyvsp[(3) - (3)].type_qualifier))) {
@@ -4095,17 +4121,17 @@ yyreduce:
break;
case 153:
-#line 1150 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1150 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.n) = (yyvsp[(1) - (1)].n); ;}
break;
case 154:
-#line 1151 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1151 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.n) = (yyvsp[(1) - (1)].n); ;}
break;
case 155:
-#line 1156 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1156 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
@@ -4184,7 +4210,7 @@ yyreduce:
break;
case 156:
-#line 1232 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1232 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
@@ -4236,7 +4262,7 @@ yyreduce:
break;
case 157:
-#line 1281 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1281 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.type_qualifier) = (yyvsp[(1) - (1)].type_qualifier);
/* Layout qualifiers for ARB_uniform_buffer_object. */
@@ -4253,7 +4279,7 @@ yyreduce:
break;
case 158:
-#line 1303 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1303 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
(yyval.type_qualifier).flags.q.row_major = 1;
@@ -4261,7 +4287,7 @@ yyreduce:
break;
case 159:
-#line 1308 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1308 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
(yyval.type_qualifier).flags.q.packed = 1;
@@ -4269,7 +4295,7 @@ yyreduce:
break;
case 160:
-#line 1316 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1316 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
(yyval.type_qualifier).flags.q.smooth = 1;
@@ -4277,7 +4303,7 @@ yyreduce:
break;
case 161:
-#line 1321 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1321 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
(yyval.type_qualifier).flags.q.flat = 1;
@@ -4285,7 +4311,7 @@ yyreduce:
break;
case 162:
-#line 1326 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1326 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
(yyval.type_qualifier).flags.q.noperspective = 1;
@@ -4293,7 +4319,7 @@ yyreduce:
break;
case 163:
-#line 1335 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1335 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
(yyval.type_qualifier).flags.q.invariant = 1;
@@ -4301,7 +4327,7 @@ yyreduce:
break;
case 168:
-#line 1344 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1344 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
memset(&(yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
(yyval.type_qualifier).precision = (yyvsp[(1) - (1)].n);
@@ -4309,7 +4335,7 @@ yyreduce:
break;
case 169:
-#line 1362 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1362 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
if ((yyvsp[(2) - (2)].type_qualifier).flags.q.invariant)
_mesa_glsl_error(&(yylsp[(1) - (2)]), state, "Duplicate \"invariant\" qualifier.\n");
@@ -4325,7 +4351,7 @@ yyreduce:
break;
case 170:
-#line 1375 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1375 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
/* Section 4.3 of the GLSL 1.40 specification states:
* "...qualified with one of these interpolation qualifiers"
@@ -4356,7 +4382,7 @@ yyreduce:
break;
case 171:
-#line 1403 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1403 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
/* The GLSL 1.50 grammar indicates that a layout(...) declaration can be
* used standalone or immediately before a storage qualifier. It cannot
@@ -4382,7 +4408,7 @@ yyreduce:
break;
case 172:
-#line 1426 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1426 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
if ((yyvsp[(2) - (2)].type_qualifier).has_auxiliary_storage()) {
_mesa_glsl_error(&(yylsp[(1) - (2)]), state,
@@ -4400,7 +4426,7 @@ yyreduce:
break;
case 173:
-#line 1441 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1441 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
/* Section 4.3 of the GLSL 1.20 specification states:
* "Variable declarations may have a storage qualifier specified..."
@@ -4423,7 +4449,7 @@ yyreduce:
break;
case 174:
-#line 1461 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1461 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
if ((yyvsp[(2) - (2)].type_qualifier).precision != ast_precision_none)
_mesa_glsl_error(&(yylsp[(1) - (2)]), state, "Duplicate precision qualifier.\n");
@@ -4437,7 +4463,7 @@ yyreduce:
break;
case 175:
-#line 1475 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1475 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
(yyval.type_qualifier).flags.q.centroid = 1;
@@ -4445,7 +4471,7 @@ yyreduce:
break;
case 176:
-#line 1483 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1483 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
(yyval.type_qualifier).flags.q.constant = 1;
@@ -4453,7 +4479,7 @@ yyreduce:
break;
case 177:
-#line 1488 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1488 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
(yyval.type_qualifier).flags.q.attribute = 1;
@@ -4461,7 +4487,7 @@ yyreduce:
break;
case 178:
-#line 1493 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1493 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
(yyval.type_qualifier).flags.q.varying = 1;
@@ -4469,7 +4495,7 @@ yyreduce:
break;
case 179:
-#line 1498 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1498 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
(yyval.type_qualifier).flags.q.in = 1;
@@ -4477,7 +4503,7 @@ yyreduce:
break;
case 180:
-#line 1503 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1503 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
(yyval.type_qualifier).flags.q.out = 1;
@@ -4485,7 +4511,7 @@ yyreduce:
break;
case 181:
-#line 1508 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1508 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
(yyval.type_qualifier).flags.q.uniform = 1;
@@ -4493,7 +4519,7 @@ yyreduce:
break;
case 183:
-#line 1517 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1517 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.type_specifier) = (yyvsp[(1) - (3)].type_specifier);
(yyval.type_specifier)->is_array = true;
@@ -4502,7 +4528,7 @@ yyreduce:
break;
case 184:
-#line 1523 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1523 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.type_specifier) = (yyvsp[(1) - (4)].type_specifier);
(yyval.type_specifier)->is_array = true;
@@ -4511,7 +4537,7 @@ yyreduce:
break;
case 185:
-#line 1532 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1532 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.type_specifier) = new(ctx) ast_type_specifier((yyvsp[(1) - (1)].identifier));
@@ -4520,7 +4546,7 @@ yyreduce:
break;
case 186:
-#line 1538 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1538 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.type_specifier) = new(ctx) ast_type_specifier((yyvsp[(1) - (1)].struct_specifier));
@@ -4529,7 +4555,7 @@ yyreduce:
break;
case 187:
-#line 1544 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1544 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.type_specifier) = new(ctx) ast_type_specifier((yyvsp[(1) - (1)].identifier));
@@ -4538,342 +4564,342 @@ yyreduce:
break;
case 188:
-#line 1552 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1552 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "void"; ;}
break;
case 189:
-#line 1553 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1553 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "float"; ;}
break;
case 190:
-#line 1554 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1554 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "int"; ;}
break;
case 191:
-#line 1555 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1555 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "uint"; ;}
break;
case 192:
-#line 1556 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1556 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "bool"; ;}
break;
case 193:
-#line 1557 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1557 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "vec2"; ;}
break;
case 194:
-#line 1558 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1558 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "vec3"; ;}
break;
case 195:
-#line 1559 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1559 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "vec4"; ;}
break;
case 196:
-#line 1560 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1560 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "bvec2"; ;}
break;
case 197:
-#line 1561 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1561 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "bvec3"; ;}
break;
case 198:
-#line 1562 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1562 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "bvec4"; ;}
break;
case 199:
-#line 1563 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1563 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "ivec2"; ;}
break;
case 200:
-#line 1564 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1564 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "ivec3"; ;}
break;
case 201:
-#line 1565 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1565 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "ivec4"; ;}
break;
case 202:
-#line 1566 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1566 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "uvec2"; ;}
break;
case 203:
-#line 1567 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1567 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "uvec3"; ;}
break;
case 204:
-#line 1568 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1568 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "uvec4"; ;}
break;
case 205:
-#line 1569 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1569 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "mat2"; ;}
break;
case 206:
-#line 1570 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1570 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "mat2x3"; ;}
break;
case 207:
-#line 1571 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1571 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "mat2x4"; ;}
break;
case 208:
-#line 1572 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1572 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "mat3x2"; ;}
break;
case 209:
-#line 1573 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1573 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "mat3"; ;}
break;
case 210:
-#line 1574 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1574 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "mat3x4"; ;}
break;
case 211:
-#line 1575 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1575 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "mat4x2"; ;}
break;
case 212:
-#line 1576 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1576 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "mat4x3"; ;}
break;
case 213:
-#line 1577 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1577 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "mat4"; ;}
break;
case 214:
-#line 1578 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1578 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "sampler1D"; ;}
break;
case 215:
-#line 1579 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1579 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "sampler2D"; ;}
break;
case 216:
-#line 1580 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1580 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "sampler2DRect"; ;}
break;
case 217:
-#line 1581 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1581 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "sampler3D"; ;}
break;
case 218:
-#line 1582 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1582 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "samplerCube"; ;}
break;
case 219:
-#line 1583 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1583 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "samplerExternalOES"; ;}
break;
case 220:
-#line 1584 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1584 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "sampler1DShadow"; ;}
break;
case 221:
-#line 1585 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1585 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "sampler2DShadow"; ;}
break;
case 222:
-#line 1586 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1586 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "sampler2DRectShadow"; ;}
break;
case 223:
-#line 1587 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1587 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "samplerCubeShadow"; ;}
break;
case 224:
-#line 1588 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1588 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "sampler1DArray"; ;}
break;
case 225:
-#line 1589 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1589 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "sampler2DArray"; ;}
break;
case 226:
-#line 1590 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1590 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "sampler1DArrayShadow"; ;}
break;
case 227:
-#line 1591 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1591 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "sampler2DArrayShadow"; ;}
break;
case 228:
-#line 1592 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1592 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "samplerBuffer"; ;}
break;
case 229:
-#line 1593 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1593 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "samplerCubeArray"; ;}
break;
case 230:
-#line 1594 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1594 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "samplerCubeArrayShadow"; ;}
break;
case 231:
-#line 1595 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1595 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "isampler1D"; ;}
break;
case 232:
-#line 1596 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1596 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "isampler2D"; ;}
break;
case 233:
-#line 1597 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1597 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "isampler2DRect"; ;}
break;
case 234:
-#line 1598 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1598 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "isampler3D"; ;}
break;
case 235:
-#line 1599 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1599 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "isamplerCube"; ;}
break;
case 236:
-#line 1600 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1600 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "isampler1DArray"; ;}
break;
case 237:
-#line 1601 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1601 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "isampler2DArray"; ;}
break;
case 238:
-#line 1602 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1602 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "isamplerBuffer"; ;}
break;
case 239:
-#line 1603 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1603 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "isamplerCubeArray"; ;}
break;
case 240:
-#line 1604 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1604 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "usampler1D"; ;}
break;
case 241:
-#line 1605 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1605 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "usampler2D"; ;}
break;
case 242:
-#line 1606 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1606 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "usampler2DRect"; ;}
break;
case 243:
-#line 1607 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1607 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "usampler3D"; ;}
break;
case 244:
-#line 1608 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1608 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "usamplerCube"; ;}
break;
case 245:
-#line 1609 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1609 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "usampler1DArray"; ;}
break;
case 246:
-#line 1610 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1610 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "usampler2DArray"; ;}
break;
case 247:
-#line 1611 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1611 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "usamplerBuffer"; ;}
break;
case 248:
-#line 1612 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1612 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "usamplerCubeArray"; ;}
break;
case 249:
-#line 1613 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1613 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "sampler2DMS"; ;}
break;
case 250:
-#line 1614 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1614 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "isampler2DMS"; ;}
break;
case 251:
-#line 1615 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1615 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "usampler2DMS"; ;}
break;
case 252:
-#line 1616 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1616 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "sampler2DMSArray"; ;}
break;
case 253:
-#line 1617 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1617 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "isampler2DMSArray"; ;}
break;
case 254:
-#line 1618 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1618 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.identifier) = "usampler2DMSArray"; ;}
break;
case 255:
-#line 1623 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1623 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
state->check_precision_qualifiers_allowed(&(yylsp[(1) - (1)]));
(yyval.n) = ast_precision_high;
@@ -4881,7 +4907,7 @@ yyreduce:
break;
case 256:
-#line 1628 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1628 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
state->check_precision_qualifiers_allowed(&(yylsp[(1) - (1)]));
(yyval.n) = ast_precision_medium;
@@ -4889,7 +4915,7 @@ yyreduce:
break;
case 257:
-#line 1633 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1633 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
state->check_precision_qualifiers_allowed(&(yylsp[(1) - (1)]));
(yyval.n) = ast_precision_low;
@@ -4897,7 +4923,7 @@ yyreduce:
break;
case 258:
-#line 1641 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1641 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.struct_specifier) = new(ctx) ast_struct_specifier((yyvsp[(2) - (5)].identifier), (yyvsp[(4) - (5)].declarator_list));
@@ -4908,7 +4934,7 @@ yyreduce:
break;
case 259:
-#line 1649 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1649 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.struct_specifier) = new(ctx) ast_struct_specifier(NULL, (yyvsp[(3) - (4)].declarator_list));
@@ -4917,7 +4943,7 @@ yyreduce:
break;
case 260:
-#line 1658 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1658 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.declarator_list) = (yyvsp[(1) - (1)].declarator_list);
(yyvsp[(1) - (1)].declarator_list)->link.self_link();
@@ -4925,7 +4951,7 @@ yyreduce:
break;
case 261:
-#line 1663 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1663 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.declarator_list) = (yyvsp[(1) - (2)].declarator_list);
(yyval.declarator_list)->link.insert_before(& (yyvsp[(2) - (2)].declarator_list)->link);
@@ -4933,13 +4959,17 @@ yyreduce:
break;
case 262:
-#line 1671 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1671 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
- ast_fully_specified_type *type = new(ctx) ast_fully_specified_type();
+ ast_fully_specified_type *const type = (yyvsp[(1) - (3)].fully_specified_type);
type->set_location(yylloc);
- type->specifier = (yyvsp[(1) - (3)].type_specifier);
+ if (type->qualifier.flags.i != 0)
+ _mesa_glsl_error(&(yylsp[(1) - (3)]), state,
+ "only precision qualifiers may be applied to "
+ "structure members");
+
(yyval.declarator_list) = new(ctx) ast_declarator_list(type);
(yyval.declarator_list)->set_location(yylloc);
@@ -4948,7 +4978,7 @@ yyreduce:
break;
case 263:
-#line 1686 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1690 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.declaration) = (yyvsp[(1) - (1)].declaration);
(yyvsp[(1) - (1)].declaration)->link.self_link();
@@ -4956,7 +4986,7 @@ yyreduce:
break;
case 264:
-#line 1691 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1695 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.declaration) = (yyvsp[(1) - (3)].declaration);
(yyval.declaration)->link.insert_before(& (yyvsp[(3) - (3)].declaration)->link);
@@ -4964,7 +4994,7 @@ yyreduce:
break;
case 265:
-#line 1699 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1703 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.declaration) = new(ctx) ast_declaration((yyvsp[(1) - (1)].identifier), false, NULL, NULL);
@@ -4973,7 +5003,7 @@ yyreduce:
break;
case 266:
-#line 1705 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1709 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.declaration) = new(ctx) ast_declaration((yyvsp[(1) - (4)].identifier), true, (yyvsp[(3) - (4)].expression), NULL);
@@ -4982,21 +5012,21 @@ yyreduce:
break;
case 268:
-#line 1715 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1719 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.expression) = (yyvsp[(2) - (3)].expression);
;}
break;
case 269:
-#line 1719 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1723 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.expression) = (yyvsp[(2) - (4)].expression);
;}
break;
case 270:
-#line 1726 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1730 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.expression) = new(ctx) ast_aggregate_initializer();
@@ -5006,19 +5036,19 @@ yyreduce:
break;
case 271:
-#line 1733 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1737 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyvsp[(1) - (3)].expression)->expressions.push_tail(& (yyvsp[(3) - (3)].expression)->link);
;}
break;
case 273:
-#line 1745 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1749 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.node) = (ast_node *) (yyvsp[(1) - (1)].compound_statement); ;}
break;
case 281:
-#line 1760 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1764 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.compound_statement) = new(ctx) ast_compound_statement(true, NULL);
@@ -5027,14 +5057,14 @@ yyreduce:
break;
case 282:
-#line 1766 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1770 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
state->symbols->push_scope();
;}
break;
case 283:
-#line 1770 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1774 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.compound_statement) = new(ctx) ast_compound_statement(true, (yyvsp[(3) - (4)].node));
@@ -5044,12 +5074,12 @@ yyreduce:
break;
case 284:
-#line 1779 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1783 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.node) = (ast_node *) (yyvsp[(1) - (1)].compound_statement); ;}
break;
case 286:
-#line 1785 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1789 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.compound_statement) = new(ctx) ast_compound_statement(false, NULL);
@@ -5058,7 +5088,7 @@ yyreduce:
break;
case 287:
-#line 1791 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1795 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.compound_statement) = new(ctx) ast_compound_statement(false, (yyvsp[(2) - (3)].node));
@@ -5067,7 +5097,7 @@ yyreduce:
break;
case 288:
-#line 1800 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1804 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
if ((yyvsp[(1) - (1)].node) == NULL) {
_mesa_glsl_error(& (yylsp[(1) - (1)]), state, "<nil> statement\n");
@@ -5080,7 +5110,7 @@ yyreduce:
break;
case 289:
-#line 1810 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1814 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
if ((yyvsp[(2) - (2)].node) == NULL) {
_mesa_glsl_error(& (yylsp[(2) - (2)]), state, "<nil> statement\n");
@@ -5092,7 +5122,7 @@ yyreduce:
break;
case 290:
-#line 1822 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1826 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.node) = new(ctx) ast_expression_statement(NULL);
@@ -5101,7 +5131,7 @@ yyreduce:
break;
case 291:
-#line 1828 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1832 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.node) = new(ctx) ast_expression_statement((yyvsp[(1) - (2)].expression));
@@ -5110,7 +5140,7 @@ yyreduce:
break;
case 292:
-#line 1837 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1841 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.node) = new(state) ast_selection_statement((yyvsp[(3) - (5)].expression), (yyvsp[(5) - (5)].selection_rest_statement).then_statement,
(yyvsp[(5) - (5)].selection_rest_statement).else_statement);
@@ -5119,7 +5149,7 @@ yyreduce:
break;
case 293:
-#line 1846 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1850 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.selection_rest_statement).then_statement = (yyvsp[(1) - (3)].node);
(yyval.selection_rest_statement).else_statement = (yyvsp[(3) - (3)].node);
@@ -5127,7 +5157,7 @@ yyreduce:
break;
case 294:
-#line 1851 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1855 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.selection_rest_statement).then_statement = (yyvsp[(1) - (1)].node);
(yyval.selection_rest_statement).else_statement = NULL;
@@ -5135,14 +5165,14 @@ yyreduce:
break;
case 295:
-#line 1859 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1863 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.node) = (ast_node *) (yyvsp[(1) - (1)].expression);
;}
break;
case 296:
-#line 1863 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1867 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
ast_declaration *decl = new(ctx) ast_declaration((yyvsp[(2) - (4)].identifier), false, NULL, (yyvsp[(4) - (4)].expression));
@@ -5156,7 +5186,7 @@ yyreduce:
break;
case 297:
-#line 1881 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1885 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.node) = new(state) ast_switch_statement((yyvsp[(3) - (5)].expression), (yyvsp[(5) - (5)].switch_body));
(yyval.node)->set_location(yylloc);
@@ -5164,7 +5194,7 @@ yyreduce:
break;
case 298:
-#line 1889 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1893 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.switch_body) = new(state) ast_switch_body(NULL);
(yyval.switch_body)->set_location(yylloc);
@@ -5172,7 +5202,7 @@ yyreduce:
break;
case 299:
-#line 1894 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1898 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.switch_body) = new(state) ast_switch_body((yyvsp[(2) - (3)].case_statement_list));
(yyval.switch_body)->set_location(yylloc);
@@ -5180,7 +5210,7 @@ yyreduce:
break;
case 300:
-#line 1902 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1906 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.case_label) = new(state) ast_case_label((yyvsp[(2) - (3)].expression));
(yyval.case_label)->set_location(yylloc);
@@ -5188,7 +5218,7 @@ yyreduce:
break;
case 301:
-#line 1907 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1911 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.case_label) = new(state) ast_case_label(NULL);
(yyval.case_label)->set_location(yylloc);
@@ -5196,7 +5226,7 @@ yyreduce:
break;
case 302:
-#line 1915 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1919 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
ast_case_label_list *labels = new(state) ast_case_label_list();
@@ -5207,7 +5237,7 @@ yyreduce:
break;
case 303:
-#line 1923 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1927 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.case_label_list) = (yyvsp[(1) - (2)].case_label_list);
(yyval.case_label_list)->labels.push_tail(& (yyvsp[(2) - (2)].case_label)->link);
@@ -5215,7 +5245,7 @@ yyreduce:
break;
case 304:
-#line 1931 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1935 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
ast_case_statement *stmts = new(state) ast_case_statement((yyvsp[(1) - (2)].case_label_list));
stmts->set_location(yylloc);
@@ -5226,7 +5256,7 @@ yyreduce:
break;
case 305:
-#line 1939 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1943 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.case_statement) = (yyvsp[(1) - (2)].case_statement);
(yyval.case_statement)->stmts.push_tail(& (yyvsp[(2) - (2)].node)->link);
@@ -5234,7 +5264,7 @@ yyreduce:
break;
case 306:
-#line 1947 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1951 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
ast_case_statement_list *cases= new(state) ast_case_statement_list();
cases->set_location(yylloc);
@@ -5245,7 +5275,7 @@ yyreduce:
break;
case 307:
-#line 1955 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1959 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.case_statement_list) = (yyvsp[(1) - (2)].case_statement_list);
(yyval.case_statement_list)->cases.push_tail(& (yyvsp[(2) - (2)].case_statement)->link);
@@ -5253,7 +5283,7 @@ yyreduce:
break;
case 308:
-#line 1963 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1967 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.node) = new(ctx) ast_iteration_statement(ast_iteration_statement::ast_while,
@@ -5263,7 +5293,7 @@ yyreduce:
break;
case 309:
-#line 1970 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1974 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.node) = new(ctx) ast_iteration_statement(ast_iteration_statement::ast_do_while,
@@ -5273,7 +5303,7 @@ yyreduce:
break;
case 310:
-#line 1977 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1981 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.node) = new(ctx) ast_iteration_statement(ast_iteration_statement::ast_for,
@@ -5283,14 +5313,14 @@ yyreduce:
break;
case 314:
-#line 1993 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 1997 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.node) = NULL;
;}
break;
case 315:
-#line 2000 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 2004 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.for_rest_statement).cond = (yyvsp[(1) - (2)].node);
(yyval.for_rest_statement).rest = NULL;
@@ -5298,7 +5328,7 @@ yyreduce:
break;
case 316:
-#line 2005 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 2009 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.for_rest_statement).cond = (yyvsp[(1) - (3)].node);
(yyval.for_rest_statement).rest = (yyvsp[(3) - (3)].expression);
@@ -5306,7 +5336,7 @@ yyreduce:
break;
case 317:
-#line 2014 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 2018 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.node) = new(ctx) ast_jump_statement(ast_jump_statement::ast_continue, NULL);
@@ -5315,7 +5345,7 @@ yyreduce:
break;
case 318:
-#line 2020 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 2024 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.node) = new(ctx) ast_jump_statement(ast_jump_statement::ast_break, NULL);
@@ -5324,7 +5354,7 @@ yyreduce:
break;
case 319:
-#line 2026 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 2030 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.node) = new(ctx) ast_jump_statement(ast_jump_statement::ast_return, NULL);
@@ -5333,7 +5363,7 @@ yyreduce:
break;
case 320:
-#line 2032 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 2036 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.node) = new(ctx) ast_jump_statement(ast_jump_statement::ast_return, (yyvsp[(2) - (3)].expression));
@@ -5342,7 +5372,7 @@ yyreduce:
break;
case 321:
-#line 2038 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 2042 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.node) = new(ctx) ast_jump_statement(ast_jump_statement::ast_discard, NULL);
@@ -5351,27 +5381,27 @@ yyreduce:
break;
case 322:
-#line 2046 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 2050 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.node) = (yyvsp[(1) - (1)].function_definition); ;}
break;
case 323:
-#line 2047 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 2051 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.node) = (yyvsp[(1) - (1)].node); ;}
break;
case 324:
-#line 2048 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 2052 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.node) = NULL; ;}
break;
case 325:
-#line 2049 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 2053 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{ (yyval.node) = NULL; ;}
break;
case 326:
-#line 2054 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 2058 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
(yyval.function_definition) = new(ctx) ast_function_definition();
@@ -5384,14 +5414,14 @@ yyreduce:
break;
case 327:
-#line 2068 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 2072 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.node) = (yyvsp[(1) - (1)].interface_block);
;}
break;
case 328:
-#line 2072 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 2076 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
ast_interface_block *block = (yyvsp[(2) - (2)].interface_block);
if (!block->layout.merge_qualifier(& (yylsp[(1) - (2)]), state, (yyvsp[(1) - (2)].type_qualifier))) {
@@ -5402,7 +5432,7 @@ yyreduce:
break;
case 329:
-#line 2083 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 2087 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
ast_interface_block *const block = (yyvsp[(6) - (7)].interface_block);
@@ -5499,7 +5529,7 @@ yyreduce:
break;
case 330:
-#line 2180 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 2184 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
(yyval.type_qualifier).flags.q.in = 1;
@@ -5507,7 +5537,7 @@ yyreduce:
break;
case 331:
-#line 2185 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 2189 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
(yyval.type_qualifier).flags.q.out = 1;
@@ -5515,7 +5545,7 @@ yyreduce:
break;
case 332:
-#line 2190 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 2194 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
memset(& (yyval.type_qualifier), 0, sizeof((yyval.type_qualifier)));
(yyval.type_qualifier).flags.q.uniform = 1;
@@ -5523,7 +5553,7 @@ yyreduce:
break;
case 333:
-#line 2198 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 2202 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.interface_block) = new(state) ast_interface_block(*state->default_uniform_qualifier,
NULL, NULL);
@@ -5531,7 +5561,7 @@ yyreduce:
break;
case 334:
-#line 2203 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 2207 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.interface_block) = new(state) ast_interface_block(*state->default_uniform_qualifier,
(yyvsp[(1) - (1)].identifier), NULL);
@@ -5539,7 +5569,7 @@ yyreduce:
break;
case 335:
-#line 2208 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 2212 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.interface_block) = new(state) ast_interface_block(*state->default_uniform_qualifier,
(yyvsp[(1) - (4)].identifier), (yyvsp[(3) - (4)].expression));
@@ -5547,7 +5577,7 @@ yyreduce:
break;
case 336:
-#line 2213 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 2217 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
_mesa_glsl_error(& (yylsp[(1) - (3)]), state,
"instance block arrays must be explicitly sized\n");
@@ -5558,7 +5588,7 @@ yyreduce:
break;
case 337:
-#line 2224 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 2228 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.declarator_list) = (yyvsp[(1) - (1)].declarator_list);
(yyvsp[(1) - (1)].declarator_list)->link.self_link();
@@ -5566,7 +5596,7 @@ yyreduce:
break;
case 338:
-#line 2229 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 2233 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
(yyval.declarator_list) = (yyvsp[(1) - (2)].declarator_list);
(yyvsp[(2) - (2)].declarator_list)->link.insert_before(& (yyval.declarator_list)->link);
@@ -5574,7 +5604,7 @@ yyreduce:
break;
case 339:
-#line 2237 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 2241 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
void *ctx = state;
ast_fully_specified_type *type = (yyvsp[(1) - (3)].fully_specified_type);
@@ -5598,7 +5628,7 @@ yyreduce:
break;
case 340:
-#line 2261 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 2265 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
if (!state->default_uniform_qualifier->merge_qualifier(& (yylsp[(1) - (3)]), state, (yyvsp[(1) - (3)].type_qualifier))) {
YYERROR;
@@ -5608,7 +5638,7 @@ yyreduce:
/* Line 1267 of yacc.c. */
-#line 5612 "glsl/glsl_parser.cpp"
+#line 5642 "glsl/glsl_parser.cpp"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
diff --git a/lib/libGL/generated/glsl/glsl_parser.h b/lib/libGL/generated/glsl/glsl_parser.h
index 8cf844de4..80ec86665 100644
--- a/lib/libGL/generated/glsl/glsl_parser.h
+++ b/lib/libGL/generated/glsl/glsl_parser.h
@@ -484,7 +484,7 @@
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
-#line 65 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
+#line 65 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/glsl/glsl_parser.yy"
{
int n;
float real;
diff --git a/lib/libGL/generated/main/get_hash.h b/lib/libGL/generated/main/get_hash.h
index 8e14da943..4e4c28ec5 100644
--- a/lib/libGL/generated/main/get_hash.h
+++ b/lib/libGL/generated/main/get_hash.h
@@ -172,9 +172,6 @@ static struct value_desc values[] = {
{ GL_COLOR_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT, offsetof(struct gl_array_object, VertexAttrib[VERT_ATTRIB_COLOR0].BufferObj), NO_EXTRA },
{ GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB, LOC_CUSTOM, TYPE_INT, NO_OFFSET, NO_EXTRA },
{ GL_POINT_SPRITE_NV, CONTEXT_BOOL(Point.PointSprite), extra_NV_point_sprite_ARB_point_sprite },
- { GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES, },
- { GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES, },
- { GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES, },
{ GL_POINT_SIZE_ARRAY_OES, ARRAY_FIELD(VertexAttrib[VERT_ATTRIB_POINT_SIZE].Enabled, TYPE_BOOLEAN) },
{ GL_POINT_SIZE_ARRAY_TYPE_OES, ARRAY_FIELD(VertexAttrib[VERT_ATTRIB_POINT_SIZE].Type, TYPE_ENUM) },
{ GL_POINT_SIZE_ARRAY_STRIDE_OES, ARRAY_FIELD(VertexAttrib[VERT_ATTRIB_POINT_SIZE].Stride, TYPE_INT) },
@@ -221,13 +218,14 @@ static struct value_desc values[] = {
{ GL_MAX_VERTEX_UNIFORM_VECTORS, LOC_CUSTOM, TYPE_INT, 0, extra_ARB_ES2_compatibility_api_es2 },
{ GL_MAX_FRAGMENT_UNIFORM_VECTORS, LOC_CUSTOM, TYPE_INT, 0, extra_ARB_ES2_compatibility_api_es2 },
{ GL_NUM_SHADER_BINARY_FORMATS, CONST(0), extra_ARB_ES2_compatibility_api_es2 },
- { GL_SHADER_BINARY_FORMATS, CONST(0), extra_ARB_ES2_compatibility_api_es2 },
+ { GL_SHADER_BINARY_FORMATS, LOC_CUSTOM, TYPE_INVALID, 0, extra_ARB_ES2_compatibility_api_es2 },
{ GL_NUM_PROGRAM_BINARY_FORMATS, CONST(0), NO_EXTRA },
{ GL_PROGRAM_BINARY_FORMATS, LOC_CUSTOM, TYPE_INVALID, 0, NO_EXTRA },
{ GL_MAX_TEXTURE_LOD_BIAS_EXT, CONTEXT_FLOAT(Const.MaxTextureLodBias), NO_EXTRA },
{ GL_NUM_EXTENSIONS, LOC_CUSTOM, TYPE_INT, 0, extra_gl30_es3 },
{ GL_MAJOR_VERSION, LOC_CUSTOM, TYPE_INT, 0, extra_gl30_es3 },
{ GL_MINOR_VERSION, LOC_CUSTOM, TYPE_INT, 0, extra_gl30_es3 },
+ { GL_MAX_VERTEX_OUTPUT_COMPONENTS, LOC_CUSTOM, TYPE_INT, 0, extra_gl32_es3 },
{ GL_MAX_FRAGMENT_INPUT_COMPONENTS, LOC_CUSTOM, TYPE_INT, 0, extra_gl32_es3 },
{ GL_MAX_ELEMENT_INDEX, CONTEXT_INT64(Const.MaxElementIndex), extra_ARB_ES3_compatibility_api_es3 },
{ GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB, CONTEXT_INT(Const.FragmentProgram.MaxUniformComponents), extra_ARB_fragment_shader },
@@ -495,262 +493,262 @@ static struct value_desc values[] = {
};
static table_t table_API_OPENGL = {
- 80, 0, 330, 0,
- 137, 200, 0, 0,
- 0, 334, 0, 106,
- 458, 0, 0, 0,
- 0, 0, 408, 432,
- 240, 222, 0, 0,
- 0, 0, 0, 312,
- 0, 0, 0, 335,
- 0, 0, 181, 0,
+ 80, 0, 328, 0,
+ 137, 197, 0, 0,
+ 0, 332, 0, 106,
+ 456, 0, 0, 0,
+ 0, 0, 406, 430,
+ 238, 219, 0, 0,
+ 0, 0, 0, 310,
+ 0, 0, 0, 333,
+ 0, 0, 178, 0,
0, 0, 164, 149,
- 369, 132, 138, 6,
+ 367, 132, 138, 6,
0, 0, 0, 0,
- 265, 0, 0, 244,
- 139, 0, 301, 0,
- 0, 457, 0, 0,
+ 263, 0, 0, 242,
+ 139, 0, 299, 0,
+ 0, 455, 0, 0,
0, 0, 0, 0,
- 429, 0, 0, 215,
- 0, 0, 326, 0,
- 0, 440, 260, 481,
- 0, 359, 0, 0,
- 0, 297, 453, 254,
+ 427, 0, 0, 212,
+ 0, 0, 324, 0,
+ 0, 438, 258, 479,
+ 0, 357, 0, 0,
+ 0, 295, 451, 252,
143, 0, 0, 0,
- 228, 81, 0, 0,
+ 226, 81, 0, 0,
0, 142, 0, 0,
- 108, 227, 303, 0,
- 274, 459, 0, 0,
+ 108, 225, 301, 0,
+ 272, 457, 0, 0,
0, 0, 0, 0,
- 446, 0, 471, 0,
+ 444, 0, 469, 0,
0, 0, 0, 0,
- 313, 0, 0, 0,
- 122, 0, 0, 183,
+ 311, 0, 0, 0,
+ 122, 0, 0, 180,
0, 0, 0, 165,
- 255, 43, 116, 0,
- 186, 0, 0, 0,
- 0, 270, 71, 0,
- 0, 271, 0, 0,
+ 253, 43, 116, 0,
+ 183, 0, 0, 0,
+ 0, 268, 71, 0,
+ 0, 269, 0, 0,
131, 0, 0, 0,
- 450, 0, 416, 0,
- 0, 430, 0, 0,
- 214, 409, 0, 327,
- 0, 0, 441, 261,
- 480, 0, 377, 78,
- 20, 0, 0, 204,
- 388, 147, 398, 0,
- 293, 418, 82, 0,
- 294, 0, 124, 0,
- 431, 288, 242, 304,
- 0, 276, 0, 0,
- 0, 0, 445, 0,
- 0, 0, 0, 0,
- 0, 286, 0, 0,
- 0, 314, 0, 0,
- 42, 123, 0, 0,
- 182, 0, 0, 0,
- 166, 151, 209, 311,
- 0, 188, 0, 0,
+ 448, 0, 414, 0,
+ 0, 428, 0, 0,
+ 211, 407, 0, 325,
+ 0, 0, 439, 259,
+ 478, 0, 375, 78,
+ 20, 0, 0, 201,
+ 386, 147, 396, 0,
+ 291, 416, 82, 0,
+ 292, 0, 124, 0,
+ 429, 286, 240, 302,
+ 0, 274, 0, 0,
+ 0, 0, 443, 0,
+ 0, 0, 0, 0,
+ 0, 284, 0, 0,
+ 0, 312, 0, 0,
+ 42, 123, 222, 0,
+ 179, 0, 0, 0,
+ 166, 151, 206, 309,
+ 0, 185, 0, 0,
94, 0, 0, 72,
- 0, 0, 272, 0,
+ 0, 0, 270, 0,
0, 129, 0, 0,
- 0, 0, 264, 417,
- 449, 469, 425, 233,
- 0, 216, 0, 0,
- 328, 0, 0, 444,
- 0, 478, 0, 378,
- 339, 21, 0, 0,
- 202, 389, 150, 278,
- 0, 362, 368, 83,
- 0, 360, 0, 136,
- 39, 0, 110, 243,
- 0, 0, 279, 0,
- 0, 95, 0, 415,
- 0, 0, 0, 0,
- 424, 0, 287, 0,
- 0, 0, 315, 0,
- 0, 291, 23, 0,
+ 0, 0, 262, 415,
+ 447, 467, 423, 231,
+ 0, 213, 0, 0,
+ 326, 0, 0, 442,
+ 0, 476, 0, 376,
+ 337, 21, 0, 0,
+ 199, 387, 150, 276,
+ 0, 360, 366, 83,
+ 0, 358, 0, 136,
+ 39, 0, 110, 241,
+ 0, 0, 277, 0,
+ 0, 95, 0, 413,
+ 0, 0, 0, 0,
+ 422, 0, 285, 0,
+ 0, 0, 313, 0,
+ 0, 289, 23, 0,
0, 44, 0, 0,
- 347, 420, 152, 127,
- 112, 54, 189, 0,
+ 345, 418, 152, 127,
+ 112, 54, 186, 0,
0, 3, 0, 0,
0, 0, 0, 103,
- 352, 0, 130, 0,
- 0, 0, 0, 0,
- 0, 390, 0, 426,
- 483, 0, 0, 0,
- 308, 472, 0, 0,
- 443, 0, 0, 0,
- 290, 338, 0, 0,
- 486, 203, 0, 382,
- 371, 0, 283, 407,
+ 350, 0, 130, 0,
+ 0, 0, 0, 0,
+ 0, 388, 0, 424,
+ 481, 0, 0, 0,
+ 306, 470, 0, 0,
+ 441, 0, 0, 0,
+ 288, 336, 0, 0,
+ 484, 200, 0, 380,
+ 369, 0, 281, 405,
84, 0, 0, 0,
- 141, 33, 325, 114,
- 198, 0, 0, 277,
- 0, 367, 96, 0,
- 0, 0, 0, 436,
- 0, 0, 0, 0,
- 0, 0, 0, 316,
- 266, 0, 29, 332,
- 0, 0, 412, 187,
- 50, 350, 167, 153,
- 177, 405, 0, 190,
+ 141, 33, 323, 114,
+ 195, 0, 0, 275,
+ 0, 365, 96, 0,
+ 0, 0, 0, 434,
+ 0, 0, 0, 0,
+ 0, 0, 0, 314,
+ 264, 0, 29, 330,
+ 0, 0, 410, 184,
+ 50, 348, 167, 153,
+ 174, 403, 0, 187,
30, 0, 2, 0,
- 0, 474, 0, 0,
- 340, 356, 208, 351,
- 0, 0, 0, 0,
- 0, 0, 428, 0,
- 0, 234, 0, 0,
- 0, 309, 473, 0,
- 0, 442, 0, 463,
- 333, 289, 178, 0,
- 0, 0, 73, 251,
- 154, 168, 0, 364,
- 370, 85, 0, 0,
- 91, 75, 35, 0,
- 111, 199, 69, 0,
- 280, 0, 0, 97,
- 0, 0, 0, 0,
- 0, 0, 410, 252,
- 363, 455, 0, 0,
- 317, 0, 0, 17,
- 0, 225, 465, 0,
- 46, 49, 348, 421,
- 381, 25, 0, 0,
- 191, 31, 0, 0,
- 0, 0, 475, 0,
- 12, 0, 358, 0,
- 357, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 235, 0,
- 27, 0, 319, 0,
+ 0, 472, 0, 0,
+ 338, 354, 205, 349,
0, 0, 0, 0,
- 464, 79, 66, 180,
+ 0, 0, 426, 0,
+ 0, 232, 0, 0,
+ 0, 307, 471, 0,
+ 0, 440, 0, 461,
+ 331, 287, 175, 0,
+ 0, 0, 73, 249,
+ 154, 168, 0, 362,
+ 368, 85, 0, 0,
+ 91, 75, 35, 0,
+ 111, 196, 69, 0,
+ 278, 0, 0, 97,
+ 0, 0, 0, 0,
+ 0, 0, 408, 250,
+ 361, 453, 0, 0,
+ 315, 0, 0, 17,
+ 0, 223, 463, 0,
+ 46, 49, 346, 419,
+ 379, 25, 0, 0,
+ 188, 31, 0, 0,
+ 0, 0, 473, 0,
+ 12, 0, 356, 0,
+ 355, 0, 0, 0,
+ 0, 0, 0, 0,
+ 0, 0, 233, 0,
+ 27, 0, 317, 0,
+ 0, 0, 0, 0,
+ 462, 79, 66, 177,
0, 0, 0, 74,
- 434, 387, 373, 0,
- 0, 249, 86, 0,
- 0, 92, 485, 40,
+ 432, 385, 371, 0,
+ 0, 247, 86, 0,
+ 0, 92, 483, 40,
0, 113, 0, 70,
- 115, 275, 439, 419,
+ 115, 273, 437, 417,
98, 0, 0, 0,
- 0, 468, 0, 230,
- 253, 0, 456, 0,
- 318, 0, 201, 226,
- 4, 0, 133, 466,
- 413, 159, 52, 346,
- 422, 383, 19, 403,
- 361, 192, 0, 0,
- 0, 0, 411, 0,
- 0, 13, 0, 285,
- 0, 404, 0, 0,
+ 0, 466, 0, 228,
+ 251, 0, 454, 0,
+ 316, 0, 198, 224,
+ 4, 0, 133, 464,
+ 411, 159, 52, 344,
+ 420, 381, 19, 401,
+ 359, 189, 0, 0,
+ 0, 0, 409, 0,
+ 0, 13, 0, 283,
+ 0, 402, 0, 0,
0, 0, 55, 0,
- 0, 0, 0, 237,
- 0, 354, 0, 320,
+ 0, 0, 0, 235,
+ 0, 352, 0, 318,
0, 0, 0, 0,
161, 0, 76, 67,
- 179, 247, 0, 0,
- 61, 435, 144, 374,
+ 176, 245, 0, 0,
+ 61, 433, 144, 372,
0, 0, 0, 87,
119, 0, 93, 0,
34, 0, 109, 0,
0, 18, 0, 0,
0, 99, 0, 0,
- 0, 0, 0, 341,
- 231, 386, 0, 454,
- 0, 321, 0, 205,
+ 0, 0, 0, 339,
+ 229, 384, 0, 452,
+ 0, 319, 0, 202,
0, 1, 0, 134,
- 329, 0, 158, 51,
- 345, 162, 384, 366,
- 396, 0, 193, 0,
+ 327, 0, 158, 51,
+ 343, 162, 382, 364,
+ 394, 0, 190, 0,
0, 0, 0, 0,
120, 0, 14, 0,
7, 0, 0, 0,
0, 0, 0, 56,
0, 0, 0, 0,
- 236, 0, 355, 0,
+ 234, 0, 353, 0,
0, 0, 0, 0,
0, 0, 0, 22,
48, 24, 0, 0,
0, 62, 0, 145,
0, 0, 0, 0,
- 479, 306, 470, 0,
+ 477, 304, 468, 0,
0, 36, 0, 0,
88, 0, 117, 0,
0, 0, 100, 0,
- 0, 250, 0, 0,
- 0, 232, 0, 0,
- 365, 0, 322, 0,
- 206, 0, 9, 0,
- 135, 229, 0, 393,
- 0, 344, 57, 385,
- 0, 397, 0, 194,
- 467, 0, 0, 0,
+ 0, 248, 0, 0,
+ 0, 230, 0, 0,
+ 363, 0, 320, 0,
+ 203, 0, 9, 0,
+ 135, 227, 0, 391,
+ 0, 342, 57, 383,
+ 0, 395, 0, 191,
+ 465, 0, 0, 0,
0, 126, 0, 10,
- 0, 8, 184, 0,
+ 0, 8, 181, 0,
104, 0, 0, 0,
0, 0, 0, 0,
- 0, 238, 0, 0,
- 0, 402, 0, 0,
- 307, 0, 0, 0,
- 336, 263, 0, 248,
- 0, 0, 59, 406,
+ 0, 236, 0, 0,
+ 0, 400, 0, 0,
+ 305, 0, 0, 0,
+ 334, 261, 0, 246,
+ 0, 0, 59, 404,
146, 0, 0, 28,
- 292, 53, 118, 269,
+ 290, 53, 118, 267,
0, 0, 37, 0,
- 0, 298, 0, 302,
+ 0, 296, 0, 300,
0, 0, 0, 101,
0, 0, 0, 0,
0, 0, 0, 0,
- 218, 140, 0, 323,
- 0, 207, 437, 32,
- 0, 107, 295, 0,
- 394, 0, 349, 163,
- 155, 176, 401, 267,
- 195, 0, 219, 476,
- 15, 0, 45, 211,
- 11, 0, 16, 185,
- 0, 273, 451, 0,
- 0, 0, 0, 0,
- 0, 0, 484, 223,
- 0, 0, 0, 0,
- 391, 310, 0, 0,
- 0, 331, 282, 0,
- 376, 0, 0, 60,
- 64, 379, 0, 447,
- 26, 296, 487, 427,
- 268, 245, 0, 38,
- 262, 0, 90, 0,
- 299, 0, 0, 0,
+ 215, 140, 0, 321,
+ 0, 204, 435, 32,
+ 0, 107, 293, 0,
+ 392, 0, 347, 163,
+ 155, 173, 399, 265,
+ 192, 0, 216, 474,
+ 15, 0, 45, 208,
+ 11, 0, 16, 182,
+ 0, 271, 449, 0,
+ 0, 0, 0, 0,
+ 0, 0, 482, 220,
+ 0, 0, 0, 0,
+ 389, 308, 0, 0,
+ 0, 329, 280, 0,
+ 374, 0, 0, 60,
+ 64, 377, 0, 445,
+ 26, 294, 485, 425,
+ 266, 243, 0, 38,
+ 260, 0, 90, 0,
+ 297, 0, 0, 0,
102, 0, 0, 0,
0, 0, 0, 0,
- 0, 217, 0, 0,
- 324, 0, 433, 438,
- 258, 0, 0, 160,
- 482, 395, 0, 343,
- 58, 156, 197, 399,
- 284, 460, 0, 220,
- 0, 414, 0, 125,
- 0, 0, 423, 0,
- 305, 0, 105, 462,
- 0, 0, 0, 0,
- 0, 0, 0, 239,
- 224, 0, 0, 0,
- 0, 392, 63, 0,
- 0, 0, 121, 281,
- 0, 375, 0, 380,
+ 0, 214, 0, 0,
+ 322, 0, 431, 436,
+ 256, 0, 0, 160,
+ 480, 393, 0, 341,
+ 58, 156, 194, 397,
+ 282, 458, 0, 217,
+ 0, 412, 0, 125,
+ 0, 0, 421, 0,
+ 303, 0, 105, 460,
+ 0, 0, 0, 0,
+ 0, 0, 0, 237,
+ 221, 0, 0, 0,
+ 0, 390, 63, 0,
+ 0, 0, 121, 279,
+ 0, 373, 0, 378,
0, 65, 148, 0,
- 128, 353, 5, 0,
- 0, 68, 246, 0,
+ 128, 351, 5, 0,
+ 0, 68, 244, 0,
41, 0, 0, 89,
- 0, 300, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 477, 0,
- 241, 0, 213, 372,
- 0, 77, 448, 196,
- 337, 259, 0, 0,
- 47, 221, 0, 0,
- 342, 452, 157, 210,
- 400, 212, 461, 0,
+ 0, 298, 0, 0,
+ 0, 0, 0, 0,
+ 0, 0, 475, 0,
+ 239, 0, 210, 370,
+ 0, 77, 446, 193,
+ 335, 257, 0, 0,
+ 47, 218, 0, 0,
+ 340, 450, 157, 207,
+ 398, 209, 459, 0,
};
static table_t table_API_OPENGLES = {
@@ -761,7 +759,7 @@ static table_t table_API_OPENGLES = {
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- 0, 257, 0, 0,
+ 0, 255, 0, 0,
0, 0, 0, 0,
0, 0, 164, 149,
0, 132, 138, 6,
@@ -805,7 +803,7 @@ static table_t table_API_OPENGLES = {
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- 0, 0, 0, 256,
+ 0, 0, 0, 254,
42, 123, 0, 0,
0, 0, 0, 0,
166, 151, 0, 0,
@@ -816,7 +814,7 @@ static table_t table_API_OPENGLES = {
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- 0, 0, 173, 0,
+ 0, 0, 170, 0,
0, 0, 0, 0,
0, 21, 0, 0,
0, 0, 150, 0,
@@ -833,12 +831,12 @@ static table_t table_API_OPENGLES = {
0, 0, 152, 127,
112, 54, 0, 0,
0, 3, 0, 0,
- 172, 0, 0, 103,
+ 169, 0, 0, 103,
0, 0, 130, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- 0, 0, 0, 174,
+ 0, 0, 0, 171,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
@@ -883,7 +881,7 @@ static table_t table_API_OPENGLES = {
0, 0, 0, 0,
0, 0, 0, 0,
27, 0, 0, 0,
- 0, 169, 0, 0,
+ 0, 0, 0, 0,
0, 79, 66, 0,
0, 0, 0, 74,
0, 0, 0, 0,
@@ -899,13 +897,13 @@ static table_t table_API_OPENGLES = {
0, 159, 52, 0,
0, 0, 19, 0,
0, 0, 0, 0,
- 0, 0, 0, 175,
+ 0, 0, 0, 172,
0, 13, 0, 0,
0, 0, 0, 0,
0, 0, 55, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- 0, 0, 170, 0,
+ 0, 0, 0, 0,
161, 0, 76, 67,
0, 0, 0, 0,
61, 0, 144, 0,
@@ -927,7 +925,7 @@ static table_t table_API_OPENGLES = {
0, 0, 0, 56,
0, 0, 0, 0,
0, 0, 0, 0,
- 0, 0, 0, 171,
+ 0, 0, 0, 0,
0, 0, 0, 22,
48, 24, 0, 0,
0, 62, 0, 145,
@@ -1007,21 +1005,21 @@ static table_t table_API_OPENGLES = {
0, 0, 0, 0,
0, 77, 0, 0,
0, 0, 0, 0,
- 47, 221, 0, 0,
+ 47, 218, 0, 0,
0, 0, 157, 0,
0, 0, 0, 0,
};
static table_t table_API_OPENGLES2 = {
- 201, 0, 0, 0,
- 0, 200, 0, 0,
+ 198, 0, 0, 0,
+ 0, 197, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- 0, 257, 0, 0,
- 0, 0, 181, 0,
+ 0, 255, 0, 0,
+ 0, 0, 178, 0,
0, 0, 0, 0,
0, 0, 0, 6,
0, 0, 0, 0,
@@ -1029,13 +1027,13 @@ static table_t table_API_OPENGLES2 = {
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- 0, 0, 0, 215,
+ 0, 0, 0, 212,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- 0, 205, 0, 0,
+ 0, 202, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
@@ -1043,43 +1041,43 @@ static table_t table_API_OPENGLES2 = {
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- 0, 0, 0, 183,
+ 0, 0, 0, 180,
0, 0, 0, 0,
0, 43, 0, 0,
- 186, 0, 0, 0,
+ 183, 0, 0, 0,
0, 0, 71, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- 214, 0, 0, 0,
+ 211, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 78,
- 20, 0, 0, 204,
+ 20, 0, 0, 201,
0, 0, 0, 0,
- 0, 0, 206, 0,
+ 0, 0, 203, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- 0, 0, 0, 256,
+ 0, 0, 0, 254,
42, 0, 0, 0,
- 182, 0, 0, 0,
- 0, 0, 209, 0,
- 0, 188, 0, 0,
+ 179, 0, 0, 0,
+ 0, 0, 206, 0,
+ 0, 185, 0, 0,
0, 0, 0, 72,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- 0, 216, 0, 0,
+ 0, 213, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 21, 0, 0,
- 202, 0, 0, 0,
- 0, 0, 0, 207,
+ 199, 0, 0, 0,
+ 0, 0, 0, 204,
0, 0, 0, 0,
39, 0, 0, 0,
0, 0, 0, 0,
@@ -1090,7 +1088,7 @@ static table_t table_API_OPENGLES2 = {
0, 0, 23, 0,
0, 44, 0, 0,
0, 0, 0, 0,
- 0, 54, 189, 0,
+ 0, 54, 186, 0,
0, 3, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
@@ -1100,34 +1098,34 @@ static table_t table_API_OPENGLES2 = {
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- 0, 203, 0, 0,
+ 0, 200, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 33, 0, 0,
- 198, 0, 0, 0,
+ 195, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 29, 0,
- 0, 0, 0, 187,
+ 0, 0, 0, 184,
50, 0, 0, 0,
- 177, 0, 0, 190,
+ 174, 0, 0, 187,
30, 0, 2, 0,
0, 0, 0, 0,
- 0, 0, 208, 0,
+ 0, 0, 205, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- 0, 0, 178, 0,
+ 0, 0, 175, 0,
0, 0, 73, 0,
0, 0, 0, 0,
- 0, 196, 0, 0,
+ 0, 193, 0, 0,
0, 75, 35, 0,
- 0, 199, 69, 0,
- 0, 0, 0, 212,
+ 0, 196, 69, 0,
+ 0, 0, 0, 209,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
@@ -1135,7 +1133,7 @@ static table_t table_API_OPENGLES2 = {
0, 0, 0, 0,
46, 49, 0, 0,
0, 25, 0, 0,
- 191, 31, 0, 0,
+ 188, 31, 0, 0,
0, 0, 0, 0,
12, 0, 0, 0,
0, 0, 0, 0,
@@ -1143,7 +1141,7 @@ static table_t table_API_OPENGLES2 = {
0, 0, 0, 0,
27, 0, 0, 0,
0, 0, 0, 0,
- 0, 0, 66, 180,
+ 0, 0, 66, 177,
0, 0, 0, 74,
0, 0, 0, 0,
0, 0, 0, 0,
@@ -1157,7 +1155,7 @@ static table_t table_API_OPENGLES2 = {
4, 0, 0, 0,
0, 0, 52, 0,
0, 0, 19, 0,
- 0, 192, 0, 0,
+ 0, 189, 0, 0,
0, 0, 0, 0,
0, 13, 0, 0,
0, 0, 0, 0,
@@ -1166,7 +1164,7 @@ static table_t table_API_OPENGLES2 = {
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 76, 67,
- 179, 0, 0, 0,
+ 176, 0, 0, 0,
61, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
@@ -1179,7 +1177,7 @@ static table_t table_API_OPENGLES2 = {
0, 1, 0, 0,
0, 0, 0, 51,
0, 0, 0, 0,
- 0, 0, 193, 0,
+ 0, 0, 190, 0,
0, 0, 0, 0,
0, 0, 14, 0,
7, 0, 0, 0,
@@ -1201,10 +1199,10 @@ static table_t table_API_OPENGLES2 = {
0, 0, 9, 0,
0, 0, 0, 0,
0, 0, 57, 0,
- 0, 0, 0, 194,
+ 0, 0, 0, 191,
0, 0, 0, 0,
0, 0, 0, 10,
- 0, 8, 184, 0,
+ 0, 8, 181, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
@@ -1219,14 +1217,14 @@ static table_t table_API_OPENGLES2 = {
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- 218, 0, 0, 0,
+ 215, 0, 0, 0,
0, 0, 0, 32,
0, 0, 0, 0,
0, 0, 0, 0,
- 0, 176, 0, 0,
- 195, 0, 219, 0,
- 15, 0, 45, 211,
- 11, 0, 16, 185,
+ 0, 173, 0, 0,
+ 192, 0, 216, 0,
+ 15, 0, 45, 208,
+ 11, 0, 16, 182,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
@@ -1241,12 +1239,12 @@ static table_t table_API_OPENGLES2 = {
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- 0, 217, 0, 0,
+ 0, 214, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- 58, 0, 197, 0,
- 0, 0, 0, 220,
+ 58, 0, 194, 0,
+ 0, 0, 0, 217,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
@@ -1263,84 +1261,84 @@ static table_t table_API_OPENGLES2 = {
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- 0, 0, 213, 0,
+ 0, 0, 210, 0,
0, 77, 0, 0,
0, 0, 0, 0,
47, 0, 0, 0,
- 0, 0, 0, 210,
+ 0, 0, 0, 207,
0, 0, 0, 0,
};
static table_t table_API_OPENGLES3 = {
- 201, 0, 0, 0,
- 0, 200, 0, 0,
+ 198, 0, 0, 0,
+ 0, 197, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- 240, 222, 0, 0,
+ 238, 219, 0, 0,
0, 0, 0, 0,
- 0, 257, 0, 0,
- 0, 0, 181, 0,
+ 0, 255, 0, 0,
+ 0, 0, 178, 0,
0, 0, 0, 0,
0, 0, 0, 6,
0, 0, 0, 0,
- 0, 0, 0, 244,
+ 0, 0, 0, 242,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- 0, 0, 0, 215,
+ 0, 0, 0, 212,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- 0, 0, 0, 254,
+ 0, 0, 0, 252,
0, 0, 0, 0,
- 228, 205, 0, 0,
+ 226, 202, 0, 0,
0, 0, 0, 0,
- 0, 227, 0, 0,
+ 0, 225, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- 0, 0, 0, 183,
+ 0, 0, 0, 180,
0, 0, 0, 0,
- 255, 43, 0, 0,
- 186, 0, 0, 0,
+ 253, 43, 0, 0,
+ 183, 0, 0, 0,
0, 0, 71, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- 214, 0, 0, 0,
+ 211, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 78,
- 20, 0, 0, 204,
+ 20, 0, 0, 201,
0, 0, 0, 0,
- 0, 0, 206, 0,
+ 0, 0, 203, 0,
0, 0, 0, 0,
- 0, 0, 242, 0,
+ 0, 0, 240, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- 0, 0, 0, 256,
- 42, 0, 0, 0,
- 182, 0, 0, 0,
- 0, 0, 209, 0,
- 0, 188, 0, 0,
+ 0, 0, 0, 254,
+ 42, 0, 222, 0,
+ 179, 0, 0, 0,
+ 0, 0, 206, 0,
+ 0, 185, 0, 0,
0, 0, 0, 72,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- 0, 0, 0, 233,
- 0, 216, 0, 0,
+ 0, 0, 0, 231,
+ 0, 213, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 21, 0, 0,
- 202, 0, 0, 0,
- 0, 0, 0, 207,
+ 199, 0, 0, 0,
+ 0, 0, 0, 204,
0, 0, 0, 0,
- 39, 0, 0, 243,
+ 39, 0, 0, 241,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
@@ -1349,7 +1347,7 @@ static table_t table_API_OPENGLES3 = {
0, 0, 23, 0,
0, 44, 0, 0,
0, 0, 0, 0,
- 0, 54, 189, 0,
+ 0, 54, 186, 0,
0, 3, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
@@ -1359,73 +1357,73 @@ static table_t table_API_OPENGLES3 = {
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- 0, 203, 0, 0,
+ 0, 200, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 33, 0, 0,
- 198, 0, 0, 0,
+ 195, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 29, 0,
- 0, 0, 0, 187,
+ 0, 0, 0, 184,
50, 0, 0, 0,
- 177, 0, 0, 190,
+ 174, 0, 0, 187,
30, 0, 2, 0,
0, 0, 0, 0,
- 0, 0, 208, 0,
+ 0, 0, 205, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- 0, 234, 0, 0,
+ 0, 232, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- 0, 0, 178, 0,
- 0, 0, 73, 251,
+ 0, 0, 175, 0,
+ 0, 0, 73, 249,
0, 0, 0, 0,
- 0, 196, 0, 0,
- 250, 75, 35, 0,
- 0, 199, 69, 0,
- 0, 0, 0, 212,
+ 0, 193, 0, 0,
+ 248, 75, 35, 0,
+ 0, 196, 69, 0,
+ 0, 0, 0, 209,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 17,
- 0, 225, 0, 0,
+ 0, 223, 0, 0,
46, 49, 0, 0,
0, 25, 0, 0,
- 191, 31, 0, 0,
+ 188, 31, 0, 0,
0, 0, 0, 0,
12, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- 0, 0, 235, 0,
+ 0, 0, 233, 0,
27, 0, 0, 0,
0, 0, 0, 0,
- 0, 0, 66, 180,
+ 0, 0, 66, 177,
0, 0, 0, 74,
0, 0, 0, 0,
- 0, 249, 0, 0,
+ 0, 247, 0, 0,
0, 0, 0, 40,
0, 0, 0, 70,
0, 0, 0, 0,
0, 0, 0, 0,
- 0, 0, 0, 230,
+ 0, 0, 0, 228,
0, 0, 0, 0,
- 0, 0, 0, 226,
+ 0, 0, 0, 224,
4, 0, 0, 0,
0, 0, 52, 0,
0, 0, 19, 0,
- 0, 192, 0, 0,
+ 0, 189, 0, 0,
0, 0, 0, 0,
0, 13, 0, 0,
0, 0, 0, 0,
0, 0, 55, 0,
- 0, 0, 0, 237,
+ 0, 0, 0, 235,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 76, 67,
- 179, 247, 0, 0,
+ 176, 245, 0, 0,
61, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
@@ -1433,18 +1431,18 @@ static table_t table_API_OPENGLES3 = {
0, 18, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- 231, 0, 0, 0,
+ 229, 0, 0, 0,
0, 0, 0, 0,
0, 1, 0, 0,
0, 0, 0, 51,
0, 0, 0, 0,
- 0, 0, 193, 0,
+ 0, 0, 190, 0,
0, 0, 0, 0,
0, 0, 14, 0,
7, 0, 0, 0,
0, 0, 0, 56,
0, 0, 0, 0,
- 236, 0, 0, 0,
+ 234, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 22,
48, 24, 0, 0,
@@ -1455,21 +1453,21 @@ static table_t table_API_OPENGLES3 = {
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- 0, 232, 0, 0,
+ 0, 230, 0, 0,
0, 0, 0, 0,
0, 0, 9, 0,
- 0, 229, 0, 0,
+ 0, 227, 0, 0,
0, 0, 57, 0,
- 0, 0, 0, 194,
+ 0, 0, 0, 191,
0, 0, 0, 0,
0, 0, 0, 10,
- 0, 8, 184, 0,
+ 0, 8, 181, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- 0, 238, 0, 0,
+ 0, 236, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- 0, 0, 0, 248,
+ 0, 0, 0, 246,
0, 0, 59, 0,
0, 0, 0, 28,
0, 53, 0, 0,
@@ -1478,315 +1476,315 @@ static table_t table_API_OPENGLES3 = {
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- 218, 0, 0, 0,
+ 215, 0, 0, 0,
0, 0, 0, 32,
0, 0, 0, 0,
0, 0, 0, 0,
- 0, 176, 0, 0,
- 195, 0, 219, 0,
- 15, 0, 45, 211,
- 11, 0, 16, 185,
+ 0, 173, 0, 0,
+ 192, 0, 216, 0,
+ 15, 0, 45, 208,
+ 11, 0, 16, 182,
0, 0, 0, 0,
0, 0, 0, 0,
- 0, 0, 0, 223,
+ 0, 0, 0, 220,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 60,
64, 0, 0, 0,
26, 0, 0, 0,
- 0, 245, 0, 38,
+ 0, 243, 0, 38,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- 0, 217, 0, 0,
+ 0, 214, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- 58, 252, 197, 0,
- 0, 0, 0, 220,
+ 58, 250, 194, 0,
+ 0, 0, 0, 217,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- 0, 0, 0, 239,
- 224, 0, 0, 0,
+ 0, 0, 0, 237,
+ 221, 0, 0, 0,
0, 0, 63, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 65, 0, 0,
0, 0, 5, 0,
- 0, 68, 246, 0,
+ 0, 68, 244, 0,
41, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
0, 0, 0, 0,
- 241, 0, 213, 0,
+ 239, 0, 210, 0,
0, 77, 0, 0,
0, 0, 0, 0,
- 47, 221, 0, 0,
- 0, 0, 253, 210,
+ 47, 218, 0, 0,
+ 0, 0, 251, 207,
0, 0, 0, 0,
};
static table_t table_API_OPENGL_CORE = {
- 80, 0, 330, 0,
- 137, 200, 0, 0,
- 0, 334, 0, 106,
- 458, 0, 0, 0,
- 0, 0, 408, 432,
- 240, 222, 0, 0,
- 0, 0, 0, 312,
- 0, 0, 0, 335,
- 0, 0, 181, 0,
+ 80, 0, 328, 0,
+ 137, 197, 0, 0,
+ 0, 332, 0, 106,
+ 456, 0, 0, 0,
+ 0, 0, 406, 430,
+ 238, 219, 0, 0,
+ 0, 0, 0, 310,
+ 0, 0, 0, 333,
+ 0, 0, 178, 0,
0, 0, 164, 149,
- 369, 132, 138, 6,
+ 367, 132, 138, 6,
0, 0, 0, 0,
- 265, 0, 0, 244,
- 139, 0, 301, 0,
- 0, 457, 0, 0,
+ 263, 0, 0, 242,
+ 139, 0, 299, 0,
+ 0, 455, 0, 0,
0, 0, 0, 0,
- 429, 0, 0, 215,
- 0, 0, 326, 488,
- 0, 440, 260, 481,
- 0, 359, 0, 0,
- 0, 297, 453, 254,
+ 427, 0, 0, 212,
+ 0, 0, 324, 486,
+ 0, 438, 258, 479,
+ 0, 357, 0, 0,
+ 0, 295, 451, 252,
143, 0, 0, 0,
- 228, 81, 0, 0,
+ 226, 81, 0, 0,
0, 142, 0, 0,
- 108, 227, 303, 0,
- 274, 459, 0, 0,
+ 108, 225, 301, 0,
+ 272, 457, 0, 0,
0, 0, 0, 0,
- 446, 0, 471, 0,
+ 444, 0, 469, 0,
0, 0, 0, 0,
- 313, 0, 0, 0,
- 122, 0, 0, 183,
+ 311, 0, 0, 0,
+ 122, 0, 0, 180,
0, 0, 0, 165,
- 255, 43, 116, 0,
- 186, 0, 0, 0,
- 0, 270, 71, 0,
- 0, 271, 0, 0,
+ 253, 43, 116, 0,
+ 183, 0, 0, 0,
+ 0, 268, 71, 0,
+ 0, 269, 0, 0,
131, 0, 0, 0,
- 450, 0, 416, 0,
- 0, 430, 0, 0,
- 214, 409, 0, 327,
- 0, 0, 441, 261,
- 480, 0, 377, 78,
- 20, 0, 0, 204,
- 388, 147, 398, 0,
- 293, 418, 82, 0,
- 294, 0, 124, 0,
- 431, 288, 242, 304,
- 0, 276, 0, 0,
- 0, 0, 445, 0,
- 0, 0, 0, 0,
- 0, 286, 0, 0,
- 0, 314, 0, 0,
- 42, 123, 0, 0,
- 182, 0, 0, 0,
- 166, 151, 209, 311,
- 0, 188, 0, 0,
+ 448, 0, 414, 0,
+ 0, 428, 0, 0,
+ 211, 407, 0, 325,
+ 0, 0, 439, 259,
+ 478, 0, 375, 78,
+ 20, 0, 0, 201,
+ 386, 147, 396, 0,
+ 291, 416, 82, 0,
+ 292, 0, 124, 0,
+ 429, 286, 240, 302,
+ 0, 274, 0, 0,
+ 0, 0, 443, 0,
+ 0, 0, 0, 0,
+ 0, 284, 0, 0,
+ 0, 312, 0, 0,
+ 42, 123, 222, 0,
+ 179, 0, 0, 0,
+ 166, 151, 206, 309,
+ 0, 185, 0, 0,
94, 0, 0, 72,
- 0, 0, 272, 0,
+ 0, 0, 270, 0,
0, 129, 0, 0,
- 0, 0, 264, 417,
- 449, 469, 425, 233,
- 0, 216, 0, 0,
- 328, 0, 0, 444,
- 0, 478, 0, 378,
- 339, 21, 0, 0,
- 202, 389, 150, 278,
- 0, 362, 368, 83,
- 0, 360, 0, 136,
- 39, 0, 110, 243,
- 0, 0, 279, 0,
- 0, 95, 0, 415,
- 0, 0, 0, 0,
- 424, 0, 287, 0,
- 0, 0, 315, 0,
- 0, 291, 23, 0,
+ 0, 0, 262, 415,
+ 447, 467, 423, 231,
+ 0, 213, 0, 0,
+ 326, 0, 0, 442,
+ 0, 476, 0, 376,
+ 337, 21, 0, 0,
+ 199, 387, 150, 276,
+ 0, 360, 366, 83,
+ 0, 358, 0, 136,
+ 39, 0, 110, 241,
+ 0, 0, 277, 0,
+ 0, 95, 0, 413,
+ 0, 0, 0, 0,
+ 422, 0, 285, 0,
+ 0, 0, 313, 0,
+ 0, 289, 23, 0,
0, 44, 0, 0,
- 347, 420, 152, 127,
- 112, 54, 189, 0,
+ 345, 418, 152, 127,
+ 112, 54, 186, 0,
0, 3, 0, 0,
0, 0, 0, 103,
- 352, 0, 130, 0,
- 0, 0, 0, 0,
- 0, 390, 0, 426,
- 483, 0, 0, 0,
- 308, 472, 0, 0,
- 443, 0, 0, 0,
- 290, 338, 0, 0,
- 486, 203, 0, 382,
- 371, 0, 283, 407,
+ 350, 0, 130, 0,
+ 0, 0, 0, 0,
+ 0, 388, 0, 424,
+ 481, 0, 0, 0,
+ 306, 470, 0, 0,
+ 441, 0, 0, 0,
+ 288, 336, 0, 0,
+ 484, 200, 0, 380,
+ 369, 0, 281, 405,
84, 0, 0, 0,
- 141, 33, 325, 114,
- 198, 0, 0, 277,
- 0, 367, 96, 0,
- 0, 0, 0, 436,
- 0, 0, 0, 0,
- 0, 0, 0, 316,
- 266, 0, 29, 332,
- 0, 0, 412, 187,
- 50, 350, 167, 153,
- 177, 405, 0, 190,
+ 141, 33, 323, 114,
+ 195, 0, 0, 275,
+ 0, 365, 96, 0,
+ 0, 0, 0, 434,
+ 0, 0, 0, 0,
+ 0, 0, 0, 314,
+ 264, 0, 29, 330,
+ 0, 0, 410, 184,
+ 50, 348, 167, 153,
+ 174, 403, 0, 187,
30, 0, 2, 0,
- 0, 474, 0, 0,
- 340, 356, 208, 351,
- 0, 0, 0, 0,
- 0, 0, 428, 0,
- 0, 234, 0, 0,
- 0, 309, 473, 0,
- 0, 442, 0, 463,
- 333, 289, 178, 0,
- 0, 0, 73, 251,
- 154, 168, 0, 364,
- 370, 85, 0, 0,
- 91, 75, 35, 0,
- 111, 199, 69, 0,
- 280, 0, 0, 97,
- 0, 0, 0, 0,
- 0, 0, 410, 252,
- 363, 455, 0, 0,
- 317, 0, 0, 17,
- 0, 225, 465, 0,
- 46, 49, 348, 421,
- 381, 25, 0, 0,
- 191, 31, 0, 0,
- 0, 0, 475, 0,
- 12, 0, 358, 0,
- 357, 0, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 235, 0,
- 27, 0, 319, 0,
+ 0, 472, 0, 0,
+ 338, 354, 205, 349,
0, 0, 0, 0,
- 464, 79, 66, 180,
+ 0, 0, 426, 0,
+ 0, 232, 0, 0,
+ 0, 307, 471, 0,
+ 0, 440, 0, 461,
+ 331, 287, 175, 0,
+ 0, 0, 73, 249,
+ 154, 168, 0, 362,
+ 368, 85, 0, 0,
+ 91, 75, 35, 0,
+ 111, 196, 69, 0,
+ 278, 0, 0, 97,
+ 0, 0, 0, 0,
+ 0, 0, 408, 250,
+ 361, 453, 0, 0,
+ 315, 0, 0, 17,
+ 0, 223, 463, 0,
+ 46, 49, 346, 419,
+ 379, 25, 0, 0,
+ 188, 31, 0, 0,
+ 0, 0, 473, 0,
+ 12, 0, 356, 0,
+ 355, 0, 0, 0,
+ 0, 0, 0, 0,
+ 0, 0, 233, 0,
+ 27, 0, 317, 0,
+ 0, 0, 0, 0,
+ 462, 79, 66, 177,
0, 0, 0, 74,
- 434, 387, 373, 0,
- 0, 249, 86, 0,
- 0, 92, 485, 40,
+ 432, 385, 371, 0,
+ 0, 247, 86, 0,
+ 0, 92, 483, 40,
0, 113, 0, 70,
- 115, 275, 439, 419,
+ 115, 273, 437, 417,
98, 0, 0, 0,
- 0, 468, 0, 230,
- 253, 0, 456, 0,
- 318, 0, 201, 226,
- 4, 0, 133, 466,
- 413, 159, 52, 346,
- 422, 383, 19, 403,
- 361, 192, 0, 0,
- 0, 0, 411, 0,
- 0, 13, 0, 285,
- 0, 404, 0, 0,
+ 0, 466, 0, 228,
+ 251, 0, 454, 0,
+ 316, 0, 198, 224,
+ 4, 0, 133, 464,
+ 411, 159, 52, 344,
+ 420, 381, 19, 401,
+ 359, 189, 0, 0,
+ 0, 0, 409, 0,
+ 0, 13, 0, 283,
+ 0, 402, 0, 0,
0, 0, 55, 0,
- 0, 0, 0, 237,
- 0, 354, 0, 320,
+ 0, 0, 0, 235,
+ 0, 352, 0, 318,
0, 0, 0, 0,
161, 0, 76, 67,
- 179, 247, 0, 0,
- 61, 435, 144, 374,
+ 176, 245, 0, 0,
+ 61, 433, 144, 372,
0, 0, 0, 87,
119, 0, 93, 0,
34, 0, 109, 0,
0, 18, 0, 0,
0, 99, 0, 0,
- 0, 0, 0, 341,
- 231, 386, 0, 454,
- 0, 321, 0, 205,
+ 0, 0, 0, 339,
+ 229, 384, 0, 452,
+ 0, 319, 0, 202,
0, 1, 0, 134,
- 329, 0, 158, 51,
- 345, 162, 384, 366,
- 396, 0, 193, 0,
+ 327, 0, 158, 51,
+ 343, 162, 382, 364,
+ 394, 0, 190, 0,
0, 0, 0, 0,
120, 0, 14, 0,
7, 0, 0, 0,
0, 0, 0, 56,
0, 0, 0, 0,
- 236, 0, 355, 0,
+ 234, 0, 353, 0,
0, 0, 0, 0,
0, 0, 0, 22,
48, 24, 0, 0,
0, 62, 0, 145,
0, 0, 0, 0,
- 479, 306, 470, 0,
+ 477, 304, 468, 0,
0, 36, 0, 0,
88, 0, 117, 0,
0, 0, 100, 0,
- 0, 250, 0, 0,
- 0, 232, 0, 0,
- 365, 0, 322, 0,
- 206, 0, 9, 0,
- 135, 229, 0, 393,
- 0, 344, 57, 385,
- 0, 397, 0, 194,
- 467, 0, 0, 0,
+ 0, 248, 0, 0,
+ 0, 230, 0, 0,
+ 363, 0, 320, 0,
+ 203, 0, 9, 0,
+ 135, 227, 0, 391,
+ 0, 342, 57, 383,
+ 0, 395, 0, 191,
+ 465, 0, 0, 0,
0, 126, 0, 10,
- 0, 8, 184, 0,
+ 0, 8, 181, 0,
104, 0, 0, 0,
0, 0, 0, 0,
- 0, 238, 0, 0,
- 0, 402, 0, 0,
- 307, 0, 0, 0,
- 336, 263, 0, 248,
- 0, 0, 59, 406,
+ 0, 236, 0, 0,
+ 0, 400, 0, 0,
+ 305, 0, 0, 0,
+ 334, 261, 0, 246,
+ 0, 0, 59, 404,
146, 0, 0, 28,
- 292, 53, 118, 269,
+ 290, 53, 118, 267,
0, 0, 37, 0,
- 0, 298, 0, 302,
+ 0, 296, 0, 300,
0, 0, 0, 101,
0, 0, 0, 0,
0, 0, 0, 0,
- 218, 140, 0, 323,
- 0, 207, 437, 32,
- 0, 107, 295, 0,
- 394, 0, 349, 163,
- 155, 176, 401, 267,
- 195, 0, 219, 476,
- 15, 0, 45, 211,
- 11, 0, 16, 185,
- 0, 273, 451, 0,
- 0, 0, 0, 0,
- 0, 0, 484, 223,
- 0, 0, 0, 0,
- 391, 310, 0, 0,
- 0, 331, 282, 0,
- 376, 0, 0, 60,
- 64, 379, 0, 447,
- 26, 296, 487, 427,
- 268, 245, 0, 38,
- 262, 0, 90, 0,
- 299, 0, 0, 0,
+ 215, 140, 0, 321,
+ 0, 204, 435, 32,
+ 0, 107, 293, 0,
+ 392, 0, 347, 163,
+ 155, 173, 399, 265,
+ 192, 0, 216, 474,
+ 15, 0, 45, 208,
+ 11, 0, 16, 182,
+ 0, 271, 449, 0,
+ 0, 0, 0, 0,
+ 0, 0, 482, 220,
+ 0, 0, 0, 0,
+ 389, 308, 0, 0,
+ 0, 329, 280, 0,
+ 374, 0, 0, 60,
+ 64, 377, 0, 445,
+ 26, 294, 485, 425,
+ 266, 243, 0, 38,
+ 260, 0, 90, 0,
+ 297, 0, 0, 0,
102, 0, 0, 0,
0, 0, 0, 0,
- 0, 217, 0, 0,
- 324, 0, 433, 438,
- 258, 0, 0, 160,
- 482, 395, 0, 343,
- 58, 156, 197, 399,
- 284, 460, 0, 220,
- 0, 414, 0, 125,
- 0, 0, 423, 0,
- 305, 0, 105, 462,
- 0, 0, 0, 0,
- 0, 0, 0, 239,
- 224, 0, 0, 0,
- 0, 392, 63, 0,
- 0, 0, 121, 281,
- 0, 375, 0, 380,
+ 0, 214, 0, 0,
+ 322, 0, 431, 436,
+ 256, 0, 0, 160,
+ 480, 393, 0, 341,
+ 58, 156, 194, 397,
+ 282, 458, 0, 217,
+ 0, 412, 0, 125,
+ 0, 0, 421, 0,
+ 303, 0, 105, 460,
+ 0, 0, 0, 0,
+ 0, 0, 0, 237,
+ 221, 0, 0, 0,
+ 0, 390, 63, 0,
+ 0, 0, 121, 279,
+ 0, 373, 0, 378,
0, 65, 148, 0,
- 128, 353, 5, 0,
- 0, 68, 246, 0,
+ 128, 351, 5, 0,
+ 0, 68, 244, 0,
41, 0, 0, 89,
- 0, 300, 0, 0,
- 0, 0, 0, 0,
- 0, 0, 477, 0,
- 241, 0, 213, 372,
- 0, 77, 448, 196,
- 337, 259, 0, 0,
- 47, 221, 0, 0,
- 342, 452, 157, 210,
- 400, 212, 461, 0,
+ 0, 298, 0, 0,
+ 0, 0, 0, 0,
+ 0, 0, 475, 0,
+ 239, 0, 210, 370,
+ 0, 77, 446, 193,
+ 335, 257, 0, 0,
+ 47, 218, 0, 0,
+ 340, 450, 157, 207,
+ 398, 209, 459, 0,
};
static table_t *table_set[] = {
diff --git a/lib/libGL/generated/program/lex.yy.c b/lib/libGL/generated/program/lex.yy.c
index f2044f78a..a147ae31c 100644
--- a/lib/libGL/generated/program/lex.yy.c
+++ b/lib/libGL/generated/program/lex.yy.c
@@ -1009,8 +1009,8 @@ static yyconst flex_int16_t yy_chk[1368] =
#define yymore() yymore_used_but_not_detected
#define YY_MORE_ADJ 0
#define YY_RESTORE_YY_MORE_OFFSET
-#line 1 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
-#line 2 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 1 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 2 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
/*
* Copyright © 2009 Intel Corporation
*
@@ -1406,7 +1406,7 @@ YY_DECL
register int yy_act;
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-#line 170 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 170 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
#line 1413 "program/lex.yy.c"
@@ -1498,17 +1498,17 @@ do_action: /* This label is used only to access EOF actions. */
case 1:
YY_RULE_SETUP
-#line 172 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 172 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return ARBvp_10; }
YY_BREAK
case 2:
YY_RULE_SETUP
-#line 173 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 173 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return ARBfp_10; }
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 174 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 174 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{
yylval->integer = at_address;
return_token_or_IDENTIFIER(require_ARB_vp, ADDRESS);
@@ -1516,692 +1516,692 @@ YY_RULE_SETUP
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 178 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 178 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return ALIAS; }
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 179 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 179 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return ATTRIB; }
YY_BREAK
case 6:
YY_RULE_SETUP
-#line 180 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 180 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return END; }
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 181 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 181 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return OPTION; }
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 182 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 182 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return OUTPUT; }
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 183 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 183 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return PARAM; }
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 184 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 184 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ yylval->integer = at_temp; return TEMP; }
YY_BREAK
case 11:
YY_RULE_SETUP
-#line 186 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 186 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode( 1, VECTOR_OP, ABS, 3); }
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 187 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 187 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode( 1, BIN_OP, ADD, 3); }
YY_BREAK
case 13:
YY_RULE_SETUP
-#line 188 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 188 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode(require_ARB_vp, ARL, ARL, 3); }
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 190 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 190 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode(require_ARB_fp, TRI_OP, CMP, 3); }
YY_BREAK
case 15:
YY_RULE_SETUP
-#line 191 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 191 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode(require_ARB_fp, SCALAR_OP, COS, 3); }
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 193 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 193 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode(require_NV_fp, VECTOR_OP, DDX, 3); }
YY_BREAK
case 17:
YY_RULE_SETUP
-#line 194 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 194 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode(require_NV_fp, VECTOR_OP, DDY, 3); }
YY_BREAK
case 18:
YY_RULE_SETUP
-#line 195 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 195 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode( 1, BIN_OP, DP3, 3); }
YY_BREAK
case 19:
YY_RULE_SETUP
-#line 196 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 196 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode( 1, BIN_OP, DP4, 3); }
YY_BREAK
case 20:
YY_RULE_SETUP
-#line 197 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 197 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode( 1, BIN_OP, DPH, 3); }
YY_BREAK
case 21:
YY_RULE_SETUP
-#line 198 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 198 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode( 1, BIN_OP, DST, 3); }
YY_BREAK
case 22:
YY_RULE_SETUP
-#line 200 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 200 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode( 1, SCALAR_OP, EX2, 3); }
YY_BREAK
case 23:
YY_RULE_SETUP
-#line 201 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 201 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode(require_ARB_vp, SCALAR_OP, EXP, 3); }
YY_BREAK
case 24:
YY_RULE_SETUP
-#line 203 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 203 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode( 1, VECTOR_OP, FLR, 3); }
YY_BREAK
case 25:
YY_RULE_SETUP
-#line 204 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 204 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode( 1, VECTOR_OP, FRC, 3); }
YY_BREAK
case 26:
YY_RULE_SETUP
-#line 206 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 206 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode(require_ARB_fp, KIL, KIL, 3); }
YY_BREAK
case 27:
YY_RULE_SETUP
-#line 208 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 208 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode( 1, VECTOR_OP, LIT, 3); }
YY_BREAK
case 28:
YY_RULE_SETUP
-#line 209 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 209 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode( 1, SCALAR_OP, LG2, 3); }
YY_BREAK
case 29:
YY_RULE_SETUP
-#line 210 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 210 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode(require_ARB_vp, SCALAR_OP, LOG, 3); }
YY_BREAK
case 30:
YY_RULE_SETUP
-#line 211 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 211 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode(require_ARB_fp, TRI_OP, LRP, 3); }
YY_BREAK
case 31:
YY_RULE_SETUP
-#line 213 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 213 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode( 1, TRI_OP, MAD, 3); }
YY_BREAK
case 32:
YY_RULE_SETUP
-#line 214 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 214 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode( 1, BIN_OP, MAX, 3); }
YY_BREAK
case 33:
YY_RULE_SETUP
-#line 215 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 215 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode( 1, BIN_OP, MIN, 3); }
YY_BREAK
case 34:
YY_RULE_SETUP
-#line 216 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 216 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode( 1, VECTOR_OP, MOV, 3); }
YY_BREAK
case 35:
YY_RULE_SETUP
-#line 217 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 217 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode( 1, BIN_OP, MUL, 3); }
YY_BREAK
case 36:
YY_RULE_SETUP
-#line 219 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 219 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode(require_NV_fp, VECTOR_OP, PK2H, 4); }
YY_BREAK
case 37:
YY_RULE_SETUP
-#line 220 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 220 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode(require_NV_fp, VECTOR_OP, PK2US, 5); }
YY_BREAK
case 38:
YY_RULE_SETUP
-#line 221 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 221 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode(require_NV_fp, VECTOR_OP, PK4B, 4); }
YY_BREAK
case 39:
YY_RULE_SETUP
-#line 222 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 222 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode(require_NV_fp, VECTOR_OP, PK4UB, 5); }
YY_BREAK
case 40:
YY_RULE_SETUP
-#line 223 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 223 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode( 1, BINSC_OP, POW, 3); }
YY_BREAK
case 41:
YY_RULE_SETUP
-#line 225 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 225 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode( 1, SCALAR_OP, RCP, 3); }
YY_BREAK
case 42:
YY_RULE_SETUP
-#line 226 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 226 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode(require_NV_fp, BIN_OP, RFL, 3); }
YY_BREAK
case 43:
YY_RULE_SETUP
-#line 227 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 227 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode( 1, SCALAR_OP, RSQ, 3); }
YY_BREAK
case 44:
YY_RULE_SETUP
-#line 229 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 229 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode(require_ARB_fp, SCALAR_OP, SCS, 3); }
YY_BREAK
case 45:
YY_RULE_SETUP
-#line 230 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 230 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode(require_NV_fp, BIN_OP, SEQ, 3); }
YY_BREAK
case 46:
YY_RULE_SETUP
-#line 231 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 231 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode(require_NV_fp, BIN_OP, SFL, 3); }
YY_BREAK
case 47:
YY_RULE_SETUP
-#line 232 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 232 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode( 1, BIN_OP, SGE, 3); }
YY_BREAK
case 48:
YY_RULE_SETUP
-#line 233 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 233 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode(require_NV_fp, BIN_OP, SGT, 3); }
YY_BREAK
case 49:
YY_RULE_SETUP
-#line 234 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 234 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode(require_ARB_fp, SCALAR_OP, SIN, 3); }
YY_BREAK
case 50:
YY_RULE_SETUP
-#line 235 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 235 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode(require_NV_fp, BIN_OP, SLE, 3); }
YY_BREAK
case 51:
YY_RULE_SETUP
-#line 236 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 236 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode( 1, BIN_OP, SLT, 3); }
YY_BREAK
case 52:
YY_RULE_SETUP
-#line 237 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 237 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode(require_NV_fp, BIN_OP, SNE, 3); }
YY_BREAK
case 53:
YY_RULE_SETUP
-#line 238 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 238 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode(require_NV_fp, BIN_OP, STR, 3); }
YY_BREAK
case 54:
YY_RULE_SETUP
-#line 239 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 239 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode( 1, BIN_OP, SUB, 3); }
YY_BREAK
case 55:
YY_RULE_SETUP
-#line 240 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 240 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode( 1, SWZ, SWZ, 3); }
YY_BREAK
case 56:
YY_RULE_SETUP
-#line 242 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 242 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode(require_ARB_fp, SAMPLE_OP, TEX, 3); }
YY_BREAK
case 57:
YY_RULE_SETUP
-#line 243 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 243 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode(require_ARB_fp, SAMPLE_OP, TXB, 3); }
YY_BREAK
case 58:
YY_RULE_SETUP
-#line 244 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 244 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode(require_NV_fp, TXD_OP, TXD, 3); }
YY_BREAK
case 59:
YY_RULE_SETUP
-#line 245 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 245 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode(require_ARB_fp, SAMPLE_OP, TXP, 3); }
YY_BREAK
case 60:
YY_RULE_SETUP
-#line 247 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 247 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode(require_NV_fp, SCALAR_OP, UP2H, 4); }
YY_BREAK
case 61:
YY_RULE_SETUP
-#line 248 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 248 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode(require_NV_fp, SCALAR_OP, UP2US, 5); }
YY_BREAK
case 62:
YY_RULE_SETUP
-#line 249 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 249 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode(require_NV_fp, SCALAR_OP, UP4B, 4); }
YY_BREAK
case 63:
YY_RULE_SETUP
-#line 250 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 250 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode(require_NV_fp, SCALAR_OP, UP4UB, 5); }
YY_BREAK
case 64:
YY_RULE_SETUP
-#line 252 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 252 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode(require_NV_fp, TRI_OP, X2D, 3); }
YY_BREAK
case 65:
YY_RULE_SETUP
-#line 253 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 253 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_opcode( 1, BIN_OP, XPD, 3); }
YY_BREAK
case 66:
YY_RULE_SETUP
-#line 255 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 255 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_token_or_IDENTIFIER(require_ARB_vp, VERTEX); }
YY_BREAK
case 67:
YY_RULE_SETUP
-#line 256 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 256 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_token_or_IDENTIFIER(require_ARB_fp, FRAGMENT); }
YY_BREAK
case 68:
YY_RULE_SETUP
-#line 257 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 257 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return PROGRAM; }
YY_BREAK
case 69:
YY_RULE_SETUP
-#line 258 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 258 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return STATE; }
YY_BREAK
case 70:
YY_RULE_SETUP
-#line 259 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 259 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return RESULT; }
YY_BREAK
case 71:
YY_RULE_SETUP
-#line 261 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 261 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return AMBIENT; }
YY_BREAK
case 72:
YY_RULE_SETUP
-#line 262 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 262 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return ATTENUATION; }
YY_BREAK
case 73:
YY_RULE_SETUP
-#line 263 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 263 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return BACK; }
YY_BREAK
case 74:
YY_RULE_SETUP
-#line 264 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 264 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_token_or_DOT(require_ARB_vp, CLIP); }
YY_BREAK
case 75:
YY_RULE_SETUP
-#line 265 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 265 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return COLOR; }
YY_BREAK
case 76:
YY_RULE_SETUP
-#line 266 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 266 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_token_or_DOT(require_ARB_fp, DEPTH); }
YY_BREAK
case 77:
YY_RULE_SETUP
-#line 267 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 267 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return DIFFUSE; }
YY_BREAK
case 78:
YY_RULE_SETUP
-#line 268 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 268 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return DIRECTION; }
YY_BREAK
case 79:
YY_RULE_SETUP
-#line 269 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 269 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return EMISSION; }
YY_BREAK
case 80:
YY_RULE_SETUP
-#line 270 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 270 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return ENV; }
YY_BREAK
case 81:
YY_RULE_SETUP
-#line 271 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 271 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return EYE; }
YY_BREAK
case 82:
YY_RULE_SETUP
-#line 272 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 272 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return FOGCOORD; }
YY_BREAK
case 83:
YY_RULE_SETUP
-#line 273 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 273 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return FOG; }
YY_BREAK
case 84:
YY_RULE_SETUP
-#line 274 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 274 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return FRONT; }
YY_BREAK
case 85:
YY_RULE_SETUP
-#line 275 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 275 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return HALF; }
YY_BREAK
case 86:
YY_RULE_SETUP
-#line 276 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 276 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return INVERSE; }
YY_BREAK
case 87:
YY_RULE_SETUP
-#line 277 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 277 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return INVTRANS; }
YY_BREAK
case 88:
YY_RULE_SETUP
-#line 278 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 278 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return LIGHT; }
YY_BREAK
case 89:
YY_RULE_SETUP
-#line 279 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 279 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return LIGHTMODEL; }
YY_BREAK
case 90:
YY_RULE_SETUP
-#line 280 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 280 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return LIGHTPROD; }
YY_BREAK
case 91:
YY_RULE_SETUP
-#line 281 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 281 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return LOCAL; }
YY_BREAK
case 92:
YY_RULE_SETUP
-#line 282 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 282 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return MATERIAL; }
YY_BREAK
case 93:
YY_RULE_SETUP
-#line 283 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 283 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return MAT_PROGRAM; }
YY_BREAK
case 94:
YY_RULE_SETUP
-#line 284 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 284 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return MATRIX; }
YY_BREAK
case 95:
YY_RULE_SETUP
-#line 285 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 285 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_token_or_DOT(require_ARB_vp, MATRIXINDEX); }
YY_BREAK
case 96:
YY_RULE_SETUP
-#line 286 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 286 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return MODELVIEW; }
YY_BREAK
case 97:
YY_RULE_SETUP
-#line 287 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 287 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return MVP; }
YY_BREAK
case 98:
YY_RULE_SETUP
-#line 288 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 288 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_token_or_DOT(require_ARB_vp, NORMAL); }
YY_BREAK
case 99:
YY_RULE_SETUP
-#line 289 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 289 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return OBJECT; }
YY_BREAK
case 100:
YY_RULE_SETUP
-#line 290 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 290 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return PALETTE; }
YY_BREAK
case 101:
YY_RULE_SETUP
-#line 291 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 291 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return PARAMS; }
YY_BREAK
case 102:
YY_RULE_SETUP
-#line 292 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 292 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return PLANE; }
YY_BREAK
case 103:
YY_RULE_SETUP
-#line 293 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 293 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_token_or_DOT(require_ARB_vp, POINT_TOK); }
YY_BREAK
case 104:
YY_RULE_SETUP
-#line 294 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 294 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_token_or_DOT(require_ARB_vp, POINTSIZE); }
YY_BREAK
case 105:
YY_RULE_SETUP
-#line 295 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 295 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return POSITION; }
YY_BREAK
case 106:
YY_RULE_SETUP
-#line 296 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 296 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return PRIMARY; }
YY_BREAK
case 107:
YY_RULE_SETUP
-#line 297 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 297 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return PROJECTION; }
YY_BREAK
case 108:
YY_RULE_SETUP
-#line 298 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 298 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_token_or_DOT(require_ARB_fp, RANGE); }
YY_BREAK
case 109:
YY_RULE_SETUP
-#line 299 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 299 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return ROW; }
YY_BREAK
case 110:
YY_RULE_SETUP
-#line 300 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 300 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return SCENECOLOR; }
YY_BREAK
case 111:
YY_RULE_SETUP
-#line 301 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 301 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return SECONDARY; }
YY_BREAK
case 112:
YY_RULE_SETUP
-#line 302 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 302 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return SHININESS; }
YY_BREAK
case 113:
YY_RULE_SETUP
-#line 303 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 303 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_token_or_DOT(require_ARB_vp, SIZE_TOK); }
YY_BREAK
case 114:
YY_RULE_SETUP
-#line 304 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 304 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return SPECULAR; }
YY_BREAK
case 115:
YY_RULE_SETUP
-#line 305 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 305 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return SPOT; }
YY_BREAK
case 116:
YY_RULE_SETUP
-#line 306 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 306 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return TEXCOORD; }
YY_BREAK
case 117:
YY_RULE_SETUP
-#line 307 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 307 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_token_or_DOT(require_ARB_fp, TEXENV); }
YY_BREAK
case 118:
YY_RULE_SETUP
-#line 308 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 308 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_token_or_DOT(require_ARB_vp, TEXGEN); }
YY_BREAK
case 119:
YY_RULE_SETUP
-#line 309 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 309 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_token_or_DOT(require_ARB_vp, TEXGEN_Q); }
YY_BREAK
case 120:
YY_RULE_SETUP
-#line 310 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 310 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_token_or_DOT(require_ARB_vp, TEXGEN_S); }
YY_BREAK
case 121:
YY_RULE_SETUP
-#line 311 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 311 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_token_or_DOT(require_ARB_vp, TEXGEN_T); }
YY_BREAK
case 122:
YY_RULE_SETUP
-#line 312 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 312 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return TEXTURE; }
YY_BREAK
case 123:
YY_RULE_SETUP
-#line 313 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 313 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return TRANSPOSE; }
YY_BREAK
case 124:
YY_RULE_SETUP
-#line 314 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 314 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_token_or_DOT(require_ARB_vp, VTXATTRIB); }
YY_BREAK
case 125:
YY_RULE_SETUP
-#line 315 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 315 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_token_or_DOT(require_ARB_vp, WEIGHT); }
YY_BREAK
case 126:
YY_RULE_SETUP
-#line 317 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 317 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_token_or_IDENTIFIER(require_ARB_fp, TEXTURE_UNIT); }
YY_BREAK
case 127:
YY_RULE_SETUP
-#line 318 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 318 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_token_or_IDENTIFIER(require_ARB_fp, TEX_1D); }
YY_BREAK
case 128:
YY_RULE_SETUP
-#line 319 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 319 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_token_or_IDENTIFIER(require_ARB_fp, TEX_2D); }
YY_BREAK
case 129:
YY_RULE_SETUP
-#line 320 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 320 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_token_or_IDENTIFIER(require_ARB_fp, TEX_3D); }
YY_BREAK
case 130:
YY_RULE_SETUP
-#line 321 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 321 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_token_or_IDENTIFIER(require_ARB_fp, TEX_CUBE); }
YY_BREAK
case 131:
YY_RULE_SETUP
-#line 322 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 322 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_token_or_IDENTIFIER(require_ARB_fp && require_rect, TEX_RECT); }
YY_BREAK
case 132:
YY_RULE_SETUP
-#line 323 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 323 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow, TEX_SHADOW1D); }
YY_BREAK
case 133:
YY_RULE_SETUP
-#line 324 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 324 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow, TEX_SHADOW2D); }
YY_BREAK
case 134:
YY_RULE_SETUP
-#line 325 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 325 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow && require_rect, TEX_SHADOWRECT); }
YY_BREAK
case 135:
YY_RULE_SETUP
-#line 326 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 326 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_token_or_IDENTIFIER(require_ARB_fp && require_texarray, TEX_ARRAY1D); }
YY_BREAK
case 136:
YY_RULE_SETUP
-#line 327 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 327 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_token_or_IDENTIFIER(require_ARB_fp && require_texarray, TEX_ARRAY2D); }
YY_BREAK
case 137:
YY_RULE_SETUP
-#line 328 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 328 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow && require_texarray, TEX_ARRAYSHADOW1D); }
YY_BREAK
case 138:
YY_RULE_SETUP
-#line 329 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 329 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return_token_or_IDENTIFIER(require_ARB_fp && require_shadow && require_texarray, TEX_ARRAYSHADOW2D); }
YY_BREAK
case 139:
YY_RULE_SETUP
-#line 331 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 331 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return handle_ident(yyextra, yytext, yylval); }
YY_BREAK
case 140:
YY_RULE_SETUP
-#line 333 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 333 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return DOT_DOT; }
YY_BREAK
case 141:
YY_RULE_SETUP
-#line 335 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 335 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{
yylval->integer = strtol(yytext, NULL, 10);
return INTEGER;
@@ -2209,7 +2209,7 @@ YY_RULE_SETUP
YY_BREAK
case 142:
YY_RULE_SETUP
-#line 339 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 339 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{
yylval->real = _mesa_strtof(yytext, NULL);
return REAL;
@@ -2221,7 +2221,7 @@ case 143:
yyg->yy_c_buf_p = yy_cp -= 1;
YY_DO_BEFORE_ACTION; /* set up yytext again */
YY_RULE_SETUP
-#line 343 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 343 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{
yylval->real = _mesa_strtof(yytext, NULL);
return REAL;
@@ -2229,7 +2229,7 @@ YY_RULE_SETUP
YY_BREAK
case 144:
YY_RULE_SETUP
-#line 347 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 347 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{
yylval->real = _mesa_strtof(yytext, NULL);
return REAL;
@@ -2237,7 +2237,7 @@ YY_RULE_SETUP
YY_BREAK
case 145:
YY_RULE_SETUP
-#line 351 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 351 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{
yylval->real = _mesa_strtof(yytext, NULL);
return REAL;
@@ -2245,7 +2245,7 @@ YY_RULE_SETUP
YY_BREAK
case 146:
YY_RULE_SETUP
-#line 356 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 356 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_NOOP;
yylval->swiz_mask.mask = WRITEMASK_XYZW;
@@ -2254,7 +2254,7 @@ YY_RULE_SETUP
YY_BREAK
case 147:
YY_RULE_SETUP
-#line 362 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 362 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
yylval->swiz_mask.mask = WRITEMASK_XY
@@ -2264,7 +2264,7 @@ YY_RULE_SETUP
YY_BREAK
case 148:
YY_RULE_SETUP
-#line 368 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 368 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
yylval->swiz_mask.mask = WRITEMASK_XZW;
@@ -2273,7 +2273,7 @@ YY_RULE_SETUP
YY_BREAK
case 149:
YY_RULE_SETUP
-#line 373 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 373 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
yylval->swiz_mask.mask = WRITEMASK_YZW;
@@ -2282,7 +2282,7 @@ YY_RULE_SETUP
YY_BREAK
case 150:
YY_RULE_SETUP
-#line 379 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 379 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
yylval->swiz_mask.mask = WRITEMASK_X
@@ -2292,7 +2292,7 @@ YY_RULE_SETUP
YY_BREAK
case 151:
YY_RULE_SETUP
-#line 385 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 385 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
yylval->swiz_mask.mask = WRITEMASK_Y
@@ -2302,7 +2302,7 @@ YY_RULE_SETUP
YY_BREAK
case 152:
YY_RULE_SETUP
-#line 391 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 391 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
yylval->swiz_mask.mask = WRITEMASK_ZW;
@@ -2311,7 +2311,7 @@ YY_RULE_SETUP
YY_BREAK
case 153:
YY_RULE_SETUP
-#line 397 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 397 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{
const unsigned s = swiz_from_char(yytext[1]);
yylval->swiz_mask.swizzle = MAKE_SWIZZLE4(s, s, s, s);
@@ -2321,7 +2321,7 @@ YY_RULE_SETUP
YY_BREAK
case 154:
YY_RULE_SETUP
-#line 404 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 404 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{
yylval->swiz_mask.swizzle = MAKE_SWIZZLE4(swiz_from_char(yytext[1]),
swiz_from_char(yytext[2]),
@@ -2333,7 +2333,7 @@ YY_RULE_SETUP
YY_BREAK
case 155:
YY_RULE_SETUP
-#line 413 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 413 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_NOOP;
yylval->swiz_mask.mask = WRITEMASK_XYZW;
@@ -2342,7 +2342,7 @@ YY_RULE_SETUP
YY_BREAK
case 156:
YY_RULE_SETUP
-#line 419 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 419 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
yylval->swiz_mask.mask = WRITEMASK_XY
@@ -2352,7 +2352,7 @@ YY_RULE_SETUP
YY_BREAK
case 157:
YY_RULE_SETUP
-#line 425 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 425 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
yylval->swiz_mask.mask = WRITEMASK_XZW;
@@ -2361,7 +2361,7 @@ YY_RULE_SETUP
YY_BREAK
case 158:
YY_RULE_SETUP
-#line 430 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 430 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
yylval->swiz_mask.mask = WRITEMASK_YZW;
@@ -2370,7 +2370,7 @@ YY_RULE_SETUP
YY_BREAK
case 159:
YY_RULE_SETUP
-#line 436 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 436 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
yylval->swiz_mask.mask = WRITEMASK_X
@@ -2380,7 +2380,7 @@ YY_RULE_SETUP
YY_BREAK
case 160:
YY_RULE_SETUP
-#line 442 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 442 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
yylval->swiz_mask.mask = WRITEMASK_Y
@@ -2390,7 +2390,7 @@ YY_RULE_SETUP
YY_BREAK
case 161:
YY_RULE_SETUP
-#line 448 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 448 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{
yylval->swiz_mask.swizzle = SWIZZLE_INVAL;
yylval->swiz_mask.mask = WRITEMASK_ZW;
@@ -2399,7 +2399,7 @@ YY_RULE_SETUP
YY_BREAK
case 162:
YY_RULE_SETUP
-#line 454 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 454 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{
const unsigned s = swiz_from_char(yytext[1]);
yylval->swiz_mask.swizzle = MAKE_SWIZZLE4(s, s, s, s);
@@ -2409,7 +2409,7 @@ YY_RULE_SETUP
YY_BREAK
case 163:
YY_RULE_SETUP
-#line 462 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 462 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{
if (require_ARB_vp) {
return TEXGEN_R;
@@ -2423,7 +2423,7 @@ YY_RULE_SETUP
YY_BREAK
case 164:
YY_RULE_SETUP
-#line 473 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 473 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{
yylval->swiz_mask.swizzle = MAKE_SWIZZLE4(swiz_from_char(yytext[1]),
swiz_from_char(yytext[2]),
@@ -2435,13 +2435,13 @@ YY_RULE_SETUP
YY_BREAK
case 165:
YY_RULE_SETUP
-#line 482 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 482 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return DOT; }
YY_BREAK
case 166:
/* rule 166 can match eol */
YY_RULE_SETUP
-#line 484 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 484 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{
yylloc->first_line++;
yylloc->first_column = 1;
@@ -2452,7 +2452,7 @@ YY_RULE_SETUP
YY_BREAK
case 167:
YY_RULE_SETUP
-#line 491 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 491 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
/* eat whitespace */ ;
YY_BREAK
case 168:
@@ -2460,17 +2460,17 @@ case 168:
yyg->yy_c_buf_p = yy_cp -= 1;
YY_DO_BEFORE_ACTION; /* set up yytext again */
YY_RULE_SETUP
-#line 492 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 492 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
/* eat comments */ ;
YY_BREAK
case 169:
YY_RULE_SETUP
-#line 493 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 493 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
{ return yytext[0]; }
YY_BREAK
case 170:
YY_RULE_SETUP
-#line 494 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 494 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
ECHO;
YY_BREAK
#line 2477 "program/lex.yy.c"
@@ -3648,7 +3648,7 @@ void _mesa_program_lexer_free (void * ptr , yyscan_t yyscanner)
#define YYTABLES_NAME "yytables"
-#line 494 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
+#line 494 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_lexer.l"
diff --git a/lib/libGL/generated/program/program_parse.tab.c b/lib/libGL/generated/program/program_parse.tab.c
index f3ab1822f..6a1049b76 100644
--- a/lib/libGL/generated/program/program_parse.tab.c
+++ b/lib/libGL/generated/program/program_parse.tab.c
@@ -292,7 +292,7 @@
/* Copy the first part of user declarations. */
-#line 1 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
/*
* Copyright © 2009 Intel Corporation
@@ -430,7 +430,7 @@ static struct asm_instruction *asm_instruction_copy_ctor(
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
-#line 124 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 124 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
struct asm_instruction *inst;
struct asm_symbol *sym;
@@ -479,7 +479,7 @@ typedef struct YYLTYPE
/* Copy the second part of user declarations. */
-#line 269 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 269 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
extern int
_mesa_program_lexer_lex(YYSTYPE *yylval_param, YYLTYPE *yylloc_param,
@@ -2224,7 +2224,7 @@ yyreduce:
switch (yyn)
{
case 3:
-#line 288 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 288 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
if (state->prog->Target != GL_VERTEX_PROGRAM_ARB) {
yyerror(& (yylsp[(1) - (1)]), state, "invalid fragment program header");
@@ -2235,7 +2235,7 @@ yyreduce:
break;
case 4:
-#line 296 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 296 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
if (state->prog->Target != GL_FRAGMENT_PROGRAM_ARB) {
yyerror(& (yylsp[(1) - (1)]), state, "invalid vertex program header");
@@ -2248,7 +2248,7 @@ yyreduce:
break;
case 7:
-#line 312 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 312 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
int valid = 0;
@@ -2273,7 +2273,7 @@ yyreduce:
break;
case 10:
-#line 340 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 340 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
if ((yyvsp[(1) - (2)].inst) != NULL) {
if (state->inst_tail == NULL) {
@@ -2291,7 +2291,7 @@ yyreduce:
break;
case 12:
-#line 358 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 358 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.inst) = (yyvsp[(1) - (1)].inst);
state->prog->NumAluInstructions++;
@@ -2299,7 +2299,7 @@ yyreduce:
break;
case 13:
-#line 363 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 363 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.inst) = (yyvsp[(1) - (1)].inst);
state->prog->NumTexInstructions++;
@@ -2307,14 +2307,14 @@ yyreduce:
break;
case 24:
-#line 384 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 384 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.inst) = asm_instruction_ctor(OPCODE_ARL, & (yyvsp[(2) - (4)].dst_reg), & (yyvsp[(4) - (4)].src_reg), NULL, NULL);
;}
break;
case 25:
-#line 390 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 390 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
if ((yyvsp[(1) - (4)].temp_inst).Opcode == OPCODE_DDY)
state->fragment.UsesDFdy = 1;
@@ -2323,35 +2323,35 @@ yyreduce:
break;
case 26:
-#line 398 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 398 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (4)].temp_inst), & (yyvsp[(2) - (4)].dst_reg), & (yyvsp[(4) - (4)].src_reg), NULL, NULL);
;}
break;
case 27:
-#line 404 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 404 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (6)].temp_inst), & (yyvsp[(2) - (6)].dst_reg), & (yyvsp[(4) - (6)].src_reg), & (yyvsp[(6) - (6)].src_reg), NULL);
;}
break;
case 28:
-#line 411 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 411 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (6)].temp_inst), & (yyvsp[(2) - (6)].dst_reg), & (yyvsp[(4) - (6)].src_reg), & (yyvsp[(6) - (6)].src_reg), NULL);
;}
break;
case 29:
-#line 418 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 418 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (8)].temp_inst), & (yyvsp[(2) - (8)].dst_reg), & (yyvsp[(4) - (8)].src_reg), & (yyvsp[(6) - (8)].src_reg), & (yyvsp[(8) - (8)].src_reg));
;}
break;
case 30:
-#line 424 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 424 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (8)].temp_inst), & (yyvsp[(2) - (8)].dst_reg), & (yyvsp[(4) - (8)].src_reg), NULL, NULL);
if ((yyval.inst) != NULL) {
@@ -2396,7 +2396,7 @@ yyreduce:
break;
case 31:
-#line 468 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 468 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.inst) = asm_instruction_ctor(OPCODE_KIL, NULL, & (yyvsp[(2) - (2)].src_reg), NULL, NULL);
state->fragment.UsesKill = 1;
@@ -2404,7 +2404,7 @@ yyreduce:
break;
case 32:
-#line 473 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 473 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.inst) = asm_instruction_ctor(OPCODE_KIL_NV, NULL, NULL, NULL, NULL);
(yyval.inst)->Base.DstReg.CondMask = (yyvsp[(2) - (2)].dst_reg).CondMask;
@@ -2414,7 +2414,7 @@ yyreduce:
break;
case 33:
-#line 482 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 482 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.inst) = asm_instruction_copy_ctor(& (yyvsp[(1) - (12)].temp_inst), & (yyvsp[(2) - (12)].dst_reg), & (yyvsp[(4) - (12)].src_reg), & (yyvsp[(6) - (12)].src_reg), & (yyvsp[(8) - (12)].src_reg));
if ((yyval.inst) != NULL) {
@@ -2459,74 +2459,74 @@ yyreduce:
break;
case 34:
-#line 526 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 526 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.integer) = (yyvsp[(2) - (2)].integer);
;}
break;
case 35:
-#line 531 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 531 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ (yyval.integer) = TEXTURE_1D_INDEX; ;}
break;
case 36:
-#line 532 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 532 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ (yyval.integer) = TEXTURE_2D_INDEX; ;}
break;
case 37:
-#line 533 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 533 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ (yyval.integer) = TEXTURE_3D_INDEX; ;}
break;
case 38:
-#line 534 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 534 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ (yyval.integer) = TEXTURE_CUBE_INDEX; ;}
break;
case 39:
-#line 535 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 535 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ (yyval.integer) = TEXTURE_RECT_INDEX; ;}
break;
case 40:
-#line 536 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 536 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ (yyval.integer) = -TEXTURE_1D_INDEX; ;}
break;
case 41:
-#line 537 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 537 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ (yyval.integer) = -TEXTURE_2D_INDEX; ;}
break;
case 42:
-#line 538 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 538 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ (yyval.integer) = -TEXTURE_RECT_INDEX; ;}
break;
case 43:
-#line 539 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 539 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ (yyval.integer) = TEXTURE_1D_ARRAY_INDEX; ;}
break;
case 44:
-#line 540 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 540 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ (yyval.integer) = TEXTURE_2D_ARRAY_INDEX; ;}
break;
case 45:
-#line 541 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 541 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ (yyval.integer) = -TEXTURE_1D_ARRAY_INDEX; ;}
break;
case 46:
-#line 542 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 542 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ (yyval.integer) = -TEXTURE_2D_ARRAY_INDEX; ;}
break;
case 47:
-#line 546 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 546 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
/* FIXME: Is this correct? Should the extenedSwizzle be applied
* FIXME: to the existing swizzle?
@@ -2539,7 +2539,7 @@ yyreduce:
break;
case 48:
-#line 558 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 558 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.src_reg) = (yyvsp[(2) - (2)].src_reg);
@@ -2550,7 +2550,7 @@ yyreduce:
break;
case 49:
-#line 566 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 566 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.src_reg) = (yyvsp[(3) - (4)].src_reg);
@@ -2568,7 +2568,7 @@ yyreduce:
break;
case 50:
-#line 583 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 583 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.src_reg) = (yyvsp[(1) - (2)].src_reg);
@@ -2578,7 +2578,7 @@ yyreduce:
break;
case 51:
-#line 590 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 590 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
struct asm_symbol temp_sym;
@@ -2598,7 +2598,7 @@ yyreduce:
break;
case 52:
-#line 609 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 609 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.src_reg) = (yyvsp[(2) - (3)].src_reg);
@@ -2612,7 +2612,7 @@ yyreduce:
break;
case 53:
-#line 620 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 620 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.src_reg) = (yyvsp[(3) - (5)].src_reg);
@@ -2632,7 +2632,7 @@ yyreduce:
break;
case 54:
-#line 640 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 640 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.dst_reg) = (yyvsp[(1) - (3)].dst_reg);
(yyval.dst_reg).WriteMask = (yyvsp[(2) - (3)].swiz_mask).mask;
@@ -2657,7 +2657,7 @@ yyreduce:
break;
case 55:
-#line 664 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 664 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
set_dst_reg(& (yyval.dst_reg), PROGRAM_ADDRESS, 0);
(yyval.dst_reg).WriteMask = (yyvsp[(2) - (2)].swiz_mask).mask;
@@ -2665,7 +2665,7 @@ yyreduce:
break;
case 56:
-#line 671 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 671 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
const unsigned xyzw_valid =
((yyvsp[(1) - (7)].ext_swizzle).xyzw_valid << 0)
@@ -2699,7 +2699,7 @@ yyreduce:
break;
case 57:
-#line 704 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 704 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.ext_swizzle) = (yyvsp[(2) - (2)].ext_swizzle);
(yyval.ext_swizzle).negate = ((yyvsp[(1) - (2)].negate)) ? 1 : 0;
@@ -2707,7 +2707,7 @@ yyreduce:
break;
case 58:
-#line 711 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 711 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
if (((yyvsp[(1) - (1)].integer) != 0) && ((yyvsp[(1) - (1)].integer) != 1)) {
yyerror(& (yylsp[(1) - (1)]), state, "invalid extended swizzle selector");
@@ -2726,7 +2726,7 @@ yyreduce:
break;
case 59:
-#line 727 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 727 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
char s;
@@ -2786,7 +2786,7 @@ yyreduce:
break;
case 60:
-#line 786 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 786 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
struct asm_symbol *const s = (struct asm_symbol *)
_mesa_symbol_table_find_symbol(state->st, 0, (yyvsp[(1) - (1)].string));
@@ -2832,7 +2832,7 @@ yyreduce:
break;
case 61:
-#line 829 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 829 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
set_src_reg(& (yyval.src_reg), PROGRAM_INPUT, (yyvsp[(1) - (1)].attrib));
state->prog->InputsRead |= BITFIELD64_BIT((yyval.src_reg).Base.Index);
@@ -2844,7 +2844,7 @@ yyreduce:
break;
case 62:
-#line 838 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 838 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
if (! (yyvsp[(3) - (4)].src_reg).Base.RelAddr
&& ((unsigned) (yyvsp[(3) - (4)].src_reg).Base.Index >= (yyvsp[(1) - (4)].sym)->param_binding_length)) {
@@ -2869,7 +2869,7 @@ yyreduce:
break;
case 63:
-#line 860 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 860 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
gl_register_file file = ((yyvsp[(1) - (1)].temp_sym).name != NULL)
? (yyvsp[(1) - (1)].temp_sym).param_binding_type
@@ -2880,14 +2880,14 @@ yyreduce:
break;
case 64:
-#line 870 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 870 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
set_dst_reg(& (yyval.dst_reg), PROGRAM_OUTPUT, (yyvsp[(1) - (1)].result));
;}
break;
case 65:
-#line 874 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 874 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
struct asm_symbol *const s = (struct asm_symbol *)
_mesa_symbol_table_find_symbol(state->st, 0, (yyvsp[(1) - (1)].string));
@@ -2917,7 +2917,7 @@ yyreduce:
break;
case 66:
-#line 903 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 903 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
struct asm_symbol *const s = (struct asm_symbol *)
_mesa_symbol_table_find_symbol(state->st, 0, (yyvsp[(1) - (1)].string));
@@ -2937,7 +2937,7 @@ yyreduce:
break;
case 69:
-#line 924 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 924 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
init_src_reg(& (yyval.src_reg));
(yyval.src_reg).Base.Index = (yyvsp[(1) - (1)].integer);
@@ -2945,7 +2945,7 @@ yyreduce:
break;
case 70:
-#line 931 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 931 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
/* FINISHME: Add support for multiple address registers.
*/
@@ -2958,22 +2958,22 @@ yyreduce:
break;
case 71:
-#line 942 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 942 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ (yyval.integer) = 0; ;}
break;
case 72:
-#line 943 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 943 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ (yyval.integer) = (yyvsp[(2) - (2)].integer); ;}
break;
case 73:
-#line 944 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 944 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ (yyval.integer) = -(yyvsp[(2) - (2)].integer); ;}
break;
case 74:
-#line 948 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 948 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
if (((yyvsp[(1) - (1)].integer) < 0) || ((yyvsp[(1) - (1)].integer) > (state->limits->MaxAddressOffset - 1))) {
char s[100];
@@ -2988,7 +2988,7 @@ yyreduce:
break;
case 75:
-#line 962 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 962 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
if (((yyvsp[(1) - (1)].integer) < 0) || ((yyvsp[(1) - (1)].integer) > state->limits->MaxAddressOffset)) {
char s[100];
@@ -3003,7 +3003,7 @@ yyreduce:
break;
case 76:
-#line 976 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 976 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
struct asm_symbol *const s = (struct asm_symbol *)
_mesa_symbol_table_find_symbol(state->st, 0, (yyvsp[(1) - (1)].string));
@@ -3024,7 +3024,7 @@ yyreduce:
break;
case 77:
-#line 996 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 996 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
if ((yyvsp[(1) - (1)].swiz_mask).mask != WRITEMASK_X) {
yyerror(& (yylsp[(1) - (1)]), state, "invalid address component selector");
@@ -3036,7 +3036,7 @@ yyreduce:
break;
case 78:
-#line 1007 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1007 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
if ((yyvsp[(1) - (1)].swiz_mask).mask != WRITEMASK_X) {
yyerror(& (yylsp[(1) - (1)]), state,
@@ -3049,31 +3049,31 @@ yyreduce:
break;
case 83:
-#line 1023 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1023 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ (yyval.swiz_mask).swizzle = SWIZZLE_NOOP; (yyval.swiz_mask).mask = WRITEMASK_XYZW; ;}
break;
case 88:
-#line 1027 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1027 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ (yyval.swiz_mask).swizzle = SWIZZLE_NOOP; (yyval.swiz_mask).mask = WRITEMASK_XYZW; ;}
break;
case 89:
-#line 1031 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1031 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.dst_reg) = (yyvsp[(2) - (3)].dst_reg);
;}
break;
case 90:
-#line 1035 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1035 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.dst_reg) = (yyvsp[(2) - (3)].dst_reg);
;}
break;
case 91:
-#line 1039 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1039 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.dst_reg).CondMask = COND_TR;
(yyval.dst_reg).CondSwizzle = SWIZZLE_NOOP;
@@ -3081,7 +3081,7 @@ yyreduce:
break;
case 92:
-#line 1046 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1046 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.dst_reg) = (yyvsp[(1) - (2)].dst_reg);
(yyval.dst_reg).CondSwizzle = (yyvsp[(2) - (2)].swiz_mask).swizzle;
@@ -3089,7 +3089,7 @@ yyreduce:
break;
case 93:
-#line 1053 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1053 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.dst_reg) = (yyvsp[(1) - (2)].dst_reg);
(yyval.dst_reg).CondSwizzle = (yyvsp[(2) - (2)].swiz_mask).swizzle;
@@ -3097,7 +3097,7 @@ yyreduce:
break;
case 94:
-#line 1060 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1060 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
const int cond = _mesa_parse_cc((yyvsp[(1) - (1)].string));
if ((cond == 0) || ((yyvsp[(1) - (1)].string)[2] != '\0')) {
@@ -3120,7 +3120,7 @@ yyreduce:
break;
case 95:
-#line 1082 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1082 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
const int cond = _mesa_parse_cc((yyvsp[(1) - (1)].string));
if ((cond == 0) || ((yyvsp[(1) - (1)].string)[2] != '\0')) {
@@ -3143,7 +3143,7 @@ yyreduce:
break;
case 102:
-#line 1112 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1112 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
struct asm_symbol *const s =
declare_variable(state, (yyvsp[(2) - (4)].string), at_attrib, & (yylsp[(2) - (4)]));
@@ -3163,63 +3163,63 @@ yyreduce:
break;
case 103:
-#line 1131 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1131 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.attrib) = (yyvsp[(2) - (2)].attrib);
;}
break;
case 104:
-#line 1135 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1135 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.attrib) = (yyvsp[(2) - (2)].attrib);
;}
break;
case 105:
-#line 1141 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1141 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.attrib) = VERT_ATTRIB_POS;
;}
break;
case 106:
-#line 1145 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1145 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.attrib) = VERT_ATTRIB_WEIGHT;
;}
break;
case 107:
-#line 1149 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1149 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.attrib) = VERT_ATTRIB_NORMAL;
;}
break;
case 108:
-#line 1153 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1153 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.attrib) = VERT_ATTRIB_COLOR0 + (yyvsp[(2) - (2)].integer);
;}
break;
case 109:
-#line 1157 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1157 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.attrib) = VERT_ATTRIB_FOG;
;}
break;
case 110:
-#line 1161 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1161 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.attrib) = VERT_ATTRIB_TEX0 + (yyvsp[(2) - (2)].integer);
;}
break;
case 111:
-#line 1165 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1165 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
yyerror(& (yylsp[(1) - (4)]), state, "GL_ARB_matrix_palette not supported");
YYERROR;
@@ -3227,14 +3227,14 @@ yyreduce:
break;
case 112:
-#line 1170 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1170 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.attrib) = VERT_ATTRIB_GENERIC0 + (yyvsp[(3) - (4)].integer);
;}
break;
case 113:
-#line 1176 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1176 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->limits->MaxAttribs) {
yyerror(& (yylsp[(1) - (1)]), state, "invalid vertex attribute reference");
@@ -3246,35 +3246,35 @@ yyreduce:
break;
case 117:
-#line 1190 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1190 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.attrib) = VARYING_SLOT_POS;
;}
break;
case 118:
-#line 1194 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1194 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.attrib) = VARYING_SLOT_COL0 + (yyvsp[(2) - (2)].integer);
;}
break;
case 119:
-#line 1198 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1198 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.attrib) = VARYING_SLOT_FOGC;
;}
break;
case 120:
-#line 1202 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1202 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.attrib) = VARYING_SLOT_TEX0 + (yyvsp[(2) - (2)].integer);
;}
break;
case 123:
-#line 1210 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1210 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
struct asm_symbol *const s =
declare_variable(state, (yyvsp[(2) - (3)].string), at_param, & (yylsp[(2) - (3)]));
@@ -3293,7 +3293,7 @@ yyreduce:
break;
case 124:
-#line 1228 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1228 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
if (((yyvsp[(4) - (6)].integer) != 0) && ((unsigned) (yyvsp[(4) - (6)].integer) != (yyvsp[(6) - (6)].temp_sym).param_binding_length)) {
free((yyvsp[(2) - (6)].string));
@@ -3319,14 +3319,14 @@ yyreduce:
break;
case 125:
-#line 1253 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1253 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.integer) = 0;
;}
break;
case 126:
-#line 1257 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1257 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
if (((yyvsp[(1) - (1)].integer) < 1) || ((unsigned) (yyvsp[(1) - (1)].integer) > state->limits->MaxParameters)) {
char msg[100];
@@ -3342,21 +3342,21 @@ yyreduce:
break;
case 127:
-#line 1272 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1272 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.temp_sym) = (yyvsp[(2) - (2)].temp_sym);
;}
break;
case 128:
-#line 1278 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1278 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.temp_sym) = (yyvsp[(3) - (4)].temp_sym);
;}
break;
case 130:
-#line 1285 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1285 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyvsp[(1) - (3)].temp_sym).param_binding_length += (yyvsp[(3) - (3)].temp_sym).param_binding_length;
(yyval.temp_sym) = (yyvsp[(1) - (3)].temp_sym);
@@ -3364,7 +3364,7 @@ yyreduce:
break;
case 131:
-#line 1292 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1292 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));
(yyval.temp_sym).param_binding_begin = ~0;
@@ -3373,7 +3373,7 @@ yyreduce:
break;
case 132:
-#line 1298 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1298 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));
(yyval.temp_sym).param_binding_begin = ~0;
@@ -3382,7 +3382,7 @@ yyreduce:
break;
case 133:
-#line 1304 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1304 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));
(yyval.temp_sym).param_binding_begin = ~0;
@@ -3391,7 +3391,7 @@ yyreduce:
break;
case 134:
-#line 1312 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1312 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));
(yyval.temp_sym).param_binding_begin = ~0;
@@ -3400,7 +3400,7 @@ yyreduce:
break;
case 135:
-#line 1318 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1318 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));
(yyval.temp_sym).param_binding_begin = ~0;
@@ -3409,7 +3409,7 @@ yyreduce:
break;
case 136:
-#line 1324 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1324 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));
(yyval.temp_sym).param_binding_begin = ~0;
@@ -3418,7 +3418,7 @@ yyreduce:
break;
case 137:
-#line 1332 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1332 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));
(yyval.temp_sym).param_binding_begin = ~0;
@@ -3427,7 +3427,7 @@ yyreduce:
break;
case 138:
-#line 1338 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1338 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));
(yyval.temp_sym).param_binding_begin = ~0;
@@ -3436,7 +3436,7 @@ yyreduce:
break;
case 139:
-#line 1344 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1344 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
memset(& (yyval.temp_sym), 0, sizeof((yyval.temp_sym)));
(yyval.temp_sym).param_binding_begin = ~0;
@@ -3445,72 +3445,72 @@ yyreduce:
break;
case 140:
-#line 1351 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1351 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ memcpy((yyval.state), (yyvsp[(1) - (1)].state), sizeof((yyval.state))); ;}
break;
case 141:
-#line 1352 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1352 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
break;
case 142:
-#line 1355 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1355 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
break;
case 143:
-#line 1356 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1356 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
break;
case 144:
-#line 1357 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1357 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
break;
case 145:
-#line 1358 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1358 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
break;
case 146:
-#line 1359 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1359 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
break;
case 147:
-#line 1360 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1360 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
break;
case 148:
-#line 1361 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1361 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
break;
case 149:
-#line 1362 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1362 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
break;
case 150:
-#line 1363 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1363 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
break;
case 151:
-#line 1364 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1364 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
break;
case 152:
-#line 1365 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1365 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ memcpy((yyval.state), (yyvsp[(2) - (2)].state), sizeof((yyval.state))); ;}
break;
case 153:
-#line 1369 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1369 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
memset((yyval.state), 0, sizeof((yyval.state)));
(yyval.state)[0] = STATE_MATERIAL;
@@ -3520,28 +3520,28 @@ yyreduce:
break;
case 154:
-#line 1378 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1378 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.integer) = (yyvsp[(1) - (1)].integer);
;}
break;
case 155:
-#line 1382 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1382 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.integer) = STATE_EMISSION;
;}
break;
case 156:
-#line 1386 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1386 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.integer) = STATE_SHININESS;
;}
break;
case 157:
-#line 1392 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1392 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
memset((yyval.state), 0, sizeof((yyval.state)));
(yyval.state)[0] = STATE_LIGHT;
@@ -3551,21 +3551,21 @@ yyreduce:
break;
case 158:
-#line 1401 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1401 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.integer) = (yyvsp[(1) - (1)].integer);
;}
break;
case 159:
-#line 1405 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1405 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.integer) = STATE_POSITION;
;}
break;
case 160:
-#line 1409 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1409 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
if (!state->ctx->Extensions.EXT_point_parameters) {
yyerror(& (yylsp[(1) - (1)]), state, "GL_ARB_point_parameters not supported");
@@ -3577,28 +3577,28 @@ yyreduce:
break;
case 161:
-#line 1418 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1418 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.integer) = (yyvsp[(2) - (2)].integer);
;}
break;
case 162:
-#line 1422 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1422 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.integer) = STATE_HALF_VECTOR;
;}
break;
case 163:
-#line 1428 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1428 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.integer) = STATE_SPOT_DIRECTION;
;}
break;
case 164:
-#line 1434 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1434 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.state)[0] = (yyvsp[(2) - (2)].state)[0];
(yyval.state)[1] = (yyvsp[(2) - (2)].state)[1];
@@ -3606,7 +3606,7 @@ yyreduce:
break;
case 165:
-#line 1441 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1441 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
memset((yyval.state), 0, sizeof((yyval.state)));
(yyval.state)[0] = STATE_LIGHTMODEL_AMBIENT;
@@ -3614,7 +3614,7 @@ yyreduce:
break;
case 166:
-#line 1446 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1446 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
memset((yyval.state), 0, sizeof((yyval.state)));
(yyval.state)[0] = STATE_LIGHTMODEL_SCENECOLOR;
@@ -3623,7 +3623,7 @@ yyreduce:
break;
case 167:
-#line 1454 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1454 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
memset((yyval.state), 0, sizeof((yyval.state)));
(yyval.state)[0] = STATE_LIGHTPROD;
@@ -3634,7 +3634,7 @@ yyreduce:
break;
case 169:
-#line 1466 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1466 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
memset((yyval.state), 0, sizeof((yyval.state)));
(yyval.state)[0] = (yyvsp[(3) - (3)].integer);
@@ -3643,35 +3643,35 @@ yyreduce:
break;
case 170:
-#line 1474 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1474 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.integer) = STATE_TEXENV_COLOR;
;}
break;
case 171:
-#line 1480 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1480 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.integer) = STATE_AMBIENT;
;}
break;
case 172:
-#line 1484 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1484 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.integer) = STATE_DIFFUSE;
;}
break;
case 173:
-#line 1488 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1488 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.integer) = STATE_SPECULAR;
;}
break;
case 174:
-#line 1494 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1494 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->MaxLights) {
yyerror(& (yylsp[(1) - (1)]), state, "invalid light selector");
@@ -3683,7 +3683,7 @@ yyreduce:
break;
case 175:
-#line 1505 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1505 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
memset((yyval.state), 0, sizeof((yyval.state)));
(yyval.state)[0] = STATE_TEXGEN;
@@ -3693,49 +3693,49 @@ yyreduce:
break;
case 176:
-#line 1514 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1514 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.integer) = STATE_TEXGEN_EYE_S;
;}
break;
case 177:
-#line 1518 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1518 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.integer) = STATE_TEXGEN_OBJECT_S;
;}
break;
case 178:
-#line 1523 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1523 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.integer) = STATE_TEXGEN_EYE_S - STATE_TEXGEN_EYE_S;
;}
break;
case 179:
-#line 1527 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1527 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.integer) = STATE_TEXGEN_EYE_T - STATE_TEXGEN_EYE_S;
;}
break;
case 180:
-#line 1531 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1531 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.integer) = STATE_TEXGEN_EYE_R - STATE_TEXGEN_EYE_S;
;}
break;
case 181:
-#line 1535 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1535 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.integer) = STATE_TEXGEN_EYE_Q - STATE_TEXGEN_EYE_S;
;}
break;
case 182:
-#line 1541 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1541 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
memset((yyval.state), 0, sizeof((yyval.state)));
(yyval.state)[0] = (yyvsp[(2) - (2)].integer);
@@ -3743,21 +3743,21 @@ yyreduce:
break;
case 183:
-#line 1548 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1548 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.integer) = STATE_FOG_COLOR;
;}
break;
case 184:
-#line 1552 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1552 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.integer) = STATE_FOG_PARAMS;
;}
break;
case 185:
-#line 1558 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1558 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
memset((yyval.state), 0, sizeof((yyval.state)));
(yyval.state)[0] = STATE_CLIPPLANE;
@@ -3766,7 +3766,7 @@ yyreduce:
break;
case 186:
-#line 1566 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1566 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->MaxClipPlanes) {
yyerror(& (yylsp[(1) - (1)]), state, "invalid clip plane selector");
@@ -3778,7 +3778,7 @@ yyreduce:
break;
case 187:
-#line 1577 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1577 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
memset((yyval.state), 0, sizeof((yyval.state)));
(yyval.state)[0] = (yyvsp[(2) - (2)].integer);
@@ -3786,21 +3786,21 @@ yyreduce:
break;
case 188:
-#line 1584 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1584 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.integer) = STATE_POINT_SIZE;
;}
break;
case 189:
-#line 1588 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1588 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.integer) = STATE_POINT_ATTENUATION;
;}
break;
case 190:
-#line 1594 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1594 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.state)[0] = (yyvsp[(1) - (5)].state)[0];
(yyval.state)[1] = (yyvsp[(1) - (5)].state)[1];
@@ -3811,7 +3811,7 @@ yyreduce:
break;
case 191:
-#line 1604 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1604 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.state)[0] = (yyvsp[(1) - (2)].state)[0];
(yyval.state)[1] = (yyvsp[(1) - (2)].state)[1];
@@ -3822,7 +3822,7 @@ yyreduce:
break;
case 192:
-#line 1614 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1614 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.state)[2] = 0;
(yyval.state)[3] = 3;
@@ -3830,7 +3830,7 @@ yyreduce:
break;
case 193:
-#line 1619 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1619 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
/* It seems logical that the matrix row range specifier would have
* to specify a range or more than one row (i.e., $5 > $3).
@@ -3849,7 +3849,7 @@ yyreduce:
break;
case 194:
-#line 1637 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1637 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.state)[0] = (yyvsp[(2) - (3)].state)[0];
(yyval.state)[1] = (yyvsp[(2) - (3)].state)[1];
@@ -3858,42 +3858,42 @@ yyreduce:
break;
case 195:
-#line 1645 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1645 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.integer) = 0;
;}
break;
case 196:
-#line 1649 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1649 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.integer) = (yyvsp[(1) - (1)].integer);
;}
break;
case 197:
-#line 1655 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1655 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.integer) = STATE_MATRIX_INVERSE;
;}
break;
case 198:
-#line 1659 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1659 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.integer) = STATE_MATRIX_TRANSPOSE;
;}
break;
case 199:
-#line 1663 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1663 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.integer) = STATE_MATRIX_INVTRANS;
;}
break;
case 200:
-#line 1669 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1669 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
if ((yyvsp[(1) - (1)].integer) > 3) {
yyerror(& (yylsp[(1) - (1)]), state, "invalid matrix row reference");
@@ -3905,7 +3905,7 @@ yyreduce:
break;
case 201:
-#line 1680 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1680 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.state)[0] = STATE_MODELVIEW_MATRIX;
(yyval.state)[1] = (yyvsp[(2) - (2)].integer);
@@ -3913,7 +3913,7 @@ yyreduce:
break;
case 202:
-#line 1685 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1685 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.state)[0] = STATE_PROJECTION_MATRIX;
(yyval.state)[1] = 0;
@@ -3921,7 +3921,7 @@ yyreduce:
break;
case 203:
-#line 1690 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1690 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.state)[0] = STATE_MVP_MATRIX;
(yyval.state)[1] = 0;
@@ -3929,7 +3929,7 @@ yyreduce:
break;
case 204:
-#line 1695 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1695 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.state)[0] = STATE_TEXTURE_MATRIX;
(yyval.state)[1] = (yyvsp[(2) - (2)].integer);
@@ -3937,7 +3937,7 @@ yyreduce:
break;
case 205:
-#line 1700 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1700 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
yyerror(& (yylsp[(1) - (4)]), state, "GL_ARB_matrix_palette not supported");
YYERROR;
@@ -3945,7 +3945,7 @@ yyreduce:
break;
case 206:
-#line 1705 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1705 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.state)[0] = STATE_PROGRAM_MATRIX;
(yyval.state)[1] = (yyvsp[(3) - (4)].integer);
@@ -3953,21 +3953,21 @@ yyreduce:
break;
case 207:
-#line 1712 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1712 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.integer) = 0;
;}
break;
case 208:
-#line 1716 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1716 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.integer) = (yyvsp[(2) - (3)].integer);
;}
break;
case 209:
-#line 1721 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1721 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
/* Since GL_ARB_vertex_blend isn't supported, only modelview matrix
* zero is valid.
@@ -3982,7 +3982,7 @@ yyreduce:
break;
case 210:
-#line 1734 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1734 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
/* Since GL_ARB_matrix_palette isn't supported, just let any value
* through here. The error will be generated later.
@@ -3992,7 +3992,7 @@ yyreduce:
break;
case 211:
-#line 1742 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1742 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->MaxProgramMatrices) {
yyerror(& (yylsp[(1) - (1)]), state, "invalid program matrix selector");
@@ -4004,7 +4004,7 @@ yyreduce:
break;
case 212:
-#line 1753 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1753 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
memset((yyval.state), 0, sizeof((yyval.state)));
(yyval.state)[0] = STATE_DEPTH_RANGE;
@@ -4012,7 +4012,7 @@ yyreduce:
break;
case 217:
-#line 1765 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1765 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
memset((yyval.state), 0, sizeof((yyval.state)));
(yyval.state)[0] = state->state_param_enum;
@@ -4023,7 +4023,7 @@ yyreduce:
break;
case 218:
-#line 1775 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1775 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.state)[0] = (yyvsp[(1) - (1)].integer);
(yyval.state)[1] = (yyvsp[(1) - (1)].integer);
@@ -4031,7 +4031,7 @@ yyreduce:
break;
case 219:
-#line 1780 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1780 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.state)[0] = (yyvsp[(1) - (3)].integer);
(yyval.state)[1] = (yyvsp[(3) - (3)].integer);
@@ -4039,7 +4039,7 @@ yyreduce:
break;
case 220:
-#line 1787 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1787 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
memset((yyval.state), 0, sizeof((yyval.state)));
(yyval.state)[0] = state->state_param_enum;
@@ -4050,7 +4050,7 @@ yyreduce:
break;
case 221:
-#line 1797 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1797 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
memset((yyval.state), 0, sizeof((yyval.state)));
(yyval.state)[0] = state->state_param_enum;
@@ -4061,7 +4061,7 @@ yyreduce:
break;
case 222:
-#line 1806 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1806 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.state)[0] = (yyvsp[(1) - (1)].integer);
(yyval.state)[1] = (yyvsp[(1) - (1)].integer);
@@ -4069,7 +4069,7 @@ yyreduce:
break;
case 223:
-#line 1811 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1811 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.state)[0] = (yyvsp[(1) - (3)].integer);
(yyval.state)[1] = (yyvsp[(3) - (3)].integer);
@@ -4077,7 +4077,7 @@ yyreduce:
break;
case 224:
-#line 1818 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1818 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
memset((yyval.state), 0, sizeof((yyval.state)));
(yyval.state)[0] = state->state_param_enum;
@@ -4088,7 +4088,7 @@ yyreduce:
break;
case 225:
-#line 1828 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1828 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->limits->MaxEnvParams) {
yyerror(& (yylsp[(1) - (1)]), state, "invalid environment parameter reference");
@@ -4099,7 +4099,7 @@ yyreduce:
break;
case 226:
-#line 1838 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1838 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->limits->MaxLocalParams) {
yyerror(& (yylsp[(1) - (1)]), state, "invalid local parameter reference");
@@ -4110,7 +4110,7 @@ yyreduce:
break;
case 231:
-#line 1853 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1853 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.vector).count = 4;
(yyval.vector).data[0].f = (yyvsp[(1) - (1)].real);
@@ -4121,7 +4121,7 @@ yyreduce:
break;
case 232:
-#line 1863 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1863 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.vector).count = 1;
(yyval.vector).data[0].f = (yyvsp[(1) - (1)].real);
@@ -4132,7 +4132,7 @@ yyreduce:
break;
case 233:
-#line 1871 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1871 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.vector).count = 1;
(yyval.vector).data[0].f = (float) (yyvsp[(1) - (1)].integer);
@@ -4143,7 +4143,7 @@ yyreduce:
break;
case 234:
-#line 1881 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1881 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.vector).count = 4;
(yyval.vector).data[0].f = (yyvsp[(2) - (3)].real);
@@ -4154,7 +4154,7 @@ yyreduce:
break;
case 235:
-#line 1889 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1889 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.vector).count = 4;
(yyval.vector).data[0].f = (yyvsp[(2) - (5)].real);
@@ -4165,7 +4165,7 @@ yyreduce:
break;
case 236:
-#line 1898 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1898 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.vector).count = 4;
(yyval.vector).data[0].f = (yyvsp[(2) - (7)].real);
@@ -4176,7 +4176,7 @@ yyreduce:
break;
case 237:
-#line 1907 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1907 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.vector).count = 4;
(yyval.vector).data[0].f = (yyvsp[(2) - (9)].real);
@@ -4187,41 +4187,41 @@ yyreduce:
break;
case 238:
-#line 1917 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1917 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.real) = ((yyvsp[(1) - (2)].negate)) ? -(yyvsp[(2) - (2)].real) : (yyvsp[(2) - (2)].real);
;}
break;
case 239:
-#line 1921 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1921 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.real) = (float)(((yyvsp[(1) - (2)].negate)) ? -(yyvsp[(2) - (2)].integer) : (yyvsp[(2) - (2)].integer));
;}
break;
case 240:
-#line 1926 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1926 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ (yyval.negate) = FALSE; ;}
break;
case 241:
-#line 1927 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1927 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ (yyval.negate) = TRUE; ;}
break;
case 242:
-#line 1928 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1928 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ (yyval.negate) = FALSE; ;}
break;
case 243:
-#line 1931 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1931 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ (yyval.integer) = (yyvsp[(2) - (2)].integer); ;}
break;
case 245:
-#line 1935 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1935 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
/* NV_fragment_program_option defines the size qualifiers in a
* fairly broken way. "SHORT" or "LONG" can optionally be used
@@ -4258,18 +4258,18 @@ yyreduce:
break;
case 246:
-#line 1969 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1969 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
;}
break;
case 247:
-#line 1973 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1973 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ (yyval.integer) = (yyvsp[(1) - (1)].integer); ;}
break;
case 249:
-#line 1977 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1977 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
if (!declare_variable(state, (yyvsp[(3) - (3)].string), (yyvsp[(0) - (3)].integer), & (yylsp[(3) - (3)]))) {
free((yyvsp[(3) - (3)].string));
@@ -4279,7 +4279,7 @@ yyreduce:
break;
case 250:
-#line 1984 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1984 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
if (!declare_variable(state, (yyvsp[(1) - (1)].string), (yyvsp[(0) - (1)].integer), & (yylsp[(1) - (1)]))) {
free((yyvsp[(1) - (1)].string));
@@ -4289,7 +4289,7 @@ yyreduce:
break;
case 251:
-#line 1993 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 1993 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
struct asm_symbol *const s =
declare_variable(state, (yyvsp[(3) - (5)].string), at_output, & (yylsp[(3) - (5)]));
@@ -4304,7 +4304,7 @@ yyreduce:
break;
case 252:
-#line 2007 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 2007 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
if (state->mode == ARB_vertex) {
(yyval.result) = VARYING_SLOT_POS;
@@ -4316,7 +4316,7 @@ yyreduce:
break;
case 253:
-#line 2016 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 2016 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
if (state->mode == ARB_vertex) {
(yyval.result) = VARYING_SLOT_FOGC;
@@ -4328,14 +4328,14 @@ yyreduce:
break;
case 254:
-#line 2025 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 2025 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.result) = (yyvsp[(2) - (2)].result);
;}
break;
case 255:
-#line 2029 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 2029 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
if (state->mode == ARB_vertex) {
(yyval.result) = VARYING_SLOT_PSIZ;
@@ -4347,7 +4347,7 @@ yyreduce:
break;
case 256:
-#line 2038 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 2038 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
if (state->mode == ARB_vertex) {
(yyval.result) = VARYING_SLOT_TEX0 + (yyvsp[(3) - (3)].integer);
@@ -4359,7 +4359,7 @@ yyreduce:
break;
case 257:
-#line 2047 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 2047 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
if (state->mode == ARB_fragment) {
(yyval.result) = FRAG_RESULT_DEPTH;
@@ -4371,14 +4371,14 @@ yyreduce:
break;
case 258:
-#line 2058 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 2058 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.result) = (yyvsp[(2) - (3)].integer) + (yyvsp[(3) - (3)].integer);
;}
break;
case 259:
-#line 2064 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 2064 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
if (state->mode == ARB_vertex) {
(yyval.integer) = VARYING_SLOT_COL0;
@@ -4392,7 +4392,7 @@ yyreduce:
break;
case 260:
-#line 2075 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 2075 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
if (state->mode == ARB_vertex) {
yyerror(& (yylsp[(1) - (3)]), state, "invalid program result name");
@@ -4423,7 +4423,7 @@ yyreduce:
break;
case 261:
-#line 2103 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 2103 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
if (state->mode == ARB_vertex) {
(yyval.integer) = VARYING_SLOT_COL0;
@@ -4435,7 +4435,7 @@ yyreduce:
break;
case 262:
-#line 2112 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 2112 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
if (state->mode == ARB_vertex) {
(yyval.integer) = VARYING_SLOT_BFC0;
@@ -4447,14 +4447,14 @@ yyreduce:
break;
case 263:
-#line 2123 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 2123 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
(yyval.integer) = 0;
;}
break;
case 264:
-#line 2127 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 2127 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
if (state->mode == ARB_vertex) {
(yyval.integer) = 0;
@@ -4466,7 +4466,7 @@ yyreduce:
break;
case 265:
-#line 2136 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 2136 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
if (state->mode == ARB_vertex) {
(yyval.integer) = 1;
@@ -4478,67 +4478,67 @@ yyreduce:
break;
case 266:
-#line 2146 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 2146 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ (yyval.integer) = 0; ;}
break;
case 267:
-#line 2147 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 2147 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ (yyval.integer) = 0; ;}
break;
case 268:
-#line 2148 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 2148 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ (yyval.integer) = 1; ;}
break;
case 269:
-#line 2151 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 2151 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ (yyval.integer) = 0; ;}
break;
case 270:
-#line 2152 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 2152 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ (yyval.integer) = 0; ;}
break;
case 271:
-#line 2153 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 2153 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ (yyval.integer) = 1; ;}
break;
case 272:
-#line 2156 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 2156 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ (yyval.integer) = 0; ;}
break;
case 273:
-#line 2157 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 2157 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ (yyval.integer) = (yyvsp[(2) - (3)].integer); ;}
break;
case 274:
-#line 2160 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 2160 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ (yyval.integer) = 0; ;}
break;
case 275:
-#line 2161 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 2161 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ (yyval.integer) = (yyvsp[(2) - (3)].integer); ;}
break;
case 276:
-#line 2164 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 2164 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ (yyval.integer) = 0; ;}
break;
case 277:
-#line 2165 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 2165 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{ (yyval.integer) = (yyvsp[(2) - (3)].integer); ;}
break;
case 278:
-#line 2169 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 2169 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->MaxTextureCoordUnits) {
yyerror(& (yylsp[(1) - (1)]), state, "invalid texture coordinate unit selector");
@@ -4550,7 +4550,7 @@ yyreduce:
break;
case 279:
-#line 2180 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 2180 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->MaxTextureImageUnits) {
yyerror(& (yylsp[(1) - (1)]), state, "invalid texture image unit selector");
@@ -4562,7 +4562,7 @@ yyreduce:
break;
case 280:
-#line 2191 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 2191 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
if ((unsigned) (yyvsp[(1) - (1)].integer) >= state->MaxTextureUnits) {
yyerror(& (yylsp[(1) - (1)]), state, "invalid texture unit selector");
@@ -4574,7 +4574,7 @@ yyreduce:
break;
case 281:
-#line 2202 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 2202 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
struct asm_symbol *exist = (struct asm_symbol *)
_mesa_symbol_table_find_symbol(state->st, 0, (yyvsp[(2) - (4)].string));
@@ -4822,7 +4822,7 @@ yyreturn:
}
-#line 2231 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 2231 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
void
diff --git a/lib/libGL/generated/program/program_parse.tab.h b/lib/libGL/generated/program/program_parse.tab.h
index b11367cf5..d9e8d2ba8 100644
--- a/lib/libGL/generated/program/program_parse.tab.h
+++ b/lib/libGL/generated/program/program_parse.tab.h
@@ -258,7 +258,7 @@
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
-#line 124 "/usr/xenocara/lib/libGL-new/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
+#line 124 "/usr/xenocara/lib/libGL/generated/../../../dist/Mesa/src/mesa/program/program_parse.y"
{
struct asm_instruction *inst;
struct asm_symbol *sym;
diff --git a/lib/libGL/mesa/Makefile.inc b/lib/libGL/mesa/Makefile.inc
index cdadc59a3..8c68f699f 100644
--- a/lib/libGL/mesa/Makefile.inc
+++ b/lib/libGL/mesa/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.3 2013/09/05 15:12:08 jsg Exp $
+# $OpenBSD: Makefile.inc,v 1.4 2013/10/05 10:12:57 jsg Exp $
MESA= ${.CURDIR}/../../../../dist/Mesa/src/mesa
MAPI= ${.CURDIR}/../../../../dist/Mesa/src/mapi
@@ -9,7 +9,7 @@ MESA_INCLUDE= ${.CURDIR}/../../../../dist/Mesa/include
MESA_MAJOR= 9
MESA_MINOR= 2
-MESA_TINY= 0
+MESA_TINY= 1
CPP= cpp -notraditional
diff --git a/lib/libGLESv1_CM/Makefile b/lib/libGLESv1_CM/Makefile
index 950097760..0eca4e423 100644
--- a/lib/libGLESv1_CM/Makefile
+++ b/lib/libGLESv1_CM/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2013/09/05 15:11:54 jsg Exp $
+# $OpenBSD: Makefile,v 1.2 2013/10/05 10:12:57 jsg Exp $
.include <bsd.xconf.mk>
LIB= GLESv1_CM
@@ -10,7 +10,7 @@ MESA_INCLUDE= ${.CURDIR}/../../dist/Mesa/include
MESA_MAJOR= 9
MESA_MINOR= 2
-MESA_TINY= 0
+MESA_TINY= 1
INCSDIR= ${X11BASE}/include/GLES
diff --git a/lib/libGLESv2/Makefile b/lib/libGLESv2/Makefile
index 66e4a1a5b..d80075dd3 100644
--- a/lib/libGLESv2/Makefile
+++ b/lib/libGLESv2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2013/09/05 15:11:55 jsg Exp $
+# $OpenBSD: Makefile,v 1.2 2013/10/05 10:12:57 jsg Exp $
.include <bsd.xconf.mk>
LIB= GLESv2
@@ -10,7 +10,7 @@ MESA_INCLUDE= ${.CURDIR}/../../dist/Mesa/include
MESA_MAJOR= 9
MESA_MINOR= 2
-MESA_TINY= 0
+MESA_TINY= 1
INCSDIR= ${X11BASE}/include/GLES2
INCSDIR3= ${X11BASE}/include/GLES3
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-22 14:11:10 +0000