From: Józef Kucia Subject: [PATCH vkd3d 3/9] tests: Detect when WARP is used. Message-Id: <20181211144805.31339-3-joseph.kucia@gmail.com> Date: Tue, 11 Dec 2018 15:47:59 +0100 From: Józef Kucia Signed-off-by: Józef Kucia --- tests/d3d12.c | 2 +- tests/d3d12_crosstest.h | 10 ++++++++-- tests/d3d12_invalid_usage.c | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 9ec71f4bb74c..c127f6bd1d35 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21833,7 +21833,7 @@ START_TEST(d3d12) { parse_args(argc, argv); enable_d3d12_debug_layer(argc, argv); - print_adapter_info(); + init_adapter_info(); run_test(test_create_device); run_test(test_node_count); diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index ececd7810329..94aa4e5fc57f 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -267,7 +267,7 @@ static IUnknown *create_adapter(void) return adapter; } -static void print_adapter_info(void) +static void init_adapter_info(void) { IDXGIAdapter *dxgi_adapter; DXGI_ADAPTER_DESC desc; @@ -286,6 +286,12 @@ static void print_adapter_info(void) trace("Adapter: %04x:%04x.\n", desc.VendorId, desc.DeviceId); + if (desc.VendorId == 0x1414 && desc.DeviceId == 0x008c) + { + trace("Using WARP device.\n"); + use_warp_device = true; + } + IDXGIAdapter_Release(dxgi_adapter); } #else @@ -294,7 +300,7 @@ static IUnknown *create_adapter(void) return NULL; } -static void print_adapter_info(void) {} +static void init_adapter_info(void) {} #endif static ID3D12Device *create_device(void) diff --git a/tests/d3d12_invalid_usage.c b/tests/d3d12_invalid_usage.c index 5f764eb95fe0..940dea91d4ec 100644 --- a/tests/d3d12_invalid_usage.c +++ b/tests/d3d12_invalid_usage.c @@ -154,7 +154,7 @@ START_TEST(d3d12_invalid_usage) { parse_args(argc, argv); enable_d3d12_debug_layer(argc, argv); - print_adapter_info(); + init_adapter_info(); run_test(test_invalid_texture_resource_barriers); } -- 2.19.2