glcpp: Honor the GL context's DisableGLSLLineContinuations option

And simply don't call into the function that removes line continuations.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/glsl/glcpp/pp.c b/src/glsl/glcpp/pp.c
index 5f86a499cd42fc6143e0832e7f5e23c665d3b20c..3f336488ccbe72d563d84dcf928c4e38dc23dded 100644 (file)
--- a/src/glsl/glcpp/pp.c
+++ b/src/glsl/glcpp/pp.c
@@ -155,7 +155,9 @@ glcpp_preprocess(void *ralloc_ctx, const char **shader, char **info_log,
 {
        int errors;
        glcpp_parser_t *parser = glcpp_parser_create (extensions, gl_ctx->API);
-       *shader = remove_line_continuations(parser, *shader);
+
+       if (! gl_ctx->Const.DisableGLSLLineContinuations)
+               *shader = remove_line_continuations(parser, *shader);
 
        glcpp_lex_set_source_string (parser, *shader);