Henri Verbeet : vkd3d-shader: Pass a vkd3d_shader_parser structure to shader_sm4_free().

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 661570254dad14bd51dab473aa8cbd4805d671a1
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=661570254dad14bd51dab473aa8cbd4805d671a1

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Thu Sep  2 14:35:50 2021 +0200

vkd3d-shader: Pass a vkd3d_shader_parser structure to shader_sm4_free().

Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 libs/vkd3d-shader/dxbc.c                 | 10 +++++-----
 libs/vkd3d-shader/vkd3d_shader_main.c    |  2 +-
 libs/vkd3d-shader/vkd3d_shader_private.h |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c
index 83f9196..479cc5b 100644
--- a/libs/vkd3d-shader/dxbc.c
+++ b/libs/vkd3d-shader/dxbc.c
@@ -1075,17 +1075,17 @@ void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size,
     return priv;
 }
 
-void shader_sm4_free(void *data)
+void shader_sm4_free(struct vkd3d_shader_parser *parser)
 {
     struct vkd3d_shader_src_param_entry *e1, *e2;
-    struct vkd3d_sm4_data *priv = data;
+    struct vkd3d_sm4_data *sm4 = parser->data;
 
-    list_move_head(&priv->src_free, &priv->src);
-    LIST_FOR_EACH_ENTRY_SAFE(e1, e2, &priv->src_free, struct vkd3d_shader_src_param_entry, entry)
+    list_move_head(&sm4->src_free, &sm4->src);
+    LIST_FOR_EACH_ENTRY_SAFE(e1, e2, &sm4->src_free, struct vkd3d_shader_src_param_entry, entry)
     {
         vkd3d_free(e1);
     }
-    vkd3d_free(priv);
+    vkd3d_free(sm4);
 }
 
 static struct vkd3d_shader_src_param *get_src_param(struct vkd3d_sm4_data *priv)
diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c
index 36c211e..c439308 100644
--- a/libs/vkd3d-shader/vkd3d_shader_main.c
+++ b/libs/vkd3d-shader/vkd3d_shader_main.c
@@ -394,7 +394,7 @@ static int vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser,
 
 static void vkd3d_shader_parser_destroy(struct vkd3d_shader_parser *parser)
 {
-    shader_sm4_free(parser->data);
+    shader_sm4_free(parser);
     free_shader_desc(&parser->shader_desc);
 }
 
diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h
index 97c1999..fb449aa 100644
--- a/libs/vkd3d-shader/vkd3d_shader_private.h
+++ b/libs/vkd3d-shader/vkd3d_shader_private.h
@@ -890,7 +890,7 @@ struct vkd3d_shader_message_context;
 
 void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size,
         const struct vkd3d_shader_signature *output_signature, struct vkd3d_shader_message_context *message_context);
-void shader_sm4_free(void *data);
+void shader_sm4_free(struct vkd3d_shader_parser *parser);
 void shader_sm4_read_header(void *data, const DWORD **ptr,
         struct vkd3d_shader_version *shader_version);
 void shader_sm4_read_instruction(void *data, const DWORD **ptr,