diff options
| author | marha <marha@users.sourceforge.net> | 2014-06-08 15:05:49 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-06-08 15:05:49 +0200 |
| commit | 71cc8d9b7dc729934a29445cbd6d1f7a6d9ecbec (patch) | |
| tree | ea689cdd51f395980ddc37dc33781635976f3a16 /mesalib/src/glsl/glsl_lexer.ll | |
| parent | aec798fb4dc72d616732d0fa711faffaa8cd7590 (diff) | |
| parent | 2acb86c9b086bdb9a3897db0b93820652e07cb59 (diff) | |
| download | vcxsrv-71cc8d9b7dc729934a29445cbd6d1f7a6d9ecbec.tar.gz vcxsrv-71cc8d9b7dc729934a29445cbd6d1f7a6d9ecbec.tar.bz2 vcxsrv-71cc8d9b7dc729934a29445cbd6d1f7a6d9ecbec.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
apps/xwininfo/xwininfo.c
xorg-server/hw/xwin/glx/indirect.c
Diffstat (limited to 'mesalib/src/glsl/glsl_lexer.ll')
| -rw-r--r-- | mesalib/src/glsl/glsl_lexer.ll | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mesalib/src/glsl/glsl_lexer.ll b/mesalib/src/glsl/glsl_lexer.ll index 760235127..6c3f9b692 100644 --- a/mesalib/src/glsl/glsl_lexer.ll +++ b/mesalib/src/glsl/glsl_lexer.ll @@ -338,6 +338,9 @@ samplerExternalOES { return IDENTIFIER; } + /* keywords available with ARB_gpu_shader5 */ +precise KEYWORD_WITH_ALT(400, 0, 400, 0, yyextra->ARB_gpu_shader5_enable, PRECISE); + /* keywords available with ARB_shader_image_load_store */ image1D KEYWORD_WITH_ALT(130, 300, 420, 0, yyextra->ARB_shader_image_load_store_enable, IMAGE1D); image2D KEYWORD_WITH_ALT(130, 300, 420, 0, yyextra->ARB_shader_image_load_store_enable, IMAGE2D); |