On 05/03/2016 03:33, Kenneth Graunke wrote:
We resolved the implicit version directive when processing control lines,
such as #ifdef, to ensure any built-in macros exist. However, we failed
to resolve it when handling ordinary text.
[...]
diff --git a/src/compiler/glsl/glcpp/tests/146-version-first-hash.c.expected
b/src/compiler/glsl/glcpp/tests/146-version-first-hash.c.expected
new file mode 100644
index 0000000..2872090
--- /dev/null
+++ b/src/compiler/glsl/glcpp/tests/146-version-first-hash.c.expected
@@ -0,0 +1,3 @@
+0:1(3): preprocessor error: #version must appear on the first line
+
+
This last test fails in glcpp-test-cr-lf for me (See attached).
Can you just confirm that it passes for you, before I start looking into
why it might fail just for me...?
===== Testing with \\r line terminators (old Mac format) =====
====== Testing for correctness ======
[...]
147/147 tests returned correct results
PASS
===== Testing with \\r\\n line terminators (DOS format) =====
====== Testing for correctness ======
[...]
Testing subtest-cr-lf/146-version-first-hash.c... >
/jhbuild/x86_64-pc-cygwin/build/mesa/mesa/src/compiler/glsl/glcpp/tests/subtest-cr-lf/146-version-first-hash.c.out
(subtest-cr-lf/146-version-first-hash.c.expected) FAIL
--- subtest-cr-lf/146-version-first-hash.c.expected 2016-03-09
13:39:45.679154000 +0000
+++
/jhbuild/x86_64-pc-cygwin/build/mesa/mesa/src/compiler/glsl/glcpp/tests/subtest-cr-lf/146-version-first-hash.c.out
2016-03-09 13:40:15.043069600 +0000
@@ -1,3 +1,3 @@
-0:1(3): preprocessor error: #version must appear on the first line
+0:1(4): preprocessor error: #version must appear on the first line
146/147 tests returned correct results
FAIL
===== Testing with \\n\\r (bizarre, but allowed by GLSL spec.) =====
====== Testing for correctness ======
[...]
Testing subtest-lf-cr/146-version-first-hash.c... >
/jhbuild/x86_64-pc-cygwin/build/mesa/mesa/src/compiler/glsl/glcpp/tests/subtest-lf-cr/146-version-first-hash.c.out
(subtest-lf-cr/146-version-first-hash.c.expected) FAIL
--- subtest-lf-cr/146-version-first-hash.c.expected 2016-03-09
13:40:32.955390600 +0000
+++
/jhbuild/x86_64-pc-cygwin/build/mesa/mesa/src/compiler/glsl/glcpp/tests/subtest-lf-cr/146-version-first-hash.c.out
2016-03-09 13:41:04.620827800 +0000
@@ -1,3 +1,3 @@
-0:1(3): preprocessor error: #version must appear on the first line
+0:1(4): preprocessor error: #version must appear on the first line
146/147 tests returned correct results
FAIL
1/3 tests returned correct results
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
