[PATCH v2 0/3] MR765: tests: Do not crash on llvmpipe.

[Giovanni Mascellani (＠giomasce)]

--
  v2: tests: Pop the test context when leaving its scope.
      tests: Skip tests that crash on llvmpipe.
 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/765

[PATCH v2 1/3] tests: Do not crash on some test failures.

[Giovanni Mascellani]

From: Giovanni Mascellani <gmascellani(a)codeweavers.com>

This failures are observed to happen on llvmpipe.
---
 tests/d3d12.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tests/d3d12.c b/tests/d3d12.c
index b8d20a581..729a971ed 100644
--- a/tests/d3d12.c
+++ b/tests/d3d12.c
@@ -19216,6 +19216,12 @@ static void test_descriptors_visibility(void)
     hr = create_root_signature(device, &root_signature_desc, &context.root_signature);
     ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr);
 
+    if (FAILED(hr))
+    {
+        destroy_test_context(&context);
+        return;
+    }
+
     context.pipeline_state = create_pipeline_state(device,
             context.root_signature, context.render_target_desc.Format,
             &vs, &ps, NULL);
@@ -20860,6 +20866,12 @@ static void test_depth_stencil_sampling(void)
     hr = create_root_signature(device, &root_signature_desc, &context.root_signature);
     ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr);
 
+    if (FAILED(hr))
+    {
+        destroy_test_context(&context);
+        return;
+    }
+
     pso_compare = create_pipeline_state(device,
             context.root_signature, context.render_target_desc.Format, NULL, &ps_compare, NULL);
     pso_depth = create_pipeline_state(device,
-- 
GitLab


https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/765

[PATCH v2 2/3] tests: Skip tests that crash on llvmpipe.

[Giovanni Mascellani]

From: Giovanni Mascellani <gmascellani(a)codeweavers.com>

---
 tests/d3d12.c           | 14 ++++++++++++++
 tests/d3d12_crosstest.h | 14 ++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/tests/d3d12.c b/tests/d3d12.c
index 729a971ed..d87ace5a8 100644
--- a/tests/d3d12.c
+++ b/tests/d3d12.c
@@ -19586,6 +19586,13 @@ static void test_null_srv(void)
     queue = context.queue;
     device = context.device;
 
+    if (is_llvmpipe_device(device))
+    {
+        skip("Test crashes on llvmpipe, skipping.\n");
+        destroy_test_context(&context);
+        return;
+    }
+
     context.root_signature = create_texture_root_signature(context.device,
             D3D12_SHADER_VISIBILITY_PIXEL, 4, 0);
 
@@ -19801,6 +19808,13 @@ static void test_null_uav(void)
     command_list = context.list;
     queue = context.queue;
 
+    if (is_llvmpipe_device(device))
+    {
+        skip("Test crashes on llvmpipe, skipping.\n");
+        destroy_test_context(&context);
+        return;
+    }
+
     descriptor_ranges[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_UAV;
     descriptor_ranges[0].NumDescriptors = 1;
     descriptor_ranges[0].BaseShaderRegister = 1;
diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h
index 6c0a4ef12..77be976f6 100644
--- a/tests/d3d12_crosstest.h
+++ b/tests/d3d12_crosstest.h
@@ -401,6 +401,11 @@ static inline bool is_mesa_intel_device(ID3D12Device *device)
     return false;
 }
 
+static inline bool is_llvmpipe_device(ID3D12Device *device)
+{
+    return false;
+}
+
 static inline bool is_nvidia_device(ID3D12Device *device)
 {
     return false;
@@ -638,6 +643,7 @@ static inline bool is_mesa_device(ID3D12Device *device)
 
     get_driver_properties(device, &properties);
     return properties.driverID == VK_DRIVER_ID_MESA_RADV_KHR
+            || properties.driverID == VK_DRIVER_ID_MESA_LLVMPIPE
             || properties.driverID == VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA_KHR;
 }
 
@@ -649,6 +655,14 @@ static inline bool is_mesa_intel_device(ID3D12Device *device)
     return properties.driverID == VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA_KHR;
 }
 
+static inline bool is_llvmpipe_device(ID3D12Device *device)
+{
+    VkPhysicalDeviceDriverPropertiesKHR properties;
+
+    get_driver_properties(device, &properties);
+    return properties.driverID == VK_DRIVER_ID_MESA_LLVMPIPE;
+}
+
 static inline bool is_nvidia_device(ID3D12Device *device)
 {
     VkPhysicalDeviceDriverPropertiesKHR properties;
-- 
GitLab


https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/765

[PATCH v2 3/3] tests: Pop the test context when leaving its scope.

[Giovanni Mascellani]

From: Giovanni Mascellani <gmascellani(a)codeweavers.com>

---
 tests/d3d12.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/d3d12.c b/tests/d3d12.c
index d87ace5a8..bca546e6e 100644
--- a/tests/d3d12.c
+++ b/tests/d3d12.c
@@ -32464,7 +32464,10 @@ static void test_resource_allocation_info(void)
         ok(infos1[i].SizeInBytes == sizes[i], "Got unexpected size %"PRIu64".\n", infos1[i].SizeInBytes);
 
         if (!i)
+        {
+            vkd3d_test_pop_context();
             continue;
+        }
 
         ok(infos1[i].Offset - infos1[i - 1].Offset >= infos1[i - 1].SizeInBytes,
                 "Got unexpected prev size %"PRIu64", prev offset %"PRIu64", offset %"PRIu64".\n",
-- 
GitLab

https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/765

[Henri Verbeet (＠hverbeet)]

Where do these crashes happen exactly? I don't think I see them on the CI.

-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/765#note_67242