projects / mesa.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 124f567) | patch
glsl: disable ARB_texture_cube_map_array_enable keywords for glsl es
authorTapani Pälli <tapani.palli@intel.com>
Fri, 26 Jul 2013 07:21:56 +0000 (10:21 +0300)
committerKenneth Graunke <kenneth@whitecape.org>
Fri, 26 Jul 2013 17:05:20 +0000 (10:05 -0700)
commit8c211dd742669bc03b44186e41e5aa40081d6bcc
tree031645a5b3611f35f82980ef5e85ca386928e5bdtree
parent124f567f1d575eaea98a6ae1d0a4687b8fb5bba2commit | diff
glsl: disable ARB_texture_cube_map_array_enable keywords for glsl es

Patch fixes a crash with Webgl 'shader-with-non-reserved-words'
conformance test by ignoring desktop extension keywords on GLSL ES.

v2: fix reserved and allowed desktop glsl versions (Chris)

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=64087
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
src/glsl/glsl_lexer.ll diff | blob | history