Henri Verbeet : vkd3d-shader/dxbc: Pass a vkd3d_shader_code structure to shader_parse_input_signature().

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 3a3acb5b7d088d6cb6e8680357507f371061885f
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/3a3acb5b7d088d6cb6e8680357507f...

Author: Henri Verbeet 
Date:   Mon Feb 20 14:57:27 2023 +0100

vkd3d-shader/dxbc: Pass a vkd3d_shader_code structure to shader_parse_input_signature().

---

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

diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c
index 50c73ec6..0da574c7 100644
--- a/libs/vkd3d-shader/dxbc.c
+++ b/libs/vkd3d-shader/dxbc.c
@@ -1935,13 +1935,13 @@ static int isgn_handler(const struct vkd3d_shader_dxbc_section_desc *section, vo
     return shader_parse_signature(section, is);
 }

-int shader_parse_input_signature(const void *dxbc, size_t dxbc_length,
+int shader_parse_input_signature(const struct vkd3d_shader_code *dxbc,
         struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_signature *signature)
 {
     int ret;

memset(signature, 0, sizeof(*signature));
-    if ((ret = parse_dxbc(dxbc, dxbc_length, message_context, NULL, isgn_handler, signature)) < 0)
+    if ((ret = parse_dxbc(dxbc->code, dxbc->size, message_context, NULL, isgn_handler, signature)) < 0)
         ERR("Failed to parse input signature.\n");

return ret;
diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c
index 1244fb48..5d9f2d7d 100644
--- a/libs/vkd3d-shader/vkd3d_shader_main.c
+++ b/libs/vkd3d-shader/vkd3d_shader_main.c
@@ -1402,7 +1402,7 @@ int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc,
         *messages = NULL;
     vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_INFO);

-    ret = shader_parse_input_signature(dxbc->code, dxbc->size, &message_context, signature);
+    ret = shader_parse_input_signature(dxbc, &message_context, signature);
     vkd3d_shader_message_context_trace_messages(&message_context);
     if (!vkd3d_shader_message_context_copy_messages(&message_context, messages))
         ret = VKD3D_ERROR_OUT_OF_MEMORY;
diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h
index eeb1626b..e7d05848 100644
--- a/libs/vkd3d-shader/vkd3d_shader_private.h
+++ b/libs/vkd3d-shader/vkd3d_shader_private.h
@@ -1125,7 +1125,7 @@ int vkd3d_shader_sm4_parser_create(const struct vkd3d_shader_compile_info *compi

void free_shader_desc(struct vkd3d_shader_desc *desc);

-int shader_parse_input_signature(const void *dxbc, size_t dxbc_length,
+int shader_parse_input_signature(const struct vkd3d_shader_code *dxbc,
         struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_signature *signature);

struct vkd3d_glsl_generator;