From e62e1dadb5fdbb821d198620cded9e8d17136d8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zef=20Kucia?= <jkucia@codeweavers.com>
Date: Tue, 4 Dec 2018 15:56:03 +0100
Subject: [PATCH] tests: Introduce enable_d3d12_debug_layer() helper function.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 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 aee2ccca..15989107 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 8f522e88..ececd781 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 40935428..5f764eb9 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);