diff options
| author | Matt Turner <mattst88@gmail.com> | 2014-01-26 18:06:18 -0800 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2014-01-27 21:15:35 -0800 |
| commit | c59a605c70752b584a05bc6f129a1aa894c861ce (patch) | |
| tree | c45e47947a49927eafea71be8dd98bb77eaf3e8a /src/glsl/glcpp/pp.c | |
| parent | 3e0e9e3bf9e597eb74b06381b3418c958be4d452 (diff) | |
| download | external_mesa3d-c59a605c70752b584a05bc6f129a1aa894c861ce.zip external_mesa3d-c59a605c70752b584a05bc6f129a1aa894c861ce.tar.gz external_mesa3d-c59a605c70752b584a05bc6f129a1aa894c861ce.tar.bz2 | |
glcpp: Resolve implicit GLSL version to 100 if the API is ES.
Fixes a regression since b2d1c579 where ES shaders without a #version
declaration would fail to compile if their precision declaration was
wrapped in the standard #ifdef GL_ES check.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=74066
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/glsl/glcpp/pp.c')
| -rw-r--r-- | src/glsl/glcpp/pp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/glcpp/pp.c b/src/glsl/glcpp/pp.c index fc645f7..4a623f8 100644 --- a/src/glsl/glcpp/pp.c +++ b/src/glsl/glcpp/pp.c @@ -139,7 +139,7 @@ glcpp_preprocess(void *ralloc_ctx, const char **shader, char **info_log, const struct gl_extensions *extensions, struct gl_context *gl_ctx) { int errors; - glcpp_parser_t *parser = glcpp_parser_create (extensions); + glcpp_parser_t *parser = glcpp_parser_create (extensions, gl_ctx->API); if (! gl_ctx->Const.DisableGLSLLineContinuations) *shader = remove_line_continuations(parser, *shader); |