[PATCH 0/2] MR5818: d3d11/tests: Other tests for NV12 textures.
From: Giovanni Mascellani <gmascellani(a)codeweavers.com> Apparently no Vulkan implementation allows rendering to a NV12 texture. So we require render target binding capabilities only when we're really testing rendering. --- dlls/d3d11/tests/d3d11.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index c8112cb8442..7bba103aeb5 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -36329,6 +36329,8 @@ static void test_nv12(void) expected_row_pitch = (width + 3) & ~3; expected_depth_pitch = expected_row_pitch * height * 3 / 2; + /* Apparently no Vulkan implementation supports rendering to a NV12 texture, so here we do + * not request D3D11_BIND_RENDER_TARGET. We will recreate it later for render target usage. */ desc.Width = width; desc.Height = height; desc.MipLevels = 1; @@ -36336,7 +36338,7 @@ static void test_nv12(void) desc.Format = DXGI_FORMAT_NV12; desc.SampleDesc.Count = 1; desc.Usage = D3D11_USAGE_DEFAULT; - desc.BindFlags = D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_RENDER_TARGET; + desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; content = calloc(expected_depth_pitch, 1); ok(!!content, "Failed to allocate memory.\n"); @@ -36421,6 +36423,31 @@ static void test_nv12(void) check_readback_data_u8_with_buffer(&rb, content, expected_row_pitch, expected_depth_pitch); release_resource_readback(&rb); + ID3D11ShaderResourceView_Release(srvs[0]); + ID3D11ShaderResourceView_Release(srvs[1]); + ID3D11Texture2D_Release(texture); + + desc.Height = height; + desc.Format = DXGI_FORMAT_NV12; + desc.BindFlags = D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_RENDER_TARGET; + + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); + todo_wine + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + if (FAILED(hr)) + goto no_render_target; + + srv_desc.Format = DXGI_FORMAT_R8_UINT; + + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, &srv_desc, &srvs[0]); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + srv_desc.Format = DXGI_FORMAT_R8G8_UINT; + + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, &srv_desc, &srvs[1]); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + rtv_desc.Format = DXGI_FORMAT_R8_UINT; rtv_desc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2D; rtv_desc.Texture2D.MipSlice = 0; @@ -36460,6 +36487,8 @@ static void test_nv12(void) ID3D11RenderTargetView_Release(rtv2); ID3D11RenderTargetView_Release(rtv1); + + no_render_target: ID3D11Buffer_Release(cbuffer); ID3D11UnorderedAccessView_Release(check_uav); ID3D11ShaderResourceView_Release(srvs[1]); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5818
From: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 91 ++++++++++++++++++++++++++++++++++------ 1 file changed, 79 insertions(+), 12 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 7bba103aeb5..97df09025bb 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -36268,18 +36268,30 @@ static void test_nv12(void) { uint32_t width; uint32_t height; + uint32_t copy_x; + uint32_t copy_y; + uint32_t copy_width; + uint32_t copy_height; } tests[] = { - {640, 480}, - {640, 481}, - {641, 480}, - {641, 481}, - {642, 480}, - {642, 481}, - {642, 482}, - {644, 482}, - {644, 484}, + {640, 480, 10, 20, 4, 6}, + {640, 480, 10, 20, 4, 7}, + {640, 480, 10, 20, 5, 6}, + {640, 480, 10, 20, 5, 7}, + + {640, 480, 10, 21, 4, 6}, + {640, 480, 11, 20, 4, 6}, + {640, 480, 11, 21, 4, 6}, + + {640, 481, 10, 20, 4, 6}, + {641, 480, 10, 20, 4, 6}, + {641, 481, 10, 20, 4, 6}, + {642, 480, 10, 20, 4, 6}, + {642, 481, 10, 20, 4, 6}, + {642, 482, 10, 20, 4, 6}, + {644, 482, 10, 20, 4, 6}, + {644, 484, 10, 20, 4, 6}, }; if (!init_test_context(&test_context, NULL)) @@ -36311,6 +36323,7 @@ static void test_nv12(void) D3D11_SUBRESOURCE_DATA subresource_data = {0}; D3D11_RENDER_TARGET_VIEW_DESC rtv_desc = {0}; ID3D11Texture2D *texture, *check_texture; + char *content, *content2, *copy_source; ID3D11UnorderedAccessView *check_uav; ID3D11RenderTargetView *rtv1, *rtv2; ID3D11ShaderResourceView *srvs[2]; @@ -36319,12 +36332,17 @@ static void test_nv12(void) ID3D11Buffer *cbuffer; HRESULT expected_hr; unsigned int i, j; - char *content; + D3D11_BOX box; const uint32_t width = tests[test_idx].width; const uint32_t height = tests[test_idx].height; + const uint32_t copy_x = tests[test_idx].copy_x; + const uint32_t copy_y = tests[test_idx].copy_y; + const uint32_t copy_width = tests[test_idx].copy_width; + const uint32_t copy_height = tests[test_idx].copy_height; - winetest_push_context("test %u (%ux%u)", test_idx, width, height); + winetest_push_context("test %u (%ux%u, %u,%u,%ux%u)", test_idx, width, height, + copy_x, copy_y, copy_width, copy_height); expected_row_pitch = (width + 3) & ~3; expected_depth_pitch = expected_row_pitch * height * 3 / 2; @@ -36341,7 +36359,9 @@ static void test_nv12(void) desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; content = calloc(expected_depth_pitch, 1); - ok(!!content, "Failed to allocate memory.\n"); + content2 = calloc(expected_depth_pitch, 1); + copy_source = calloc(copy_width * copy_height * 3 / 2, 1); + ok(!!content || !!content2 || !!copy_source, "Failed to allocate memory.\n"); for (i = 0; i < height; ++i) { @@ -36423,6 +36443,53 @@ static void test_nv12(void) check_readback_data_u8_with_buffer(&rb, content, expected_row_pitch, expected_depth_pitch); release_resource_readback(&rb); + memcpy(content2, content, expected_depth_pitch); + if (copy_x % 2 == 0 && copy_y % 2 == 0 && copy_width % 2 == 0 && copy_height % 2 == 0) + { + for (i = copy_y; i < copy_y + copy_height; ++i) + { + for (j = copy_x; j < copy_x + copy_width; ++j) + { + content2[i * expected_row_pitch + j] = 0xab; + if (i % 2 == 0 && j % 2 == 0) + { + content2[expected_row_pitch * (height + i / 2) + j] = 0xcd; + content2[expected_row_pitch * (height + i / 2) + j + 1] = 0xef; + } + } + } + for (i = 0; i < copy_height; ++i) + { + for (j = 0; j < copy_width; ++j) + { + copy_source[i * copy_width + j] = 0xab; + if (i % 2 == 0 && j % 2 == 0) + { + copy_source[copy_width * (copy_height + i / 2) + j] = 0xcd; + copy_source[copy_width * (copy_height + i / 2) + j + 1] = 0xef; + } + } + } + } + + /* UpdateSubresource() copies the specified box on the luma plane and also the corresponding + * box on the chroma plane. It does nothing as soon as any coordinate of the box is not a + * multiple of 2. */ + set_box(&box, copy_x, copy_y, 0, copy_x + copy_width, copy_y + copy_height, 1); + ID3D11DeviceContext_UpdateSubresource(device_context, + (ID3D11Resource *)texture, 0, &box, copy_source, copy_width, 0); + + ID3D11DeviceContext_ClearUnorderedAccessViewUint(device_context, check_uav, clear_values); + ID3D11DeviceContext_CSSetShader(device_context, cs, NULL, 0); + ID3D11DeviceContext_CSSetShaderResources(device_context, 0, ARRAY_SIZE(srvs), srvs); + ID3D11DeviceContext_CSSetUnorderedAccessViews(device_context, 1, 1, &check_uav, NULL); + ID3D11DeviceContext_CSSetConstantBuffers(device_context, 0, 1, &cbuffer); + ID3D11DeviceContext_Dispatch(device_context, width, height, 1); + + get_texture_readback(check_texture, 0, &rb); + check_readback_data_u8_with_buffer(&rb, content2, expected_row_pitch, expected_depth_pitch); + release_resource_readback(&rb); + ID3D11ShaderResourceView_Release(srvs[0]); ID3D11ShaderResourceView_Release(srvs[1]); ID3D11Texture2D_Release(texture); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5818
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=146191 Your paranoid android. === w7u_2qxl (32 bit report) === d3d11: d3d11.c:36394: Test failed: test 0 (640x480, 10,20,4x6): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 1 (640x480, 10,20,4x7): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 2 (640x480, 10,20,5x6): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 3 (640x480, 10,20,5x7): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 4 (640x480, 10,21,4x6): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 5 (640x480, 11,20,4x6): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 6 (640x480, 11,21,4x6): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 10 (642x480, 10,20,4x6): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 12 (642x482, 10,20,4x6): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 13 (644x482, 10,20,4x6): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 14 (644x484, 10,20,4x6): Got hr 0x80070057, expected 0. === w7u_adm (32 bit report) === d3d11: d3d11.c:36394: Test failed: test 0 (640x480, 10,20,4x6): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 1 (640x480, 10,20,4x7): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 2 (640x480, 10,20,5x6): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 3 (640x480, 10,20,5x7): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 4 (640x480, 10,21,4x6): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 5 (640x480, 11,20,4x6): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 6 (640x480, 11,21,4x6): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 10 (642x480, 10,20,4x6): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 12 (642x482, 10,20,4x6): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 13 (644x482, 10,20,4x6): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 14 (644x484, 10,20,4x6): Got hr 0x80070057, expected 0. === w7u_el (32 bit report) === d3d11: d3d11.c:36394: Test failed: test 0 (640x480, 10,20,4x6): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 1 (640x480, 10,20,4x7): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 2 (640x480, 10,20,5x6): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 3 (640x480, 10,20,5x7): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 4 (640x480, 10,21,4x6): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 5 (640x480, 11,20,4x6): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 6 (640x480, 11,21,4x6): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 10 (642x480, 10,20,4x6): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 12 (642x482, 10,20,4x6): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 13 (644x482, 10,20,4x6): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 14 (644x484, 10,20,4x6): Got hr 0x80070057, expected 0. === w7pro64 (64 bit report) === d3d11: d3d11.c:36394: Test failed: test 0 (640x480, 10,20,4x6): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 1 (640x480, 10,20,4x7): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 2 (640x480, 10,20,5x6): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 3 (640x480, 10,20,5x7): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 4 (640x480, 10,21,4x6): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 5 (640x480, 11,20,4x6): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 6 (640x480, 11,21,4x6): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 10 (642x480, 10,20,4x6): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 12 (642x482, 10,20,4x6): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 13 (644x482, 10,20,4x6): Got hr 0x80070057, expected 0. d3d11.c:36394: Test failed: test 14 (644x484, 10,20,4x6): Got hr 0x80070057, expected 0. === w11pro64_amd (64 bit report) === d3d11: d3d11.c:36443: Test failed: test 0 (640x480, 10,20,4x6): Got row pitch 768 instead of 640. d3d11.c:36443: Test failed: test 0 (640x480, 10,20,4x6): Got depth pitch 552960 instead of 640. d3d11.c:36490: Test failed: test 0 (640x480, 10,20,4x6): Got row pitch 768 instead of 640. d3d11.c:36490: Test failed: test 0 (640x480, 10,20,4x6): Got depth pitch 552960 instead of 640. d3d11.c:36490: Test failed: test 0 (640x480, 10,20,4x6): Got 0x00, expected 0xab at (10, 21, 0), sub-resource 0. d3d11.c:36552: Test failed: test 0 (640x480, 10,20,4x6): Got row pitch 768 instead of 640. d3d11.c:36552: Test failed: test 0 (640x480, 10,20,4x6): Got depth pitch 552960 instead of 640. d3d11.c:36443: Test failed: test 1 (640x480, 10,20,4x7): Got row pitch 768 instead of 640. d3d11.c:36443: Test failed: test 1 (640x480, 10,20,4x7): Got depth pitch 552960 instead of 640. d3d11.c:36490: Test failed: test 1 (640x480, 10,20,4x7): Got row pitch 768 instead of 640. d3d11.c:36490: Test failed: test 1 (640x480, 10,20,4x7): Got depth pitch 552960 instead of 640. d3d11.c:36552: Test failed: test 1 (640x480, 10,20,4x7): Got row pitch 768 instead of 640. d3d11.c:36552: Test failed: test 1 (640x480, 10,20,4x7): Got depth pitch 552960 instead of 640. d3d11.c:36443: Test failed: test 2 (640x480, 10,20,5x6): Got row pitch 768 instead of 640. d3d11.c:36443: Test failed: test 2 (640x480, 10,20,5x6): Got depth pitch 552960 instead of 640. d3d11.c:36490: Test failed: test 2 (640x480, 10,20,5x6): Got row pitch 768 instead of 640. d3d11.c:36490: Test failed: test 2 (640x480, 10,20,5x6): Got depth pitch 552960 instead of 640. d3d11.c:36552: Test failed: test 2 (640x480, 10,20,5x6): Got row pitch 768 instead of 640. d3d11.c:36552: Test failed: test 2 (640x480, 10,20,5x6): Got depth pitch 552960 instead of 640. d3d11.c:36443: Test failed: test 3 (640x480, 10,20,5x7): Got row pitch 768 instead of 640. d3d11.c:36443: Test failed: test 3 (640x480, 10,20,5x7): Got depth pitch 552960 instead of 640. d3d11.c:36490: Test failed: test 3 (640x480, 10,20,5x7): Got row pitch 768 instead of 640. d3d11.c:36490: Test failed: test 3 (640x480, 10,20,5x7): Got depth pitch 552960 instead of 640. d3d11.c:36552: Test failed: test 3 (640x480, 10,20,5x7): Got row pitch 768 instead of 640. d3d11.c:36552: Test failed: test 3 (640x480, 10,20,5x7): Got depth pitch 552960 instead of 640. d3d11.c:36443: Test failed: test 4 (640x480, 10,21,4x6): Got row pitch 768 instead of 640. d3d11.c:36443: Test failed: test 4 (640x480, 10,21,4x6): Got depth pitch 552960 instead of 640. d3d11.c:36490: Test failed: test 4 (640x480, 10,21,4x6): Got row pitch 768 instead of 640. d3d11.c:36490: Test failed: test 4 (640x480, 10,21,4x6): Got depth pitch 552960 instead of 640. d3d11.c:36552: Test failed: test 4 (640x480, 10,21,4x6): Got row pitch 768 instead of 640. d3d11.c:36552: Test failed: test 4 (640x480, 10,21,4x6): Got depth pitch 552960 instead of 640. d3d11.c:36443: Test failed: test 5 (640x480, 11,20,4x6): Got row pitch 768 instead of 640. d3d11.c:36443: Test failed: test 5 (640x480, 11,20,4x6): Got depth pitch 552960 instead of 640. d3d11.c:36490: Test failed: test 5 (640x480, 11,20,4x6): Got row pitch 768 instead of 640. d3d11.c:36490: Test failed: test 5 (640x480, 11,20,4x6): Got depth pitch 552960 instead of 640. d3d11.c:36552: Test failed: test 5 (640x480, 11,20,4x6): Got row pitch 768 instead of 640. d3d11.c:36552: Test failed: test 5 (640x480, 11,20,4x6): Got depth pitch 552960 instead of 640. d3d11.c:36443: Test failed: test 6 (640x480, 11,21,4x6): Got row pitch 768 instead of 640. d3d11.c:36443: Test failed: test 6 (640x480, 11,21,4x6): Got depth pitch 552960 instead of 640. d3d11.c:36490: Test failed: test 6 (640x480, 11,21,4x6): Got row pitch 768 instead of 640. d3d11.c:36490: Test failed: test 6 (640x480, 11,21,4x6): Got depth pitch 552960 instead of 640. d3d11.c:36552: Test failed: test 6 (640x480, 11,21,4x6): Got row pitch 768 instead of 640. d3d11.c:36552: Test failed: test 6 (640x480, 11,21,4x6): Got depth pitch 552960 instead of 640. d3d11.c:36443: Test failed: test 10 (642x480, 10,20,4x6): Got row pitch 768 instead of 644. d3d11.c:36443: Test failed: test 10 (642x480, 10,20,4x6): Got depth pitch 552960 instead of 644. d3d11.c:36490: Test failed: test 10 (642x480, 10,20,4x6): Got row pitch 768 instead of 644. d3d11.c:36490: Test failed: test 10 (642x480, 10,20,4x6): Got depth pitch 552960 instead of 644. d3d11.c:36490: Test failed: test 10 (642x480, 10,20,4x6): Got 0x00, expected 0xab at (10, 21, 0), sub-resource 0. d3d11.c:36552: Test failed: test 10 (642x480, 10,20,4x6): Got row pitch 768 instead of 644. d3d11.c:36552: Test failed: test 10 (642x480, 10,20,4x6): Got depth pitch 552960 instead of 644. d3d11.c:36443: Test failed: test 12 (642x482, 10,20,4x6): Got row pitch 768 instead of 644. d3d11.c:36443: Test failed: test 12 (642x482, 10,20,4x6): Got depth pitch 555264 instead of 644. d3d11.c:36490: Test failed: test 12 (642x482, 10,20,4x6): Got row pitch 768 instead of 644. d3d11.c:36490: Test failed: test 12 (642x482, 10,20,4x6): Got depth pitch 555264 instead of 644. d3d11.c:36490: Test failed: test 12 (642x482, 10,20,4x6): Got 0x00, expected 0xab at (10, 21, 0), sub-resource 0. d3d11.c:36552: Test failed: test 12 (642x482, 10,20,4x6): Got row pitch 768 instead of 644. d3d11.c:36552: Test failed: test 12 (642x482, 10,20,4x6): Got depth pitch 555264 instead of 644. d3d11.c:36443: Test failed: test 13 (644x482, 10,20,4x6): Got row pitch 768 instead of 644. d3d11.c:36443: Test failed: test 13 (644x482, 10,20,4x6): Got depth pitch 555264 instead of 644. d3d11.c:36490: Test failed: test 13 (644x482, 10,20,4x6): Got row pitch 768 instead of 644. d3d11.c:36490: Test failed: test 13 (644x482, 10,20,4x6): Got depth pitch 555264 instead of 644. d3d11.c:36490: Test failed: test 13 (644x482, 10,20,4x6): Got 0x00, expected 0xab at (10, 21, 0), sub-resource 0. d3d11.c:36552: Test failed: test 13 (644x482, 10,20,4x6): Got row pitch 768 instead of 644. d3d11.c:36552: Test failed: test 13 (644x482, 10,20,4x6): Got depth pitch 555264 instead of 644. d3d11.c:36443: Test failed: test 14 (644x484, 10,20,4x6): Got row pitch 768 instead of 644. d3d11.c:36443: Test failed: test 14 (644x484, 10,20,4x6): Got depth pitch 557568 instead of 644. d3d11.c:36490: Test failed: test 14 (644x484, 10,20,4x6): Got row pitch 768 instead of 644. d3d11.c:36490: Test failed: test 14 (644x484, 10,20,4x6): Got depth pitch 557568 instead of 644. d3d11.c:36490: Test failed: test 14 (644x484, 10,20,4x6): Got 0x00, expected 0xab at (10, 21, 0), sub-resource 0. d3d11.c:36552: Test failed: test 14 (644x484, 10,20,4x6): Got row pitch 768 instead of 644. d3d11.c:36552: Test failed: test 14 (644x484, 10,20,4x6): Got depth pitch 557568 instead of 644.
participants (3)
-
Giovanni Mascellani -
Giovanni Mascellani (ļ¼ giomasce)
-
Marvin