[PATCH vkd3d 10/10] tests: Introduce enable_d3d12_debug_layer() helper function.

[Józef Kucia]

From: Józef Kucia

Signed-off-by: Józef Kucia 
---
 tests/d3d12.c               |  1 +
 tests/d3d12_crosstest.h     | 17 +++++++++++++----
 tests/d3d12_invalid_usage.c |  1 +
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/tests/d3d12.c b/tests/d3d12.c
index aee2ccca4295..1598910718f4 100644
--- a/tests/d3d12.c
+++ b/tests/d3d12.c
@@ -21810,6 +21810,7 @@ static void test_primitive_restart(void)
 START_TEST(d3d12)
 {
     parse_args(argc, argv);
+    enable_d3d12_debug_layer(argc, argv);
     print_adapter_info();

run_test(test_create_device);
diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h
index 8f522e880b16..ececd7810329 100644
--- a/tests/d3d12_crosstest.h
+++ b/tests/d3d12_crosstest.h
@@ -317,6 +317,19 @@ static ID3D12Device *create_device(void)
 }

static void parse_args(int argc, char **argv)
+{
+    unsigned int i;
+
+    for (i = 1; i < argc; ++i)
+    {
+        if (!strcmp(argv[i], "--warp"))
+            use_warp_device = true;
+        else if (!strcmp(argv[i], "--adapter") && i + 1 < argc)
+            use_adapter_idx = atoi(argv[++i]);
+    }
+}
+
+static void enable_d3d12_debug_layer(int argc, char **argv)
 {
     bool enable_debug_layer = false;
     ID3D12Debug *debug;
@@ -326,10 +339,6 @@ static void parse_args(int argc, char **argv)
     {
         if (!strcmp(argv[i], "--validate"))
             enable_debug_layer = true;
-        else if (!strcmp(argv[i], "--warp"))
-            use_warp_device = true;
-        else if (!strcmp(argv[i], "--adapter") && i + 1 < argc)
-            use_adapter_idx = atoi(argv[++i]);
     }

if (enable_debug_layer && SUCCEEDED(D3D12GetDebugInterface(&IID_ID3D12Debug, (void **)&debug)))
diff --git a/tests/d3d12_invalid_usage.c b/tests/d3d12_invalid_usage.c
index 40935428f5ad..5f764eb95fe0 100644
--- a/tests/d3d12_invalid_usage.c
+++ b/tests/d3d12_invalid_usage.c
@@ -153,6 +153,7 @@ static void test_invalid_texture_resource_barriers(void)
 START_TEST(d3d12_invalid_usage)
 {
     parse_args(argc, argv);
+    enable_d3d12_debug_layer(argc, argv);
     print_adapter_info();

run_test(test_invalid_texture_resource_barriers);

[Marvin]

Hi,

While running your changed tests on Windows, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=45442

Your paranoid android.

=== debian9 (build log) ===

Task: Patch failed to apply

=== debian9 (build log) ===

Task: Patch failed to apply

[Henri Verbeet]

Signed-off-by: Henri Verbeet