fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-03-13 15:20:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

vulkan/cmd_queue: Use vk_strdup and free allocated string memory

Browse source 
Fixes: 9082715ab0 ("vk/cmd_queue: generate copies for string struct members")

Reviewed-by: Karmjit Mahil <karmjit.mahil@igalia.com>
Reviewed-by: Konstantin Seurer <konstantin.seurer@gmail.com>
Signed-off-by: Aitor Camacho <aitor@lunarg.com>
(cherry picked from commit 16c98f4f18)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38803>
This commit is contained in:
Aitor Camacho 2025-11-25 03:35:06 +09:00 • committed by Dylan Baker
parent 610dbae397
commit 3e8ecfedd4
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -284,7 +284,7 @@
"description": "vulkan/cmd_queue: Use vk_strdup and free allocated string memory",
"nominated": true,
"nomination_type": 2,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "9082715ab014270fb8bdf555526d7e55a4890538",
"notes": null

4
src/vulkan/util/vk_cmd_queue_gen.py
View file

@ -578,7 +578,7 @@ def get_struct_copy(builder, dst, src_name, src_type, types, parent_name=None, l
tmp_src_name, member.name
), member.type, types, tmp_src_name, member.len)
elif member.len and member.len == 'null-terminated':
builder.add("%s->%s = strdup(%s->%s);" % (tmp_dst_name, member.name, tmp_src_name, member.name))
builder.add("%s->%s = vk_strdup(queue->alloc, %s->%s, VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);" % (tmp_dst_name, member.name, tmp_src_name, member.name))
elif member.name == 'pNext':
get_pnext_member_copy(builder, tmp_dst_name, src_type, member, types)
@ -627,6 +627,8 @@ def get_struct_free(builder, field_name, nullable, struct_type, types):
builder.add("}")
builder.add("vk_free(queue->alloc, %s);" % (local_member_name))
elif member.len and member.len == 'null-terminated':
builder.add("vk_free(queue->alloc, (void*)%s);" % (member_name))
elif member.name == 'pNext':
get_pnext_member_free(builder, struct_type, types, member_name)