[PATCH 0/3] MR864: Fixing warnings now spit by GCC 12.2.

List overview All Threads

newer

older

[PATCH 0/1] MR867: ntdll: Check...

[PATCH 0/1] MR872: winex11: Always...

eric pouech (＠epo)

15 Sep 2022 15 Sep '22

5:38 p.m.

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/864

Show replies by date

Eric Pouech

15 Sep 15 Sep

5:38 p.m.

New subject: [PATCH 1/3] d3d10core/tests: Fix erroneous color parameter.

From: Eric Pouech eric.pouech@gmail.com

(Spotted by warnings emitted by GCC 12.2).

Signed-off-by: Eric Pouech eric.pouech@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/864

Eric Pouech

5:38 p.m.

New subject: [PATCH 2/3] d3d10core/test: Fix GCC 12.2 warnings.

From: Eric Pouech eric.pouech@gmail.com

Introducing helper clear_render_target_view(), in which a cast from vec4* into float[4] gets rid of the warnings.

Signed-off-by: Eric Pouech eric.pouech@gmail.com --- dlls/d3d10core/tests/d3d10core.c | 43 ++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 7d0e3601403..889562ff738 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -1406,6 +1406,11 @@ static void release_test_context_(unsigned int line, struct d3d10core_test_conte ok_(__FILE__, line)(!ref, "Device has %lu references left.\n", ref); }

+static inline void clear_render_target_view(struct d3d10core_test_context* test_context, const struct vec4* vec) +{ + ID3D10Device_ClearRenderTargetView(test_context->device, test_context->backbuffer_rtv, (const float*)vec); +} + #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 +13448,7 @@ static void test_face_culling(void)

device = test_context.device;

- ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &red.x); + clear_render_target_view(&test_context, &red); draw_color_quad(&test_context, &green); check_texture_color(test_context.backbuffer, 0xff00ff00, 0);

@@ -13451,7 +13456,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_render_target_view(&test_context, &red); draw_color_quad(&test_context, &green); check_texture_color(test_context.backbuffer, 0xff0000ff, 0);

@@ -13476,12 +13481,12 @@ static void test_face_culling(void) ID3D10Device_RSSetState(device, state);

@@ -13502,11 +13507,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_render_target_view(&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_render_target_view(&test_context, &red); draw_color_quad(&test_context, &green); if (!broken_warp) check_texture_color(test_context.backbuffer, 0xffff0000, 0); @@ -13522,14 +13527,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_render_target_view(&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_render_target_view(&test_context, &red); draw_color_quad(&test_context, &green); check_texture_color(test_context.backbuffer, 0xff00ff00, 0);

@@ -13573,22 +13578,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, &green.x); + clear_render_target_view(&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);

@@ -13607,11 +13612,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);

@@ -15636,7 +15641,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_render_target_view(&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 +17389,7 @@ static void test_generate_mips(void)

ID3D10Device_GenerateMips(device, srv);

- ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &white.x); + clear_render_target_view(&test_context, &white);

srv_desc.Format = tests[j].texture_format == DXGI_FORMAT_R8G8B8A8_UINT ? DXGI_FORMAT_R8G8B8A8_UINT : DXGI_FORMAT_R8G8B8A8_UNORM; @@ -17466,7 +17471,7 @@ static void test_generate_mips(void)

ID3D10Device_GenerateMips(device, srv);

- ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &white.x); + clear_render_target_view(&test_context, &white);

srv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; srv_desc.ViewDimension = D3D10_SRV_DIMENSION_TEXTURE2D; @@ -17498,7 +17503,7 @@ static void test_generate_mips(void)

ID3D10Device_GenerateMips(device, srv);

- ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &white.x); + clear_render_target_view(&test_context, &white);

srv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; srv_desc.ViewDimension = D3D10_SRV_DIMENSION_TEXTURE2D; @@ -19183,7 +19188,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_render_target_view(&test_context, &red);

