[PATCH v2 0/3] MR4151: wined3d: Clang warning fixes.

[Jacek Caban (＠jacek)]

--
  v2: wined3d: Use unsigned type for res_type bit field.
      wined3d: Remove unused parallel_point_count variable.
      wined3d: Use return type to return result from read_dword.

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

[PATCH v2 1/3] wined3d: Use return type to return result from read_dword.

[Jacek Caban]

From: Jacek Caban

Avoid implicit casts from enum pointers.
---
 dlls/wined3d/shader_sm4.c | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index f76bd693b3b..4af1a5b43ba 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -1853,10 +1853,12 @@ struct aon9_header
     unsigned int byte_code_offset;
 };

-static void read_dword(const char **ptr, unsigned int *d)
+static unsigned int read_dword(const char **ptr)
 {
-    memcpy(d, *ptr, sizeof(*d));
-    *ptr += sizeof(*d);
+    unsigned int ret;
+    memcpy(&ret, *ptr, sizeof(ret));
+    *ptr += sizeof(ret);
+    return ret;
 }

static BOOL require_space(size_t offset, size_t count, size_t size, size_t data_size)
@@ -1872,7 +1874,7 @@ static void skip_dword_unknown(const char **ptr, unsigned int count)
     WARN("Skipping %u unknown DWORDs:\n", count);
     for (i = 0; i < count; ++i)
     {
-        read_dword(ptr, &d);
+        d = read_dword(ptr);
         WARN("\t0x%08x\n", d);
     }
 }
@@ -1906,7 +1908,7 @@ static HRESULT shader_parse_signature(DWORD tag, const char *data, unsigned int
         return E_INVALIDARG;
     }

-    read_dword(&ptr, &count);
+    count = read_dword(&ptr);
     TRACE("%u elements.\n", count);

skip_dword_unknown(&ptr, 1); /* It seems to always be 0x00000008. */
@@ -1931,24 +1933,24 @@ static HRESULT shader_parse_signature(DWORD tag, const char *data, unsigned int
         unsigned int name_offset;

if (has_stream_index)
-            read_dword(&ptr, &e[i].stream_idx);
+            e[i].stream_idx = read_dword(&ptr);
         else
             e[i].stream_idx = 0;
-        read_dword(&ptr, &name_offset);
+        name_offset = read_dword(&ptr);
         if (!(e[i].semantic_name = shader_get_string(data, data_size, name_offset)))
         {
             WARN("Invalid name offset %#x (data size %#x).\n", name_offset, data_size);
             heap_free(e);
             return E_INVALIDARG;
         }
-        read_dword(&ptr, &e[i].semantic_idx);
-        read_dword(&ptr, &e[i].sysval_semantic);
-        read_dword(&ptr, &e[i].component_type);
-        read_dword(&ptr, &e[i].register_idx);
-        read_dword(&ptr, &e[i].mask);
+        e[i].semantic_idx = read_dword(&ptr);
+        e[i].sysval_semantic = read_dword(&ptr);
+        e[i].component_type = read_dword(&ptr);
+        e[i].register_idx = read_dword(&ptr);
+        e[i].mask = read_dword(&ptr);

if (has_min_precision)
-            read_dword(&ptr, &e[i].min_precision);
+            e[i].min_precision = read_dword(&ptr);
         else
             e[i].min_precision = 0;

[PATCH v2 2/3] wined3d: Remove unused parallel_point_count variable.

[Jacek Caban]

From: Jacek Caban

---
 dlls/wined3d/glsl_shader.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 9ab3f722d31..1e7a1195f8b 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -1643,7 +1643,6 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context
         DWORD point_count = 0;
         DWORD spot_count = 0;
         DWORD directional_count = 0;
-        DWORD parallel_point_count = 0;

for (i = 0; i < WINED3D_MAX_ACTIVE_LIGHTS; ++i)
         {
@@ -1662,7 +1661,6 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context
                     ++directional_count;
                     break;
                 case WINED3D_LIGHT_PARALLELPOINT:
-                    ++parallel_point_count;
                     break;
                 default:
                     FIXME("Unhandled light type %#x.\n", state->light_state.lights[i]->OriginalParms.type);

[PATCH v2 3/3] wined3d: Use unsigned type for res_type bit field.

[Jacek Caban]

From: Jacek Caban

Fixes -Wbitfield-constant-conversion when enum is signed, causing WINED3D_GL_RES_TYPE_TEX_RECT value to be trincated to -4.
---
 dlls/wined3d/arb_program_shader.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index 806fae6b522..0773c3e34d9 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -6927,7 +6927,7 @@ const struct wined3d_fragment_pipe_ops arbfp_fragment_pipeline =
 struct arbfp_blit_type
 {
     enum complex_fixup fixup : 4;
-    enum wined3d_gl_resource_type res_type : 3;
+    unsigned int res_type : 3;
     DWORD use_color_key : 1;
     DWORD padding : 24;
 };

[PATCH v2 0/3] MR4151: wined3d: Clang warning fixes. - approved

[Zebediah Figura (＠zfigura)]

This merge request was approved by Zebediah Figura.

[Jan Sikorski (＠jsikorski)]

There's a small typo in the 3rd patch message, "trincated".

[PATCH v2 0/3] MR4151: wined3d: Clang warning fixes. - approved

[Jan Sikorski (＠jsikorski)]

This merge request was approved by Jan Sikorski.