Zebediah Figura : vkd3d-shader: Make shader_extract_from_dxbc() static.
Alexandre Julliard
julliard at winehq.org
Thu Jan 6 18:30:41 CST 2022
Module: vkd3d
Branch: master
Commit: 2edec69da49e8b1336a87b771657de16cfaa3e04
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2edec69da49e8b1336a87b771657de16cfaa3e04
Author: Zebediah Figura <zfigura at codeweavers.com>
Date: Tue Dec 28 16:20:18 2021 -0600
vkd3d-shader: Make shader_extract_from_dxbc() static.
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
libs/vkd3d-shader/dxbc.c | 74 ++++++++++++++++----------------
libs/vkd3d-shader/vkd3d_shader_private.h | 2 -
2 files changed, 37 insertions(+), 39 deletions(-)
diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c
index b83e265..0b76a4a 100644
--- a/libs/vkd3d-shader/dxbc.c
+++ b/libs/vkd3d-shader/dxbc.c
@@ -1669,42 +1669,6 @@ static bool shader_sm4_init(struct vkd3d_shader_sm4_parser *sm4, const uint32_t
return true;
}
-int vkd3d_shader_sm4_parser_create(const struct vkd3d_shader_compile_info *compile_info,
- struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_parser **parser)
-{
- struct vkd3d_shader_desc *shader_desc;
- struct vkd3d_shader_sm4_parser *sm4;
- int ret;
-
- if (!(sm4 = vkd3d_calloc(1, sizeof(*sm4))))
- {
- ERR("Failed to allocate parser.\n");
- return VKD3D_ERROR_OUT_OF_MEMORY;
- }
-
- shader_desc = &sm4->p.shader_desc;
- if ((ret = shader_extract_from_dxbc(compile_info->source.code, compile_info->source.size,
- message_context, compile_info->source_name, shader_desc)) < 0)
- {
- WARN("Failed to extract shader, vkd3d result %d.\n", ret);
- vkd3d_free(sm4);
- return ret;
- }
-
- if (!shader_sm4_init(sm4, shader_desc->byte_code, shader_desc->byte_code_size,
- compile_info->source_name, &shader_desc->output_signature, message_context))
- {
- WARN("Failed to initialise shader parser.\n");
- free_shader_desc(shader_desc);
- vkd3d_free(sm4);
- return VKD3D_ERROR_INVALID_ARGUMENT;
- }
-
- *parser = &sm4->p;
-
- return VKD3D_OK;
-}
-
static bool require_space(size_t offset, size_t count, size_t size, size_t data_size)
{
return !count || (data_size - offset) / count >= size;
@@ -2039,7 +2003,7 @@ void free_shader_desc(struct vkd3d_shader_desc *desc)
vkd3d_shader_free_shader_signature(&desc->patch_constant_signature);
}
-int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length,
+static int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length,
struct vkd3d_shader_message_context *message_context, const char *source_name, struct vkd3d_shader_desc *desc)
{
int ret;
@@ -2063,6 +2027,42 @@ int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length,
return ret;
}
+int vkd3d_shader_sm4_parser_create(const struct vkd3d_shader_compile_info *compile_info,
+ struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_parser **parser)
+{
+ struct vkd3d_shader_desc *shader_desc;
+ struct vkd3d_shader_sm4_parser *sm4;
+ int ret;
+
+ if (!(sm4 = vkd3d_calloc(1, sizeof(*sm4))))
+ {
+ ERR("Failed to allocate parser.\n");
+ return VKD3D_ERROR_OUT_OF_MEMORY;
+ }
+
+ shader_desc = &sm4->p.shader_desc;
+ if ((ret = shader_extract_from_dxbc(compile_info->source.code, compile_info->source.size,
+ message_context, compile_info->source_name, shader_desc)) < 0)
+ {
+ WARN("Failed to extract shader, vkd3d result %d.\n", ret);
+ vkd3d_free(sm4);
+ return ret;
+ }
+
+ if (!shader_sm4_init(sm4, shader_desc->byte_code, shader_desc->byte_code_size,
+ compile_info->source_name, &shader_desc->output_signature, message_context))
+ {
+ WARN("Failed to initialise shader parser.\n");
+ free_shader_desc(shader_desc);
+ vkd3d_free(sm4);
+ return VKD3D_ERROR_INVALID_ARGUMENT;
+ }
+
+ *parser = &sm4->p;
+
+ return VKD3D_OK;
+}
+
/* root signatures */
#define VKD3D_ROOT_SIGNATURE_1_0_ROOT_DESCRIPTOR_FLAGS VKD3D_SHADER_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE
diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h
index 62073cf..ffea91d 100644
--- a/libs/vkd3d-shader/vkd3d_shader_private.h
+++ b/libs/vkd3d-shader/vkd3d_shader_private.h
@@ -1045,8 +1045,6 @@ int vkd3d_shader_sm1_parser_create(const struct vkd3d_shader_compile_info *compi
int vkd3d_shader_sm4_parser_create(const struct vkd3d_shader_compile_info *compile_info,
struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_parser **parser);
-int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length,
- struct vkd3d_shader_message_context *message_context, const char *source_name, struct vkd3d_shader_desc *desc);
void free_shader_desc(struct vkd3d_shader_desc *desc);
int shader_parse_input_signature(const void *dxbc, size_t dxbc_length,
More information about the wine-cvs
mailing list