for (y = 0; y < 200; ++y) {

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/864

Eric Pouech

5:38 p.m.

New subject: [PATCH 3/3] d3d11/tests: Fix warnings generated by GCC 12.2.

From: Eric Pouech eric.pouech@gmail.com

Introducting clear_render_target_view() in order to wrap type conversion inside and for once.

Signed-off-by: Eric Pouech eric.pouech@gmail.com --- dlls/d3d11/tests/d3d11.c | 67 +++++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 31 deletions(-)

diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 5e00bc7a336..0d9d6613ffe 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1810,6 +1810,11 @@ static void release_test_context_(unsigned int line, struct d3d11_test_context * ok_(__FILE__, line)(!ref, "Device has %lu references left.\n", ref); }

+static inline void clear_render_target_view(ID3D11DeviceContext *device, ID3D11RenderTargetView *rtv, const struct vec4 *vec) +{ + ID3D11DeviceContext_ClearRenderTargetView(device, rtv, (const float*)vec); +} + #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 +20783,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_render_target_view(context, test_context.backbuffer_rtv, &red); draw_color_quad(&test_context, &green); check_texture_color(test_context.backbuffer, 0xff00ff00, 0);

@@ -20786,7 +20791,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_render_target_view(context, test_context.backbuffer_rtv, &red); draw_color_quad(&test_context, &green); check_texture_color(test_context.backbuffer, 0xff0000ff, 0);

@@ -20811,12 +20816,12 @@ static void test_face_culling(void) ID3D11DeviceContext_RSSetState(context, state);

@@ -20837,11 +20842,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_render_target_view(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_render_target_view(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 +20862,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_render_target_view(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_render_target_view(context, test_context.backbuffer_rtv, &red); draw_color_quad(&test_context, &green); check_texture_color(test_context.backbuffer, 0xff00ff00, 0);

@@ -20911,22 +20916,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, &green.x); + clear_render_target_view(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);

@@ -20945,11 +20950,11 @@ static void test_line_antialiasing_blending(void) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D11DeviceContext_RSSetState(context, rasterizer_state);

@@ -27161,7 +27166,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_render_target_view(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 +27889,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_render_target_view(context, rtv, &white); draw_quad(&test_context); get_texture_readback(rt, 0, &rb); for (y = 0; y < texture_desc.Height; ++y) @@ -27973,7 +27978,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_render_target_view(context, rtv, &white); draw_quad(&test_context); get_texture_readback(rt, 0, &rb); for (y = 0; y < texture_desc.Height; ++y) @@ -28172,7 +28177,7 @@ static void test_gather_c(void) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0);

ID3D11DeviceContext_GenerateMips(context, srv);

- ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, &white.x); + clear_render_target_view(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 +30575,7 @@ static void test_generate_mips(void)

ID3D11DeviceContext_GenerateMips(context, srv);

- ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, &white.w); + clear_render_target_view(context, test_context.backbuffer_rtv, &white);

srv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; srv_desc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D; @@ -30602,7 +30607,7 @@ static void test_generate_mips(void)

ID3D11DeviceContext_GenerateMips(context, srv);

- ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, &white.w); + clear_render_target_view(context, test_context.backbuffer_rtv, &white);

srv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; srv_desc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D; @@ -33279,7 +33284,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_render_target_view(immediate, test_context.backbuffer_rtv, &white);

ID3D11DeviceContext_ClearRenderTargetView(deferred, test_context.backbuffer_rtv, green);

@@ -33296,12 +33301,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_render_target_view(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 +33317,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_render_target_view(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 +33332,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);

hr = ID3D11Device_CreateDeferredContext(device, 0, &deferred); @@ -34342,7 +34347,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_render_target_view(immediate, test_context.backbuffer_rtv, &red);

for (y = 0; y < 200; ++y) {

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/864

Marvin

6:22 p.m.

New subject: [PATCH 3/3] d3d11/tests: Fix warnings generated by GCC 12.2.

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=123477

Your paranoid android.

=== debian11 (64 bit WoW report) ===

d3d11: d3d11.c:1576: Test succeeded inside todo block: d3d11.c:1571: Test succeeded inside todo block: Feature level 0xb000: Feature level 0xa000: Got unexpected hr 0. d3d11.c:1573: Test succeeded inside todo block: Feature level 0xb000: Optional format 0x23 - blendable supported.