Signed-off-by: Michael Stefaniuc mstefani@winehq.org --- dlls/d3d11/tests/d3d11.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3c870c27e7..90e213801d 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2198,7 +2198,7 @@ static void test_create_texture1d(void) desc.Format = DXGI_FORMAT_R32G32B32A32_TYPELESS; desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; desc.MiscFlags = 0; - hr = ID3D11Device_CreateTexture1D(device, &desc, NULL, (ID3D11Texture1D **)&texture); + hr = ID3D11Device_CreateTexture1D(device, &desc, NULL, &texture); ok(hr == (i ? S_OK : E_INVALIDARG), "Test %u: Got unexpected hr %#x.\n", i, hr); if (SUCCEEDED(hr)) ID3D11Texture1D_Release(texture); @@ -2572,7 +2572,7 @@ static void test_create_texture2d(void) desc.Format = tests[i].format; desc.BindFlags = tests[i].bind_flags; desc.MiscFlags = tests[i].misc_flags; - hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, (ID3D11Texture2D **)&texture); + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture);
todo_wine_if(todo) ok(hr == expected_hr, "Test %u: Got unexpected hr %#x (format %#x).\n", @@ -2845,7 +2845,7 @@ static void test_create_texture3d(void) { desc.Format = tests[i].format; desc.BindFlags = tests[i].bind_flags; - hr = ID3D11Device_CreateTexture3D(device, &desc, NULL, (ID3D11Texture3D **)&texture); + hr = ID3D11Device_CreateTexture3D(device, &desc, NULL, &texture);
todo_wine_if(tests[i].todo) ok(hr == (tests[i].succeeds ? S_OK : E_INVALIDARG), "Test %u: Got unexpected hr %#x.\n", i, hr); @@ -8536,8 +8536,8 @@ static void test_cube_maps(void) { for (j = 0; j < ARRAY_SIZE(data); ++j) data[j] = sub_resource_idx; - ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)texture, sub_resource_idx, NULL, - data, texture_desc.Width * sizeof(*data), 0); + ID3D11DeviceContext_UpdateSubresource(context, texture, sub_resource_idx, NULL, data, + texture_desc.Width * sizeof(*data), 0); }
expected_result.y = expected_result.z = 0.0f; @@ -21352,7 +21352,7 @@ static void test_sampleinfo_instruction(void) continue; }
- hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, (ID3D11Texture2D **)&texture); + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); ok(hr == S_OK, "Failed to create texture, hr %#x, sample count %u.\n", hr, sample_count); hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, NULL, &srv); ok(hr == S_OK, "Failed to create shader resource view, hr %#x.\n", hr); @@ -21388,7 +21388,7 @@ static void test_sampleinfo_instruction(void) continue; }
- hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, (ID3D11Texture2D **)&texture); + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); ok(hr == S_OK, "Failed to create texture, hr %#x, sample count %u.\n", hr, sample_count); hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, NULL, &rtv); ok(hr == S_OK, "Failed to create render target view, hr %#x.\n", hr);
Hi,
While running your changed tests on Windows, 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=47549
Your paranoid android.
=== wvistau64 (32 bit report) ===
d3d11: d3d11.c:5617: Test failed: Got unexpected IAVertices count: 0. d3d11.c:5618: Test failed: Got unexpected IAPrimitives count: 0. d3d11.c:5619: Test failed: Got unexpected VSInvocations count: 0. d3d11.c:5622: Test failed: Got unexpected CInvocations count: 0. d3d11.c:5623: Test failed: Got unexpected CPrimitives count: 0.
=== w2008s64 (32 bit report) ===
d3d11: d3d11.c:5617: Test failed: Got unexpected IAVertices count: 0. d3d11.c:5618: Test failed: Got unexpected IAPrimitives count: 0. d3d11.c:5619: Test failed: Got unexpected VSInvocations count: 0. d3d11.c:5622: Test failed: Got unexpected CInvocations count: 0. d3d11.c:5623: Test failed: Got unexpected CPrimitives count: 0. d3d11.c:5634: Test failed: Got unexpected IAVertices count: 0. d3d11.c:5635: Test failed: Got unexpected IAPrimitives count: 0. d3d11.c:5636: Test failed: Got unexpected VSInvocations count: 0. d3d11.c:5639: Test failed: Got unexpected CInvocations count: 0. d3d11.c:5640: Test failed: Got unexpected CPrimitives count: 0. d3d11.c:5641: Test failed: Got unexpected PSInvocations count: 0.
=== debian9 (32 bit French report) ===
d3d11: Unhandled exception: page fault on execute access to 0x00000000 in 32-bit code (0x00000000).
=== debian9 (32 bit Japanese:Japan report) ===
d3d11: d3d11.c:5593: Test failed: Got unexpected hr 0x8876086a. Unhandled exception: page fault on read access to 0x3f800000 in 32-bit code (0x7ec04f0d).
=== debian9 (32 bit Chinese:China report) ===
d3d11: d3d11.c:5593: Test failed: Got unexpected hr 0x8876086a.
=== debian9 (32 bit WoW report) ===
d3d11: Unhandled exception: page fault on read access to 0x00000001 in 32-bit code (0x7ecfaf0d).
=== debian9 (64 bit WoW report) ===
d3d11: d3d11.c:16707: Test failed: Got {-1.00787401e+00, 0.00000000e+00, 1.00000000e+00, 5.03937006e-01}, expected {-1.00000000e+00, 0.00000000e+00, 1.00000000e+00, 5.03937006e-01} at (0, 0), sub-resource 0.
-
Henri Verbeet -
Marvin -
Michael Stefaniuc