=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: tests: Introduce parse_args() helper function.
Alexandre Julliard
julliard at winehq.org
Tue Dec 4 13:22:16 CST 2018
Module: vkd3d
Branch: master
Commit: 96f9b1b7717a07337b5f2c00a7c9fe2322e90b6d
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=96f9b1b7717a07337b5f2c00a7c9fe2322e90b6d
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Tue Dec 4 15:56:02 2018 +0100
tests: Introduce parse_args() helper function.
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
tests/d3d12.c | 21 +--------------------
tests/d3d12_crosstest.h | 23 +++++++++++++++++++++++
tests/d3d12_invalid_usage.c | 21 +--------------------
3 files changed, 25 insertions(+), 40 deletions(-)
diff --git a/tests/d3d12.c b/tests/d3d12.c
index 3123018..aee2ccc 100644
--- a/tests/d3d12.c
+++ b/tests/d3d12.c
@@ -21809,26 +21809,7 @@ static void test_primitive_restart(void)
START_TEST(d3d12)
{
- bool enable_debug_layer = false;
- ID3D12Debug *debug;
- unsigned int i;
-
- for (i = 1; i < argc; ++i)
- {
- 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)))
- {
- ID3D12Debug_EnableDebugLayer(debug);
- ID3D12Debug_Release(debug);
- }
-
+ parse_args(argc, argv);
print_adapter_info();
run_test(test_create_device);
diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h
index ddba9fe..8f522e8 100644
--- a/tests/d3d12_crosstest.h
+++ b/tests/d3d12_crosstest.h
@@ -316,4 +316,27 @@ static ID3D12Device *create_device(void)
return SUCCEEDED(hr) ? device : NULL;
}
+static void parse_args(int argc, char **argv)
+{
+ bool enable_debug_layer = false;
+ ID3D12Debug *debug;
+ unsigned int i;
+
+ for (i = 1; i < argc; ++i)
+ {
+ 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)))
+ {
+ ID3D12Debug_EnableDebugLayer(debug);
+ ID3D12Debug_Release(debug);
+ }
+}
+
#endif /* __VKD3D_D3D12_CROSSTEST_H */
diff --git a/tests/d3d12_invalid_usage.c b/tests/d3d12_invalid_usage.c
index ce354b8..4093542 100644
--- a/tests/d3d12_invalid_usage.c
+++ b/tests/d3d12_invalid_usage.c
@@ -152,26 +152,7 @@ static void test_invalid_texture_resource_barriers(void)
START_TEST(d3d12_invalid_usage)
{
- bool enable_debug_layer = false;
- ID3D12Debug *debug;
- unsigned int i;
-
- for (i = 1; i < argc; ++i)
- {
- 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)))
- {
- ID3D12Debug_EnableDebugLayer(debug);
- ID3D12Debug_Release(debug);
- }
-
+ parse_args(argc, argv);
print_adapter_info();
run_test(test_invalid_texture_resource_barriers);
More information about the wine-cvs
mailing list