From: Carl Worth <cworth@cworth.org>
Date: Wed, 5 Dec 2012 21:25:48 +0000 (-0800)
Subject: glcpp: Honor the GL context's DisableGLSLLineContinuations option
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0206ea3751a81d8bb6db9d0a7f4a3a1eb98b36d0;p=mesa.git

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 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);