From: Kenneth Graunke <kenneth@whitecape.org>
Date: Sat, 28 Jul 2012 20:04:53 +0000 (-0700)
Subject: glcpp: Add a newline to expanded #line directives.
X-Git-Tag: accepted/2.0alpha-wayland/20121114.171706~931
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dcf8754cce1af09547a5976a74ba807bc6f2657c;p=profile%2Fivi%2Fmesa.git

glcpp: Add a newline to expanded #line directives.

Otherwise, the preprocessor happily outputs

    #line 2 4 <your next line of code>

and the main compiler gets horribly confused and fails to compile.

This is not the right solution (line numbers in error messages will
likely be off-by-one in certain circumstances), but until Carl comes
up with a proper fix, this gets programs running again.

Fixes regressions in Regnum Online, Overgrowth, Piglit, and others since
commit aac78ce8234d96932c38b3f48b1d828077bc0027.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=51802
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=51506
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=41152
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y
index c0c1ca1..bf6f3ad 100644
--- a/src/glsl/glcpp/glcpp-parse.y
+++ b/src/glsl/glcpp/glcpp-parse.y
@@ -213,7 +213,7 @@ expanded_line:
 		parser->new_line_number = $2;
 		ralloc_asprintf_rewrite_tail (&parser->output,
 					      &parser->output_length,
-					      "#line %" PRIiMAX,
+					      "#line %" PRIiMAX "\n",
 					      $2);
 	}
 |	LINE_EXPANDED integer_constant integer_constant NEWLINE {
@@ -223,7 +223,7 @@ expanded_line:
 		parser->new_source_number = $3;
 		ralloc_asprintf_rewrite_tail (&parser->output,
 					      &parser->output_length,
-					      "#line %" PRIiMAX " %" PRIiMAX,
+					      "#line %" PRIiMAX " %" PRIiMAX "\n",
 					      $2, $3);
 	}
 ;