Zebediah Figura : tests: Use % as the shader_test comment character.

Alexandre Julliard julliard at winehq.org
Tue Oct 5 15:50:42 CDT 2021


Module: vkd3d
Branch: master
Commit: 5f8becada45a014c58b2a6855d871a604524b7db
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=5f8becada45a014c58b2a6855d871a604524b7db

Author: Zebediah Figura <zfigura at codeweavers.com>
Date:   Sun Oct  3 19:19:07 2021 -0500

tests: Use % as the shader_test comment character.

So as to avoid clashing with the preprocessor.

Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Giovanni Mascellani <gmascellani at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 tests/hlsl-array-dimension.shader_test         | 3 ++-
 tests/hlsl-vector-indexing-uniform.shader_test | 2 +-
 tests/shader_runner_d3d12.c                    | 8 +++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/tests/hlsl-array-dimension.shader_test b/tests/hlsl-array-dimension.shader_test
index fdb52b1..469d36b 100644
--- a/tests/hlsl-array-dimension.shader_test
+++ b/tests/hlsl-array-dimension.shader_test
@@ -1,4 +1,5 @@
-# Test what kinds of expressions are valid array dimensions.
+% Test what kinds of expressions are valid array dimensions.
+
 [pixel shader]
 float4 main() : sv_target
 {
diff --git a/tests/hlsl-vector-indexing-uniform.shader_test b/tests/hlsl-vector-indexing-uniform.shader_test
index 2556b58..26a4587 100644
--- a/tests/hlsl-vector-indexing-uniform.shader_test
+++ b/tests/hlsl-vector-indexing-uniform.shader_test
@@ -1,4 +1,4 @@
-# Use a uniform to prevent the compiler from optimizing.
+% Use a uniform to prevent the compiler from optimizing.
 
 [pixel shader]
 uniform int i;
diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c
index d5c0380..a0cdc5b 100644
--- a/tests/shader_runner_d3d12.c
+++ b/tests/shader_runner_d3d12.c
@@ -452,13 +452,12 @@ START_TEST(shader_runner_d3d12)
 
             vkd3d_test_set_context("Section %.*s, line %u", strlen(line) - 1, line, line_number);
         }
-        else if (line[0] != '\n')
+        else if (line[0] != '%' && line[0] != '\n')
         {
             switch (state)
             {
                 case STATE_NONE:
-                    if (line[0] != '#')
-                        fprintf(stderr, "Ignoring line '%s' in %s.\n", line, argv[1]);
+                    fprintf(stderr, "Ignoring line '%s' in %s.\n", line, argv[1]);
                     break;
 
                 case STATE_PREPROC:
@@ -475,8 +474,7 @@ START_TEST(shader_runner_d3d12)
                 }
 
                 case STATE_TEST:
-                    if (line[0] != '#')
-                        parse_test_directive(&context, line);
+                    parse_test_directive(&context, line);
                     break;
             }
         }




More information about the wine-cvs mailing list