mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2025-12-25 00:00:11 +01:00
glsl2: Add the 1.30 reserved keywords.
This commit is contained in:
Kenneth Graunke
parent
58f1ffdd7c
commit
b7e63c34e7
5 changed files with 2180 additions and 1728 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -302,6 +302,38 @@ mediump TOKEN_OR_IDENTIFIER(120, MEDIUMP);
|
|||
highp TOKEN_OR_IDENTIFIER(120, HIGHP);
|
||||
precision TOKEN_OR_IDENTIFIER(120, PRECISION);
|
||||
|
||||
/* Additional reserved words in GLSL 1.30. */
|
||||
common TOKEN_OR_IDENTIFIER(130, COMMON);
|
||||
partition TOKEN_OR_IDENTIFIER(130, PARTITION);
|
||||
active TOKEN_OR_IDENTIFIER(130, ACTIVE);
|
||||
superp TOKEN_OR_IDENTIFIER(130, SUPERP);
|
||||
samplerBuffer TOKEN_OR_IDENTIFIER(130, SAMPLERBUFFER);
|
||||
filter TOKEN_OR_IDENTIFIER(130, FILTER);
|
||||
image1D TOKEN_OR_IDENTIFIER(130, IMAGE1D);
|
||||
image2D TOKEN_OR_IDENTIFIER(130, IMAGE2D);
|
||||
image3D TOKEN_OR_IDENTIFIER(130, IMAGE3D);
|
||||
imageCube TOKEN_OR_IDENTIFIER(130, IMAGECUBE);
|
||||
iimage1D TOKEN_OR_IDENTIFIER(130, IIMAGE1D);
|
||||
iimage2D TOKEN_OR_IDENTIFIER(130, IIMAGE2D);
|
||||
iimage3D TOKEN_OR_IDENTIFIER(130, IIMAGE3D);
|
||||
iimageCube TOKEN_OR_IDENTIFIER(130, IIMAGECUBE);
|
||||
uimage1D TOKEN_OR_IDENTIFIER(130, UIMAGE1D);
|
||||
uimage2D TOKEN_OR_IDENTIFIER(130, UIMAGE2D);
|
||||
uimage3D TOKEN_OR_IDENTIFIER(130, UIMAGE3D);
|
||||
uimageCube TOKEN_OR_IDENTIFIER(130, UIMAGECUBE);
|
||||
image1DArray TOKEN_OR_IDENTIFIER(130, IMAGE1DARRAY);
|
||||
image2DArray TOKEN_OR_IDENTIFIER(130, IMAGE2DARRAY);
|
||||
iimage1DArray TOKEN_OR_IDENTIFIER(130, IIMAGE1DARRAY);
|
||||
iimage2DArray TOKEN_OR_IDENTIFIER(130, IIMAGE2DARRAY);
|
||||
uimage1DArray TOKEN_OR_IDENTIFIER(130, UIMAGE1DARRAY);
|
||||
uimage2DArray TOKEN_OR_IDENTIFIER(130, UIMAGE2DARRAY);
|
||||
image1DShadow TOKEN_OR_IDENTIFIER(130, IMAGE1DSHADOW);
|
||||
image2DShadow TOKEN_OR_IDENTIFIER(130, IMAGE2DSHADOW);
|
||||
imageBuffer TOKEN_OR_IDENTIFIER(130, IMAGEBUFFER);
|
||||
iimageBuffer TOKEN_OR_IDENTIFIER(130, IIMAGEBUFFER);
|
||||
uimageBuffer TOKEN_OR_IDENTIFIER(130, UIMAGEBUFFER);
|
||||
row_major TOKEN_OR_IDENTIFIER(130, ROW_MAJOR);
|
||||
|
||||
[_a-zA-Z][_a-zA-Z0-9]* {
|
||||
struct _mesa_glsl_parse_state *state = yyextra;
|
||||
void *ctx = state;
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,10 +1,9 @@
|
|||
|
||||
/* A Bison parser, made by GNU Bison 2.4.1. */
|
||||
/* A Bison parser, made by GNU Bison 2.4.2. */
|
||||
|
||||
/* Skeleton interface for Bison's Yacc-like parsers in C
|
||||
|
||||
Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
|
||||
Free Software Foundation, Inc.
|
||||
Copyright (C) 1984, 1989-1990, 2000-2006, 2009-2010 Free Software
|
||||
Foundation, Inc.
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -146,56 +145,86 @@
|
|||
LOWP = 362,
|
||||
MEDIUMP = 363,
|
||||
HIGHP = 364,
|
||||
PRECISION = 365,
|
||||
VERSION = 366,
|
||||
EXTENSION = 367,
|
||||
LINE = 368,
|
||||
PRAGMA = 369,
|
||||
COLON = 370,
|
||||
EOL = 371,
|
||||
INTERFACE = 372,
|
||||
OUTPUT = 373,
|
||||
LAYOUT_TOK = 374,
|
||||
ASM = 375,
|
||||
CLASS = 376,
|
||||
UNION = 377,
|
||||
ENUM = 378,
|
||||
TYPEDEF = 379,
|
||||
TEMPLATE = 380,
|
||||
THIS = 381,
|
||||
PACKED = 382,
|
||||
GOTO = 383,
|
||||
INLINE_TOK = 384,
|
||||
NOINLINE = 385,
|
||||
VOLATILE = 386,
|
||||
PUBLIC_TOK = 387,
|
||||
STATIC = 388,
|
||||
EXTERN = 389,
|
||||
EXTERNAL = 390,
|
||||
LONG = 391,
|
||||
SHORT = 392,
|
||||
DOUBLE = 393,
|
||||
HALF = 394,
|
||||
FIXED = 395,
|
||||
UNSIGNED = 396,
|
||||
INPUT = 397,
|
||||
OUPTUT = 398,
|
||||
HVEC2 = 399,
|
||||
HVEC3 = 400,
|
||||
HVEC4 = 401,
|
||||
DVEC2 = 402,
|
||||
DVEC3 = 403,
|
||||
DVEC4 = 404,
|
||||
FVEC2 = 405,
|
||||
FVEC3 = 406,
|
||||
FVEC4 = 407,
|
||||
SAMPLER2DRECT = 408,
|
||||
SAMPLER3DRECT = 409,
|
||||
SAMPLER2DRECTSHADOW = 410,
|
||||
SIZEOF = 411,
|
||||
CAST = 412,
|
||||
NAMESPACE = 413,
|
||||
USING = 414
|
||||
SUPERP = 365,
|
||||
PRECISION = 366,
|
||||
VERSION = 367,
|
||||
EXTENSION = 368,
|
||||
LINE = 369,
|
||||
PRAGMA = 370,
|
||||
COLON = 371,
|
||||
EOL = 372,
|
||||
INTERFACE = 373,
|
||||
OUTPUT = 374,
|
||||
LAYOUT_TOK = 375,
|
||||
ASM = 376,
|
||||
CLASS = 377,
|
||||
UNION = 378,
|
||||
ENUM = 379,
|
||||
TYPEDEF = 380,
|
||||
TEMPLATE = 381,
|
||||
THIS = 382,
|
||||
PACKED = 383,
|
||||
GOTO = 384,
|
||||
INLINE_TOK = 385,
|
||||
NOINLINE = 386,
|
||||
VOLATILE = 387,
|
||||
PUBLIC_TOK = 388,
|
||||
STATIC = 389,
|
||||
EXTERN = 390,
|
||||
EXTERNAL = 391,
|
||||
LONG = 392,
|
||||
SHORT = 393,
|
||||
DOUBLE = 394,
|
||||
HALF = 395,
|
||||
FIXED = 396,
|
||||
UNSIGNED = 397,
|
||||
INPUT = 398,
|
||||
OUPTUT = 399,
|
||||
HVEC2 = 400,
|
||||
HVEC3 = 401,
|
||||
HVEC4 = 402,
|
||||
DVEC2 = 403,
|
||||
DVEC3 = 404,
|
||||
DVEC4 = 405,
|
||||
FVEC2 = 406,
|
||||
FVEC3 = 407,
|
||||
FVEC4 = 408,
|
||||
SAMPLER2DRECT = 409,
|
||||
SAMPLER3DRECT = 410,
|
||||
SAMPLER2DRECTSHADOW = 411,
|
||||
SIZEOF = 412,
|
||||
CAST = 413,
|
||||
NAMESPACE = 414,
|
||||
USING = 415,
|
||||
COMMON = 416,
|
||||
PARTITION = 417,
|
||||
ACTIVE = 418,
|
||||
SAMPLERBUFFER = 419,
|
||||
FILTER = 420,
|
||||
IMAGE1D = 421,
|
||||
IMAGE2D = 422,
|
||||
IMAGE3D = 423,
|
||||
IMAGECUBE = 424,
|
||||
IMAGE1DARRAY = 425,
|
||||
IMAGE2DARRAY = 426,
|
||||
IIMAGE1D = 427,
|
||||
IIMAGE2D = 428,
|
||||
IIMAGE3D = 429,
|
||||
IIMAGECUBE = 430,
|
||||
IIMAGE1DARRAY = 431,
|
||||
IIMAGE2DARRAY = 432,
|
||||
UIMAGE1D = 433,
|
||||
UIMAGE2D = 434,
|
||||
UIMAGE3D = 435,
|
||||
UIMAGECUBE = 436,
|
||||
UIMAGE1DARRAY = 437,
|
||||
UIMAGE2DARRAY = 438,
|
||||
IMAGE1DSHADOW = 439,
|
||||
IMAGE2DSHADOW = 440,
|
||||
IMAGEBUFFER = 441,
|
||||
IIMAGEBUFFER = 442,
|
||||
UIMAGEBUFFER = 443,
|
||||
ROW_MAJOR = 444
|
||||
};
|
||||
#endif
|
||||
|
||||
|
|
@ -205,7 +234,7 @@
|
|||
typedef union YYSTYPE
|
||||
{
|
||||
|
||||
/* Line 1676 of yacc.c */
|
||||
/* Line 1685 of yacc.c */
|
||||
#line 45 "glsl_parser.ypp"
|
||||
|
||||
int n;
|
||||
|
|
@ -236,8 +265,8 @@ typedef union YYSTYPE
|
|||
|
||||
|
||||
|
||||
/* Line 1676 of yacc.c */
|
||||
#line 241 "glsl_parser.h"
|
||||
/* Line 1685 of yacc.c */
|
||||
#line 270 "glsl_parser.h"
|
||||
} YYSTYPE;
|
||||
# define YYSTYPE_IS_TRIVIAL 1
|
||||
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@
|
|||
%token MOD_ASSIGN LEFT_ASSIGN RIGHT_ASSIGN AND_ASSIGN XOR_ASSIGN OR_ASSIGN
|
||||
%token SUB_ASSIGN
|
||||
%token INVARIANT
|
||||
%token LOWP MEDIUMP HIGHP PRECISION
|
||||
%token LOWP MEDIUMP HIGHP SUPERP PRECISION
|
||||
|
||||
%token VERSION EXTENSION LINE PRAGMA COLON EOL INTERFACE OUTPUT
|
||||
%token LAYOUT_TOK
|
||||
|
|
@ -108,6 +108,13 @@
|
|||
%token SAMPLER2DRECT SAMPLER3DRECT SAMPLER2DRECTSHADOW
|
||||
%token SIZEOF CAST NAMESPACE USING
|
||||
|
||||
%token COMMON PARTITION ACTIVE SAMPLERBUFFER FILTER
|
||||
%token IMAGE1D IMAGE2D IMAGE3D IMAGECUBE IMAGE1DARRAY IMAGE2DARRAY
|
||||
%token IIMAGE1D IIMAGE2D IIMAGE3D IIMAGECUBE IIMAGE1DARRAY IIMAGE2DARRAY
|
||||
%token UIMAGE1D UIMAGE2D UIMAGE3D UIMAGECUBE UIMAGE1DARRAY UIMAGE2DARRAY
|
||||
%token IMAGE1DSHADOW IMAGE2DSHADOW IMAGEBUFFER IIMAGEBUFFER UIMAGEBUFFER
|
||||
%token ROW_MAJOR
|
||||
|
||||
%type <identifier> variable_identifier
|
||||
%type <node> statement
|
||||
%type <node> statement_list
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue