From c59a605c70752b584a05bc6f129a1aa894c861ce Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Sun, 26 Jan 2014 18:06:18 -0800 Subject: 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 Reviewed-by: Ian Romanick --- src/glsl/glcpp/glcpp.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/glsl/glcpp/glcpp.h') 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); -- cgit v1.2.3