[PATCH vkd3d 2/6] tests: Use assert_that() in get_buffer_readback_with_command_list().

Conor McCarthy cmccarthy at codeweavers.com
Wed Sep 8 23:46:54 CDT 2021


Allows use of todo with check_buffer_uint().

Signed-off-by: Conor McCarthy <cmccarthy at codeweavers.com>
---
 tests/d3d12.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/d3d12.c b/tests/d3d12.c
index c9e75e08..f782ef1f 100644
--- a/tests/d3d12.c
+++ b/tests/d3d12.c
@@ -317,14 +317,14 @@ static void get_buffer_readback_with_command_list(ID3D12Resource *buffer, DXGI_F
     HRESULT hr;
 
     hr = ID3D12Resource_GetDevice(buffer, &IID_ID3D12Device, (void **)&device);
-    ok(SUCCEEDED(hr), "Failed to get device, hr %#x.\n", hr);
+    assert_that(SUCCEEDED(hr), "Failed to get device, hr %#x.\n", hr);
 
     resource_desc = ID3D12Resource_GetDesc(buffer);
-    assert(resource_desc.Dimension == D3D12_RESOURCE_DIMENSION_BUFFER);
+    assert_that(resource_desc.Dimension == D3D12_RESOURCE_DIMENSION_BUFFER, "Resource %p is not a buffer.\n", buffer);
     resource_desc.Flags = D3D12_RESOURCE_FLAG_DENY_SHADER_RESOURCE;
 
     hr = ID3D12Resource_GetHeapProperties(buffer, &heap_properties, NULL);
-    ok(SUCCEEDED(hr), "Failed to get heap properties.\n");
+    assert_that(SUCCEEDED(hr), "Failed to get heap properties.\n");
     if (heap_properties.Type == D3D12_HEAP_TYPE_READBACK)
     {
         rb_buffer = buffer;
@@ -338,7 +338,7 @@ static void get_buffer_readback_with_command_list(ID3D12Resource *buffer, DXGI_F
     }
 
     hr = ID3D12GraphicsCommandList_Close(command_list);
-    ok(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr);
+    assert_that(SUCCEEDED(hr), "Failed to close command list, hr %#x.\n", hr);
 
     exec_command_list(queue, command_list);
     wait_queue_idle(device, queue);
@@ -354,7 +354,7 @@ static void get_buffer_readback_with_command_list(ID3D12Resource *buffer, DXGI_F
     read_range.Begin = 0;
     read_range.End = resource_desc.Width;
     hr = ID3D12Resource_Map(rb_buffer, 0, &read_range, &rb->data);
-    ok(SUCCEEDED(hr), "Failed to map readback buffer, hr %#x.\n", hr);
+    assert_that(SUCCEEDED(hr), "Failed to map readback buffer, hr %#x.\n", hr);
 }
 
 static uint8_t get_readback_uint8(struct resource_readback *rb, unsigned int x, unsigned int y)
-- 
2.32.0




More information about the wine-devel mailing list