glsl: fix redefinition warning on win32
Reviewed-by: Jose Fonseca <jfonseca@vmware.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7713>
This commit is contained in:
parent
07a68d27b3
commit
def15ad9ab
|
@ -661,7 +661,7 @@ public KEYWORD(110, 100, 0, 0, PUBLIC_TOK);
|
|||
static KEYWORD(110, 100, 0, 0, STATIC);
|
||||
extern KEYWORD(110, 100, 0, 0, EXTERN);
|
||||
external KEYWORD(110, 100, 0, 0, EXTERNAL);
|
||||
interface KEYWORD(110, 100, 0, 0, INTERFACE);
|
||||
interface KEYWORD(110, 100, 0, 0, INTERFACE_TOK);
|
||||
long KEYWORD(110, 100, 0, 0, LONG_TOK);
|
||||
short KEYWORD(110, 100, 0, 0, SHORT_TOK);
|
||||
double TYPE_WITH_ALT(130, 100, 130, 300, yyextra->ARB_gpu_shader_fp64_enable, glsl_type::double_type);
|
||||
|
|
|
@ -164,7 +164,7 @@ static bool match_layout_qualifier(const char *s1, const char *s2,
|
|||
%token INVARIANT PRECISE
|
||||
%token LOWP MEDIUMP HIGHP SUPERP PRECISION
|
||||
|
||||
%token VERSION_TOK EXTENSION LINE COLON EOL INTERFACE OUTPUT
|
||||
%token VERSION_TOK EXTENSION LINE COLON EOL INTERFACE_TOK OUTPUT
|
||||
%token PRAGMA_DEBUG_ON PRAGMA_DEBUG_OFF
|
||||
%token PRAGMA_OPTIMIZE_ON PRAGMA_OPTIMIZE_OFF
|
||||
%token PRAGMA_WARNING_ON PRAGMA_WARNING_OFF
|
||||
|
|
Loading…
Reference in New Issue