diff options
| author | Matt Turner <[email protected]> | 2014-01-26 18:06:18 -0800 |
|---|---|---|
| committer | Matt Turner <[email protected]> | 2014-01-27 21:15:35 -0800 |
| commit | c59a605c70752b584a05bc6f129a1aa894c861ce (patch) | |
| tree | c45e47947a49927eafea71be8dd98bb77eaf3e8a /src/glsl/glcpp/glcpp.h | |
| parent | 3e0e9e3bf9e597eb74b06381b3418c958be4d452 (diff) | |
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 <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/glsl/glcpp/glcpp.h')
| -rw-r--r-- | src/glsl/glcpp/glcpp.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/glsl/glcpp/glcpp.h b/src/glsl/glcpp/glcpp.h index 9d85c163f26..79ccb234f4f 100644 --- a/src/glsl/glcpp/glcpp.h +++ b/src/glsl/glcpp/glcpp.h @@ -183,6 +183,7 @@ struct glcpp_parser { size_t info_log_length; int error; const struct gl_extensions *extensions; + gl_api api; bool version_resolved; bool has_new_line_number; int new_line_number; @@ -194,7 +195,7 @@ struct glcpp_parser { struct gl_extensions; glcpp_parser_t * -glcpp_parser_create (const struct gl_extensions *extensions); +glcpp_parser_create (const struct gl_extensions *extensions, gl_api api); int glcpp_parser_parse (glcpp_parser_t *parser); |