Module: Mesa Branch: master Commit: 0206ea3751a81d8bb6db9d0a7f4a3a1eb98b36d0 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0206ea3751a81d8bb6db9d0a7f4a3a1eb98b36d0
Author: Carl Worth <[email protected]> Date: Wed Dec 5 13:25:48 2012 -0800 glcpp: Honor the GL context's DisableGLSLLineContinuations option And simply don't call into the function that removes line continuations. Reviewed-by: Kenneth Graunke <[email protected]> --- src/glsl/glcpp/pp.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/glsl/glcpp/pp.c b/src/glsl/glcpp/pp.c index 5f86a49..3f33648 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); _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
