[PATCH v3 0/1] MR2892: wined3d: Fix uninitialized variable warning.

[Davide Beatrici (＠davidebeatrici)]

```c
dlls/wined3d/context_vk.c:2377:42: warning: ‘null_binding’ may be used uninitialized in this function [-Wmaybe-uninitialized]
 2377 |                     *null_buffer_binding = b->binding = null_binding;
      |                     ~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~
```

--
  v3: wined3d: Fix uninitialized variable warning.

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

[PATCH v3 1/1] wined3d: Fix uninitialized variable warning.

[Davide Beatrici]

From: Davide Beatrici

dlls/wined3d/context_vk.c:2377:42: warning: ‘null_binding’ may be used uninitialized in this function [-Wmaybe-uninitialized]
 2377 |                     *null_buffer_binding = b->binding = null_binding;
      |                     ~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~
---
 dlls/wined3d/context_vk.c | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c
index 10713985e7e..3dd2b8a3785 100644
--- a/dlls/wined3d/context_vk.c
+++ b/dlls/wined3d/context_vk.c
@@ -244,6 +244,22 @@ static VkStencilOp vk_stencil_op_from_wined3d(enum wined3d_stencil_op op)
     }
 }

+static bool wined3d_get_unused_stream_index(const struct wined3d_state *state, uint32_t *index)
+{
+    uint32_t i;
+
+    for (i = 0; i < ARRAY_SIZE(state->streams); ++i)
+    {
+        if (!state->streams[i].buffer)
+        {
+            *index = i;
+            break;
+        }
+    }
+
+    return i != ARRAY_SIZE(state->streams);
+}
+
 static void wined3d_allocator_chunk_vk_lock(struct wined3d_allocator_chunk_vk *chunk_vk)
 {
     wined3d_device_vk_allocator_lock(wined3d_device_vk_from_allocator(chunk_vk->c.allocator));
@@ -2339,16 +2355,7 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte
             struct wined3d_shader_signature *signature;
             uint32_t null_binding, location;

-            for (i = 0; i < ARRAY_SIZE(state->streams); ++i)
-            {
-                if (!state->streams[i].buffer)
-                {
-                    null_binding = i;
-                    break;
-                }
-            }
-
-            if (i == ARRAY_SIZE(state->streams))
+            if (!wined3d_get_unused_stream_index(state, &null_binding))
             {
                 ERR("No streams left for a null buffer binding.\n");
             }

[Henri Verbeet (＠hverbeet)]

> +static bool wined3d_get_unused_stream_index(const struct wined3d_state *state, uint32_t *index)
> +{
> +    uint32_t i;
> +
> +    for (i = 0; i < ARRAY_SIZE(state->streams); ++i)
> +    {
> +        if (!state->streams[i].buffer)
> +        {
> +            *index = i;
> +            break;
> +        }
> +    }
> +
> +    return i != ARRAY_SIZE(state->streams);
> +}

That's the straightforward translation, but I think it's a bit awkward. I think it would be clearer to replace the "break;" above with "return true;", and "return i != ARRAY_SIZE(state->streams);" with "return false;".

[Davide Beatrici (＠davidebeatrici)]

On Thu May 25 10:31:29 2023 +0000, Henri Verbeet wrote:
> > +static bool wined3d_get_unused_stream_index(const struct
>
> wined3d_state *state, uint32_t *index)
> > +{
> > - uint32_t i;
> > -
> > - for (i = 0; i < ARRAY_SIZE(state->streams); ++i)
> > - {
> > -
> >    if (!state->streams[i].buffer)
> > -
> >    {
> > -
> >        *index = i;
> > -
> >        break;
> > -
> >    }
> > - }
> > -
> > - return i != ARRAY_SIZE(state->streams);
> >
> > +}
>
> That's the straightforward translation, but I think it's a bit awkward.
> I think it would be clearer to replace the "break;" above with "return
> true;", and "return i != ARRAY_SIZE(state->streams);" with "return false;".

Ah, yes, of course. Silly me.