wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/spirv: Take ownership of the shader signatures in spirv_compiler_create().

Browse Source 
Fixes leakage of the replacement elements in shader_signature_merge().
This commit is contained in:
Conor McCarthy 2023-06-16 21:44:50 +10:00 committed by Alexandre Julliard
parent df0a031ad8
commit bce2a898b3
Notes: Alexandre Julliard 2023-06-19 23:03:34 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/238
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libs/vkd3d-shader/ir.c
View File

@ -715,8 +715,7 @@ static bool shader_signature_merge(struct shader_signature *s, uint8_t range_map
} }
} }
element_count = new_count; element_count = new_count;
/* Signature 's' is a copy of the original signature struct, so we can replace vkd3d_free(s->elements);
* the 'elements' pointer without freeing it. */
s->elements = elements; s->elements = elements;
s->element_count = element_count; s->element_count = element_count;

11
libs/vkd3d-shader/spirv.c
View File

@ -2324,11 +2324,15 @@ static void spirv_compiler_destroy(struct spirv_compiler *compiler)
vkd3d_string_buffer_cache_cleanup(&compiler->string_buffers); vkd3d_string_buffer_cache_cleanup(&compiler->string_buffers);
shader_signature_cleanup(&compiler->input_signature);
shader_signature_cleanup(&compiler->output_signature);
shader_signature_cleanup(&compiler->patch_constant_signature);
vkd3d_free(compiler); vkd3d_free(compiler);
} }
static struct spirv_compiler *spirv_compiler_create(const struct vkd3d_shader_version *shader_version, static struct spirv_compiler *spirv_compiler_create(const struct vkd3d_shader_version *shader_version,
const struct vkd3d_shader_desc *shader_desc, const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_desc *shader_desc, const struct vkd3d_shader_compile_info *compile_info,
const struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info, const struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info,
struct vkd3d_shader_message_context *message_context, const struct vkd3d_shader_location *location) struct vkd3d_shader_message_context *message_context, const struct vkd3d_shader_location *location)
{ {
@ -2428,6 +2432,9 @@ static struct spirv_compiler *spirv_compiler_create(const struct vkd3d_shader_ve
compiler->input_signature = shader_desc->input_signature; compiler->input_signature = shader_desc->input_signature;
compiler->output_signature = shader_desc->output_signature; compiler->output_signature = shader_desc->output_signature;
compiler->patch_constant_signature = shader_desc->patch_constant_signature; compiler->patch_constant_signature = shader_desc->patch_constant_signature;
memset(&shader_desc->input_signature, 0, sizeof(shader_desc->input_signature));
memset(&shader_desc->output_signature, 0, sizeof(shader_desc->output_signature));
memset(&shader_desc->patch_constant_signature, 0, sizeof(shader_desc->patch_constant_signature));
if ((shader_interface = vkd3d_find_struct(compile_info->next, INTERFACE_INFO))) if ((shader_interface = vkd3d_find_struct(compile_info->next, INTERFACE_INFO)))
{ {
@ -9451,7 +9458,7 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler,
&& (result = instruction_array_flatten_hull_shader_phases(&instructions)) >= 0) && (result = instruction_array_flatten_hull_shader_phases(&instructions)) >= 0)
{ {
result = instruction_array_normalise_hull_shader_control_point_io(&instructions, result = instruction_array_normalise_hull_shader_control_point_io(&instructions,
&parser->shader_desc.input_signature); &compiler->input_signature);
} }
if (result >= 0) if (result >= 0)
result = instruction_array_normalise_io_registers(&instructions, parser->shader_version.type, result = instruction_array_normalise_io_registers(&instructions, parser->shader_version.type,