[PATCH 0/3] MR865: d3d10core/tests, d3d11/tests: Fix -Wstringop-overread warnings.
This is a resend of merge request 864 with a few minor changes: * shorten functions to clear_rtv, and explicitly specify that the d3d10core version is clearing the backbuffer * remove unnecessary inline * fix spacing around asterisks -- https://gitlab.winehq.org/wine/wine/-/merge_requests/865
From: Eric Pouech <eric.pouech(a)gmail.com> (Spotted by warnings emitted by GCC 12.2). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/d3d10core/tests/d3d10core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index acc85f03b23..7d0e3601403 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -17466,7 +17466,7 @@ static void test_generate_mips(void) ID3D10Device_GenerateMips(device, srv); - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &white.w); + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &white.x); srv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; srv_desc.ViewDimension = D3D10_SRV_DIMENSION_TEXTURE2D; @@ -17498,7 +17498,7 @@ static void test_generate_mips(void) ID3D10Device_GenerateMips(device, srv); - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &white.w); + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &white.x); srv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; srv_desc.ViewDimension = D3D10_SRV_DIMENSION_TEXTURE2D; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/865
From: Eric Pouech <eric.pouech(a)gmail.com> This fixes warnings with gcc 12.2. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/d3d10core/tests/d3d10core.c | 45 ++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 7d0e3601403..908b11b7435 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -1406,6 +1406,13 @@ static void release_test_context_(unsigned int line, struct d3d10core_test_conte ok_(__FILE__, line)(!ref, "Device has %lu references left.\n", ref); } +static void clear_backbuffer_rtv(struct d3d10core_test_context *test_context, const struct vec4 *v) +{ + /* Cast to (const float *) instead of passing &v->x, since gcc warns about + * overreading a float[4] from a float otherwise. */ + ID3D10Device_ClearRenderTargetView(test_context->device, test_context->backbuffer_rtv, (const float *)v); +} + #define draw_quad(context) draw_quad_vs_(__LINE__, context, NULL, 0) #define draw_quad_vs(a, b, c) draw_quad_vs_(__LINE__, a, b, c) static void draw_quad_vs_(unsigned int line, struct d3d10core_test_context *context, @@ -13443,7 +13450,7 @@ static void test_face_culling(void) device = test_context.device; - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &red.x); + clear_backbuffer_rtv(&test_context, &red); draw_color_quad(&test_context, &green); check_texture_color(test_context.backbuffer, 0xff00ff00, 0); @@ -13451,7 +13458,7 @@ static void test_face_culling(void) ccw_vb = create_buffer(device, D3D10_BIND_VERTEX_BUFFER, sizeof(ccw_quad), ccw_quad); test_context.vb = ccw_vb; - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &red.x); + clear_backbuffer_rtv(&test_context, &red); draw_color_quad(&test_context, &green); check_texture_color(test_context.backbuffer, 0xff0000ff, 0); @@ -13476,12 +13483,12 @@ static void test_face_culling(void) ID3D10Device_RSSetState(device, state); test_context.vb = cw_vb; - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &red.x); + clear_backbuffer_rtv(&test_context, &red); draw_color_quad(&test_context, &green); check_texture_color(test_context.backbuffer, tests[i].expected_cw ? 0xff00ff00 : 0xff0000ff, 0); test_context.vb = ccw_vb; - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &red.x); + clear_backbuffer_rtv(&test_context, &red); draw_color_quad(&test_context, &green); check_texture_color(test_context.backbuffer, tests[i].expected_ccw ? 0xff00ff00 : 0xff0000ff, 0); @@ -13502,11 +13509,11 @@ static void test_face_culling(void) ID3D10Device_RSSetState(device, state); test_context.vb = cw_vb; - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &red.x); + clear_backbuffer_rtv(&test_context, &red); draw_color_quad(&test_context, &green); check_texture_color(test_context.backbuffer, 0xff00ff00, 0); test_context.vb = ccw_vb; - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &red.x); + clear_backbuffer_rtv(&test_context, &red); draw_color_quad(&test_context, &green); if (!broken_warp) check_texture_color(test_context.backbuffer, 0xffff0000, 0); @@ -13522,14 +13529,14 @@ static void test_face_culling(void) ID3D10Device_RSSetState(device, state); test_context.vb = cw_vb; - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &red.x); + clear_backbuffer_rtv(&test_context, &red); draw_color_quad(&test_context, &green); if (!broken_warp) check_texture_color(test_context.backbuffer, 0xffff0000 , 0); else win_skip("Broken WARP.\n"); test_context.vb = ccw_vb; - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &red.x); + clear_backbuffer_rtv(&test_context, &red); draw_color_quad(&test_context, &green); check_texture_color(test_context.backbuffer, 0xff00ff00, 0); @@ -13573,22 +13580,22 @@ static void test_line_antialiasing_blending(void) ok(SUCCEEDED(hr), "Failed to create blend state, hr %#lx.\n", hr); ID3D10Device_OMSetBlendState(device, blend_state, NULL, D3D10_DEFAULT_SAMPLE_MASK); - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &red.x); + clear_backbuffer_rtv(&test_context, &red); draw_color_quad(&test_context, &green); check_texture_color(test_context.backbuffer, 0xe2007fcc, 1); - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &green.x); + clear_backbuffer_rtv(&test_context, &green); draw_color_quad(&test_context, &red); check_texture_color(test_context.backbuffer, 0xe2007fcc, 1); ID3D10Device_OMSetBlendState(device, NULL, NULL, D3D10_DEFAULT_SAMPLE_MASK); ID3D10BlendState_Release(blend_state); - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &red.x); + clear_backbuffer_rtv(&test_context, &red); draw_color_quad(&test_context, &green); check_texture_color(test_context.backbuffer, 0x7f00ff00, 1); - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &green.x); + clear_backbuffer_rtv(&test_context, &green); draw_color_quad(&test_context, &red); check_texture_color(test_context.backbuffer, 0xcc0000ff, 1); @@ -13607,11 +13614,11 @@ static void test_line_antialiasing_blending(void) ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#lx.\n", hr); ID3D10Device_RSSetState(device, rasterizer_state); - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &red.x); + clear_backbuffer_rtv(&test_context, &red); draw_color_quad(&test_context, &green); check_texture_color(test_context.backbuffer, 0x7f00ff00, 1); - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &green.x); + clear_backbuffer_rtv(&test_context, &green); draw_color_quad(&test_context, &red); check_texture_color(test_context.backbuffer, 0xcc0000ff, 1); @@ -15636,7 +15643,7 @@ static void test_stream_output_resume(void) ID3D10Device_GSSetShader(device, gs); ID3D10Device_GSSetConstantBuffers(device, 0, 1, &cb); - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &white.x); + clear_backbuffer_rtv(&test_context, &white); check_texture_color(test_context.backbuffer, 0xffffffff, 0); /* Draw into a SO buffer and then immediately destroy it, to make sure that @@ -17384,7 +17391,7 @@ static void test_generate_mips(void) ID3D10Device_GenerateMips(device, srv); - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &white.x); + clear_backbuffer_rtv(&test_context, &white); srv_desc.Format = tests[j].texture_format == DXGI_FORMAT_R8G8B8A8_UINT ? DXGI_FORMAT_R8G8B8A8_UINT : DXGI_FORMAT_R8G8B8A8_UNORM; @@ -17466,7 +17473,7 @@ static void test_generate_mips(void) ID3D10Device_GenerateMips(device, srv); - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &white.x); + clear_backbuffer_rtv(&test_context, &white); srv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; srv_desc.ViewDimension = D3D10_SRV_DIMENSION_TEXTURE2D; @@ -17498,7 +17505,7 @@ static void test_generate_mips(void) ID3D10Device_GenerateMips(device, srv); - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &white.x); + clear_backbuffer_rtv(&test_context, &white); srv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; srv_desc.ViewDimension = D3D10_SRV_DIMENSION_TEXTURE2D; @@ -19183,7 +19190,7 @@ static void test_dynamic_map_synchronization(void) hr = ID3D10Device_CreateBuffer(device, &buffer_desc, NULL, &test_context.vb); ok(hr == S_OK, "Failed to create vertex buffer, hr %#lx.\n", hr); - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &red.x); + clear_backbuffer_rtv(&test_context, &red); for (y = 0; y < 200; ++y) { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/865
From: Eric Pouech <eric.pouech(a)gmail.com> This fixes warnings with gcc 12.2. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/d3d11/tests/d3d11.c | 69 ++++++++++++++++++++++------------------ 1 file changed, 38 insertions(+), 31 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 5e00bc7a336..08c5779d953 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1810,6 +1810,13 @@ static void release_test_context_(unsigned int line, struct d3d11_test_context * ok_(__FILE__, line)(!ref, "Device has %lu references left.\n", ref); } +static void clear_rtv(ID3D11DeviceContext *context, ID3D11RenderTargetView *rtv, const struct vec4 *v) +{ + /* Cast to (const float *) instead of passing &v->x, since gcc warns about + * overreading a float[4] from a float otherwise. */ + ID3D11DeviceContext_ClearRenderTargetView(context, rtv, (const float *)v); +} + #define draw_quad(context) draw_quad_vs_(__LINE__, context, NULL, 0) #define draw_quad_vs(a, b, c) draw_quad_vs_(__LINE__, a, b, c) static void draw_quad_vs_(unsigned int line, struct d3d11_test_context *context, @@ -20778,7 +20785,7 @@ static void test_face_culling(void) device = test_context.device; context = test_context.immediate_context; - ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, &red.x); + clear_rtv(context, test_context.backbuffer_rtv, &red); draw_color_quad(&test_context, &green); check_texture_color(test_context.backbuffer, 0xff00ff00, 0); @@ -20786,7 +20793,7 @@ static void test_face_culling(void) ccw_vb = create_buffer(device, D3D11_BIND_VERTEX_BUFFER, sizeof(ccw_quad), ccw_quad); test_context.vb = ccw_vb; - ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, &red.x); + clear_rtv(context, test_context.backbuffer_rtv, &red); draw_color_quad(&test_context, &green); check_texture_color(test_context.backbuffer, 0xff0000ff, 0); @@ -20811,12 +20818,12 @@ static void test_face_culling(void) ID3D11DeviceContext_RSSetState(context, state); test_context.vb = cw_vb; - ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, &red.x); + clear_rtv(context, test_context.backbuffer_rtv, &red); draw_color_quad(&test_context, &green); check_texture_color(test_context.backbuffer, tests[i].expected_cw ? 0xff00ff00 : 0xff0000ff, 0); test_context.vb = ccw_vb; - ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, &red.x); + clear_rtv(context, test_context.backbuffer_rtv, &red); draw_color_quad(&test_context, &green); check_texture_color(test_context.backbuffer, tests[i].expected_ccw ? 0xff00ff00 : 0xff0000ff, 0); @@ -20837,11 +20844,11 @@ static void test_face_culling(void) ID3D11DeviceContext_RSSetState(context, state); test_context.vb = cw_vb; - ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, &red.x); + clear_rtv(context, test_context.backbuffer_rtv, &red); draw_color_quad(&test_context, &green); check_texture_color(test_context.backbuffer, 0xff00ff00, 0); test_context.vb = ccw_vb; - ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, &red.x); + clear_rtv(context, test_context.backbuffer_rtv, &red); draw_color_quad(&test_context, &green); if (!broken_warp) check_texture_color(test_context.backbuffer, 0xffff0000, 0); @@ -20857,14 +20864,14 @@ static void test_face_culling(void) ID3D11DeviceContext_RSSetState(context, state); test_context.vb = cw_vb; - ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, &red.x); + clear_rtv(context, test_context.backbuffer_rtv, &red); draw_color_quad(&test_context, &green); if (!broken_warp) check_texture_color(test_context.backbuffer, 0xffff0000 , 0); else win_skip("Broken WARP.\n"); test_context.vb = ccw_vb; - ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, &red.x); + clear_rtv(context, test_context.backbuffer_rtv, &red); draw_color_quad(&test_context, &green); check_texture_color(test_context.backbuffer, 0xff00ff00, 0); @@ -20911,22 +20918,22 @@ static void test_line_antialiasing_blending(void) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D11DeviceContext_OMSetBlendState(context, blend_state, NULL, D3D11_DEFAULT_SAMPLE_MASK); - ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, &red.x); + clear_rtv(context, test_context.backbuffer_rtv, &red); draw_color_quad(&test_context, &green); check_texture_color(test_context.backbuffer, 0xe2007fcc, 1); - ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, &green.x); + clear_rtv(context, test_context.backbuffer_rtv, &green); draw_color_quad(&test_context, &red); check_texture_color(test_context.backbuffer, 0xe2007fcc, 1); ID3D11DeviceContext_OMSetBlendState(context, NULL, NULL, D3D11_DEFAULT_SAMPLE_MASK); ID3D11BlendState_Release(blend_state); - ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, &red.x); + clear_rtv(context, test_context.backbuffer_rtv, &red); draw_color_quad(&test_context, &green); check_texture_color(test_context.backbuffer, 0x7f00ff00, 1); - ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, &green.x); + clear_rtv(context, test_context.backbuffer_rtv, &green); draw_color_quad(&test_context, &red); check_texture_color(test_context.backbuffer, 0xcc0000ff, 1); @@ -20945,11 +20952,11 @@ static void test_line_antialiasing_blending(void) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D11DeviceContext_RSSetState(context, rasterizer_state); - ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, &red.x); + clear_rtv(context, test_context.backbuffer_rtv, &red); draw_color_quad(&test_context, &green); check_texture_color(test_context.backbuffer, 0x7f00ff00, 1); - ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, &green.x); + clear_rtv(context, test_context.backbuffer_rtv, &green); draw_color_quad(&test_context, &red); check_texture_color(test_context.backbuffer, 0xcc0000ff, 1); @@ -27161,7 +27168,7 @@ static void test_stream_output_resume(void) ID3D11DeviceContext_GSSetShader(context, gs, NULL, 0); ID3D11DeviceContext_GSSetConstantBuffers(context, 0, 1, &cb); - ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, &white.x); + clear_rtv(context, test_context.backbuffer_rtv, &white); check_texture_color(test_context.backbuffer, 0xffffffff, 0); /* Draw into a SO buffer and then immediately destroy it, to make sure that @@ -27884,7 +27891,7 @@ static void test_gather(void) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); - ID3D11DeviceContext_ClearRenderTargetView(context, rtv, &white.x); + clear_rtv(context, rtv, &white); draw_quad(&test_context); get_texture_readback(rt, 0, &rb); for (y = 0; y < texture_desc.Height; ++y) @@ -27905,7 +27912,7 @@ static void test_gather(void) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); - ID3D11DeviceContext_ClearRenderTargetView(context, rtv, &white.x); + clear_rtv(context, rtv, &white); draw_quad(&test_context); get_texture_readback(rt, 0, &rb); for (y = 0; y < texture_desc.Height; ++y) @@ -27933,7 +27940,7 @@ static void test_gather(void) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); - ID3D11DeviceContext_ClearRenderTargetView(context, rtv, &white.x); + clear_rtv(context, rtv, &white); draw_quad(&test_context); get_texture_readback(rt, 0, &rb); for (y = 0; y < texture_desc.Height; ++y) @@ -27954,7 +27961,7 @@ static void test_gather(void) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); - ID3D11DeviceContext_ClearRenderTargetView(context, rtv, &white.x); + clear_rtv(context, rtv, &white); draw_quad(&test_context); get_texture_readback(rt, 0, &rb); for (y = 0; y < texture_desc.Height; ++y) @@ -27973,7 +27980,7 @@ static void test_gather(void) constant.offset_x = 0; constant.offset_y = 0; ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &constant, 0, 0); - ID3D11DeviceContext_ClearRenderTargetView(context, rtv, &white.x); + clear_rtv(context, rtv, &white); draw_quad(&test_context); get_texture_readback(rt, 0, &rb); for (y = 0; y < texture_desc.Height; ++y) @@ -28172,7 +28179,7 @@ static void test_gather_c(void) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); - ID3D11DeviceContext_ClearRenderTargetView(context, rtv, &white.x); + clear_rtv(context, rtv, &white); draw_quad(&test_context); get_texture_readback(rt, 0, &rb); for (y = 0; y < texture_desc.Height; ++y) @@ -28193,7 +28200,7 @@ static void test_gather_c(void) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); - ID3D11DeviceContext_ClearRenderTargetView(context, rtv, &white.x); + clear_rtv(context, rtv, &white); draw_quad(&test_context); get_texture_readback(rt, 0, &rb); for (y = 0; y < texture_desc.Height; ++y) @@ -30501,7 +30508,7 @@ static void test_generate_mips(void) ID3D11DeviceContext_GenerateMips(context, srv); - ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, &white.x); + clear_rtv(context, test_context.backbuffer_rtv, &white); srv_desc.Format = tests[j].texture_format == DXGI_FORMAT_R8G8B8A8_UINT ? DXGI_FORMAT_R8G8B8A8_UINT : DXGI_FORMAT_R8G8B8A8_UNORM; @@ -30570,7 +30577,7 @@ static void test_generate_mips(void) ID3D11DeviceContext_GenerateMips(context, srv); - ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, &white.w); + clear_rtv(context, test_context.backbuffer_rtv, &white); srv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; srv_desc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D; @@ -30602,7 +30609,7 @@ static void test_generate_mips(void) ID3D11DeviceContext_GenerateMips(context, srv); - ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, &white.w); + clear_rtv(context, test_context.backbuffer_rtv, &white); srv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; srv_desc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D; @@ -33279,7 +33286,7 @@ static void test_deferred_context_rendering(void) hr = ID3D11Device_CreateBlendState(device, &blend_desc, &blue_blend); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, &white.x); + clear_rtv(immediate, test_context.backbuffer_rtv, &white); ID3D11DeviceContext_ClearRenderTargetView(deferred, test_context.backbuffer_rtv, green); @@ -33296,12 +33303,12 @@ static void test_deferred_context_rendering(void) color = get_texture_color(test_context.backbuffer, 320, 240); ok(color == 0xff00ff00, "Got unexpected colour %#08lx.\n", color); - ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, &white.x); + clear_rtv(immediate, test_context.backbuffer_rtv, &white); ID3D11DeviceContext_ExecuteCommandList(immediate, list1, TRUE); color = get_texture_color(test_context.backbuffer, 320, 240); ok(color == 0xff00ff00, "Got unexpected colour %#08lx.\n", color); - ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, &white.x); + clear_rtv(immediate, test_context.backbuffer_rtv, &white); ID3D11DeviceContext_ExecuteCommandList(immediate, list2, TRUE); color = get_texture_color(test_context.backbuffer, 320, 240); ok(color == 0xffffffff, "Got unexpected colour %#08lx.\n", color); @@ -33312,7 +33319,7 @@ static void test_deferred_context_rendering(void) hr = ID3D11DeviceContext_FinishCommandList(deferred, TRUE, &list2); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, &white.x); + clear_rtv(immediate, test_context.backbuffer_rtv, &white); ID3D11DeviceContext_ExecuteCommandList(immediate, list2, TRUE); color = get_texture_color(test_context.backbuffer, 320, 240); ok(color == 0xff00ff00, "Got unexpected colour %#08lx.\n", color); @@ -33327,7 +33334,7 @@ static void test_deferred_context_rendering(void) hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, NULL, &rtv); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, &white.x); + clear_rtv(immediate, test_context.backbuffer_rtv, &white); ID3D11DeviceContext_ClearRenderTargetView(immediate, rtv, green); hr = ID3D11Device_CreateDeferredContext(device, 0, &deferred); @@ -34342,7 +34349,7 @@ static void test_dynamic_map_synchronization(void) hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &test_context.vb); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, &red.x); + clear_rtv(immediate, test_context.backbuffer_rtv, &red); for (y = 0; y < 200; ++y) { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/865
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=123480 Your paranoid android. === w10pro64 (32 bit report) === d3d11: d3d11.c:5921: Test failed: Got unexpected query result 0x0000000000000000.
This merge request was approved by Zebediah Figura. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/865
participants (3)
-
Eric Pouech -
Marvin -
Zebediah Figura (＠zfigura)