regen for Mesa 9.2.1

This commit is contained in:
jsg 2013-10-05 10:12:54 +00:00
parent 74afb4747b
commit e14706fc9b
14 changed files with 2159 additions and 2131 deletions

View File

@ -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

View File

@ -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

View File

@ -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"

View File

@ -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 *

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -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;

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -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;

View File

@ -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

View File

@ -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

View File

@ -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