[PATCH 0/1] MR1344: d3d11/tests: Introduce a clear_uav() helper.

[eric pouech (＠epo)]

This fixes warnings with gcc 12.2.

(Copycat of 5fa25d00 about clear_rtv())

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>

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

[PATCH 1/1] d3d11/tests: Introduce a clear_uav() helper.

[Eric Pouech]

From: Eric Pouech <eric.pouech(a)gmail.com>

This fixes warnings with gcc 12.2.

(Copycat of 5fa25d00 about clear_rtv())

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
---
 dlls/d3d11/tests/d3d11.c | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
index 2c96bc0018e..336f4b0ab7d 100644
--- a/dlls/d3d11/tests/d3d11.c
+++ b/dlls/d3d11/tests/d3d11.c
@@ -16349,6 +16349,13 @@ static void check_rgba_sint8_(unsigned int line, DWORD data, const struct uvec4
             data, expected[0], expected[1], x, v->x, v->y, v->z, v->w);
 }
 
+static void clear_uav(ID3D11DeviceContext *context, ID3D11UnorderedAccessView *uav, const struct uvec4 *uv4)
+{
+    /* Cast to (const unsigned int *) instead of passing &uv4->x, since gcc warns about
+     * overreading an unsigned int[4] from an unsigned int otherwise. */
+    ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, (const unsigned int *)uv4);
+}
+
 static void test_clear_buffer_unordered_access_view(void)
 {
     D3D11_UNORDERED_ACCESS_VIEW_DESC uav_desc;
@@ -16464,13 +16471,13 @@ static void test_clear_buffer_unordered_access_view(void)
     for (i = 0; i < ARRAY_SIZE(uvec4_data); ++i)
     {
         uvec4 = uvec4_data[i];
-        ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, &uvec4.x);
+        clear_uav(context, uav, &uvec4);
         get_buffer_readback(buffer, &rb);
         SetRect(&rect, 0, 0, buffer_desc.ByteWidth / sizeof(uvec4.x), 1);
         check_readback_data_color(&rb, &rect, uvec4.x, 0);
         release_resource_readback(&rb);
 
-        ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav2, &fe_uvec4.x);
+        clear_uav(context, uav2, &fe_uvec4);
         get_buffer_readback(buffer, &rb);
         SetRect(&rect, 0, 0, U(uav_desc).Buffer.NumElements * buffer_desc.StructureByteStride / sizeof(uvec4.x), 1);
         check_readback_data_color(&rb, &rect, fe_uvec4.x, 0);
@@ -16504,13 +16511,13 @@ static void test_clear_buffer_unordered_access_view(void)
     for (i = 0; i < ARRAY_SIZE(uvec4_data); ++i)
     {
         uvec4 = uvec4_data[i];
-        ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, &uvec4.x);
+        clear_uav(context, uav, &uvec4);
         get_buffer_readback(buffer, &rb);
         SetRect(&rect, 0, 0, buffer_desc.ByteWidth / sizeof(uvec4.x), 1);
         check_readback_data_color(&rb, &rect, uvec4.x, 0);
         release_resource_readback(&rb);
 
-        ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav2, &fe_uvec4.x);
+        clear_uav(context, uav2, &fe_uvec4);
         get_buffer_readback(buffer, &rb);
         SetRect(&rect, 0, 0, U(uav_desc).Buffer.FirstElement, 1);
         check_readback_data_color(&rb, &rect, uvec4.x, 0);
@@ -16543,13 +16550,13 @@ static void test_clear_buffer_unordered_access_view(void)
     for (i = 0; i < ARRAY_SIZE(uvec4_data); ++i)
     {
         uvec4 = uvec4_data[i];
-        ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, &uvec4.x);
+        clear_uav(context, uav, &uvec4);
         get_buffer_readback(buffer, &rb);
         SetRect(&rect, 0, 0, buffer_desc.ByteWidth / sizeof(uvec4.x), 1);
         check_readback_data_color(&rb, &rect, uvec4.x, 0);
         release_resource_readback(&rb);
 
-        ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav2, &fe_uvec4.x);
+        clear_uav(context, uav2, &fe_uvec4);
         get_buffer_readback(buffer, &rb);
         SetRect(&rect, 0, 0, U(uav_desc).Buffer.FirstElement, 1);
         check_readback_data_color(&rb, &rect, uvec4.x, 0);
@@ -16579,7 +16586,7 @@ static void test_clear_buffer_unordered_access_view(void)
         BOOL all_match;
 
         uvec4 = uvec4_data[i];
-        ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, &uvec4.x);
+        clear_uav(context, uav, &uvec4);
         get_buffer_readback(buffer, &rb);
         for (x = 0, all_match = TRUE; x < buffer_desc.ByteWidth / sizeof(uvec4); ++x)
         {
@@ -16595,7 +16602,7 @@ static void test_clear_buffer_unordered_access_view(void)
                 data->x, data->y, data->z, data->w, uvec4.x, uvec4.y, uvec4.z, uvec4.w, x);
         release_resource_readback(&rb);
 
-        ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav2, &fe_uvec4.x);
+        clear_uav(context, uav2, &fe_uvec4);
         get_buffer_readback(buffer, &rb);
         for (x = 0, all_match = TRUE; x < buffer_desc.ByteWidth / sizeof(uvec4); ++x)
         {
@@ -16615,7 +16622,7 @@ static void test_clear_buffer_unordered_access_view(void)
     }
 
     uvec4.x = uvec4.y = uvec4.z = uvec4.w = 0xdeadbeef;
-    ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, &uvec4.x);
+    clear_uav(context, uav, &uvec4);
     ID3D11UnorderedAccessView_Release(uav);
     ID3D11UnorderedAccessView_Release(uav2);
 
@@ -16634,14 +16641,14 @@ static void test_clear_buffer_unordered_access_view(void)
     for (i = 0; i < ARRAY_SIZE(uvec4_data); ++i)
     {
         uvec4 = uvec4_data[i];
-        ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, &uvec4.x);
+        clear_uav(context, uav, &uvec4);
         get_buffer_readback(buffer, &rb);
         todo_wine check_rgba_sint8(get_readback_color(&rb, 0, 0, 0), &uvec4);
         todo_wine check_rgba_sint8(get_readback_color(&rb, 7, 0, 0), &uvec4);
         todo_wine check_rgba_sint8(get_readback_color(&rb, 15, 0, 0), &uvec4);
         release_resource_readback(&rb);
 
-        ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav2, &fe_uvec4.x);
+        clear_uav(context, uav2, &fe_uvec4);
         get_buffer_readback(buffer, &rb);
         todo_wine check_rgba_sint8(get_readback_color(&rb, 0, 0, 0), &uvec4);
         todo_wine check_rgba_sint8(get_readback_color(&rb, U(uav_desc).Buffer.FirstElement - 1, 0, 0), &uvec4);
-- 
GitLab

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

[PATCH 1/1] d3d11/tests: Introduce a clear_uav() helper.

[Marvin]

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

Your paranoid android.


=== w10pro64 (32 bit report) ===

d3d11:
d3d11.c:5921: Test failed: Got unexpected query result 0x0000000000000000.

[PATCH 0/1] MR1344: d3d11/tests: Introduce a clear_uav() helper. - approved

[Jan Sikorski (＠jsikorski)]

This merge request was approved by Jan Sikorski.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1344