tests: Introduce parse_args() helper function.

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>
This commit is contained in:
Józef Kucia 2018-12-04 15:56:02 +01:00 committed by Alexandre Julliard
parent 03eba4b0ad
commit 96f9b1b771
3 changed files with 25 additions and 40 deletions

View File

@ -21809,26 +21809,7 @@ static void test_primitive_restart(void)
START_TEST(d3d12) START_TEST(d3d12)
{ {
bool enable_debug_layer = false; parse_args(argc, argv);
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);
}
print_adapter_info(); print_adapter_info();
run_test(test_create_device); run_test(test_create_device);

View File

@ -316,4 +316,27 @@ static ID3D12Device *create_device(void)
return SUCCEEDED(hr) ? device : NULL; 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 */ #endif /* __VKD3D_D3D12_CROSSTEST_H */

View File

@ -152,26 +152,7 @@ static void test_invalid_texture_resource_barriers(void)
START_TEST(d3d12_invalid_usage) START_TEST(d3d12_invalid_usage)
{ {
bool enable_debug_layer = false; parse_args(argc, argv);
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);
}
print_adapter_info(); print_adapter_info();
run_test(test_invalid_texture_resource_barriers); run_test(test_invalid_texture_resource_barriers);