diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-12 08:25:37 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-12 08:25:37 +0200 |
| commit | 66b46719d55e60d53b42858770d6ac40d079ab13 (patch) | |
| tree | aad06d011ed8b820685f72ada34e56ee0f2580c6 /mesalib/src/glsl/glsl_lexer.ll | |
| parent | f8f0209a691e0d0838d1ef9d602ebacafee2a233 (diff) | |
| parent | ffce4319c2fb6f4f663cc5a9660e1d5837fcde87 (diff) | |
| download | vcxsrv-66b46719d55e60d53b42858770d6ac40d079ab13.tar.gz vcxsrv-66b46719d55e60d53b42858770d6ac40d079ab13.tar.bz2 vcxsrv-66b46719d55e60d53b42858770d6ac40d079ab13.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxtrans fontconfig mesa xserver git update 12 Jul 2013
Diffstat (limited to 'mesalib/src/glsl/glsl_lexer.ll')
| -rw-r--r-- | mesalib/src/glsl/glsl_lexer.ll | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/glsl/glsl_lexer.ll b/mesalib/src/glsl/glsl_lexer.ll index 008ef303d..e66ce7bee 100644 --- a/mesalib/src/glsl/glsl_lexer.ll +++ b/mesalib/src/glsl/glsl_lexer.ll @@ -72,7 +72,7 @@ static int classify_identifier(struct _mesa_glsl_parse_state *, const char *); alt_expr, token) \ do { \ if (yyextra->is_version(allowed_glsl, allowed_glsl_es) \ - || alt_expr) { \ + || (alt_expr)) { \ return token; \ } else if (yyextra->is_version(reserved_glsl, \ reserved_glsl_es)) { \ @@ -522,7 +522,7 @@ image2DArrayShadow KEYWORD(130, 300, 0, 0, IMAGE2DARRAYSHADOW); imageBuffer KEYWORD(130, 300, 0, 0, IMAGEBUFFER); iimageBuffer KEYWORD(130, 300, 0, 0, IIMAGEBUFFER); uimageBuffer KEYWORD(130, 300, 0, 0, UIMAGEBUFFER); -row_major KEYWORD_WITH_ALT(130, 0, 140, 0, yyextra->ARB_uniform_buffer_object_enable, ROW_MAJOR); +row_major KEYWORD_WITH_ALT(130, 0, 140, 0, yyextra->ARB_uniform_buffer_object_enable && !yyextra->es_shader, ROW_MAJOR); /* Additional reserved words in GLSL 1.40 */ isampler2DRect KEYWORD(140, 300, 140, 0, ISAMPLER2DRECT); |