From 0206ea3751a81d8bb6db9d0a7f4a3a1eb98b36d0 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Wed, 5 Dec 2012 13:25:48 -0800 Subject: glcpp: Honor the GL context's DisableGLSLLineContinuations option And simply don't call into the function that removes line continuations. Reviewed-by: Kenneth Graunke --- src/glsl/glcpp/pp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/glsl/glcpp/pp.c b/src/glsl/glcpp/pp.c index 5f86a499cd4..3f336488ccb 100644 --- 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); -- cgit v1.2.3