Signed-off-by: Zebediah Figura zfigura@codeweavers.com --- dlls/d3d11/tests/d3d11.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 4a6da94aaae..2d26558568c 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -16555,8 +16555,7 @@ static void test_clear_image_unordered_access_view(void) { {D3D11_RESOURCE_DIMENSION_TEXTURE2D, D3D11_UAV_DIMENSION_TEXTURE2D, FALSE}, {D3D11_RESOURCE_DIMENSION_TEXTURE2D, D3D11_UAV_DIMENSION_TEXTURE2DARRAY, TRUE }, - /* Expected behaviour with partial layer coverage is unclear. */ - {D3D11_RESOURCE_DIMENSION_TEXTURE3D, D3D11_UAV_DIMENSION_TEXTURE3D, FALSE}, + {D3D11_RESOURCE_DIMENSION_TEXTURE3D, D3D11_UAV_DIMENSION_TEXTURE3D, TRUE }, };
if (!init_test_context(&test_context, NULL)) @@ -16575,13 +16574,15 @@ static void test_clear_image_unordered_access_view(void) { for (i = 0; i < ARRAY_SIZE(tests); ++i) { - winetest_push_context("Dim %u, Test %u", d, i); - if (tests[i].image_layers > 1 && !uav_dimensions[d].is_layered) - { - winetest_pop_context(); continue; - } + + /* Expected behaviour with partial layer coverage is unclear. */ + if (uav_dimensions[d].view_dim == D3D11_UAV_DIMENSION_TEXTURE3D + && tests[i].image_layers != tests[i].layer_count) + continue; + + winetest_push_context("Dim %u, Test %u", d, i);
resource_desc.dimension = uav_dimensions[d].resource_dim; resource_desc.depth_or_array_size = tests[i].image_layers;
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=105212
Your paranoid android.
=== w1064v1809 (32 bit report) ===
d3d11: d3d11.c:5924: Test failed: Got unexpected IAVertices count: 0. d3d11.c:5925: Test failed: Got unexpected IAPrimitives count: 0. d3d11.c:5926: Test failed: Got unexpected VSInvocations count: 0. d3d11.c:5929: Test failed: Got unexpected CInvocations count: 0. d3d11.c:5930: Test failed: Got unexpected CPrimitives count: 0.
=== w1064 (32 bit report) ===
d3d11: d3d11.c:5924: Test failed: Got unexpected IAVertices count: 0. d3d11.c:5925: Test failed: Got unexpected IAPrimitives count: 0. d3d11.c:5926: Test failed: Got unexpected VSInvocations count: 0. d3d11.c:5929: Test failed: Got unexpected CInvocations count: 0. d3d11.c:5930: Test failed: Got unexpected CPrimitives count: 0.
=== debian11 (32 bit report) ===
d3d11: Unhandled exception: page fault on read access to 0x00000010 in 32-bit code (0x6e953c24).
=== debian11 (32 bit Arabic:Morocco report) ===
d3d11: Unhandled exception: page fault on read access to 0x00000028 in 32-bit code (0x7e728e10).
=== debian11 (32 bit French report) ===
d3d11: d3d11: Timeout
=== debian11 (32 bit Hebrew:Israel report) ===
d3d11: Unhandled exception: page fault on read access to 0x00000010 in 32-bit code (0x7e9dd9cd).
=== debian11 (32 bit Hindi:India report) ===
d3d11: d3d11.c:9774: Test failed: d3d11.c:15278: Test marked todo: Got hr 0 for WRITE_DISCARD. Unhandled exception: page fault on read access to 0x0000001c in 32-bit code (0x6ed70068).
=== debian11 (32 bit Japanese:Japan report) ===
d3d11: Unhandled exception: page fault on read access to 0x00000010 in 32-bit code (0x7eb519cd).
=== debian11 (32 bit Chinese:China report) ===
d3d11: d3d11.c:9774: Test failed: d3d11.c:15278: Test marked todo: Got hr 0 for WRITE_DISCARD. Unhandled exception: page fault on write access to 0x00000014 in 32-bit code (0x7e14bac8).
=== debian11 (32 bit WoW report) ===
d3d11: Unhandled exception: page fault on read access to 0x0000005c in 32-bit code (0x7e205e22).
=== debian11 (64 bit WoW report) ===
d3d11: d3d11: Timeout