From 656acb96b0ac63de02590b4b18fc1358905319dd Mon Sep 17 00:00:00 2001 From: Konstantin Seurer Date: Thu, 24 Jul 2025 09:06:14 +0200 Subject: [PATCH] vulkan/cmd_queue: Reorder memcpy in get_struct_copy Using the temporary variable for the memcpy makes sure they are always used so the "(void)tmp_src123" can be removed. Acked-by: Mike Blumenkrantz Part-of: --- src/vulkan/util/vk_cmd_queue_gen.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vulkan/util/vk_cmd_queue_gen.py b/src/vulkan/util/vk_cmd_queue_gen.py index 0676e287393..1814941d0e4 100644 --- a/src/vulkan/util/vk_cmd_queue_gen.py +++ b/src/vulkan/util/vk_cmd_queue_gen.py @@ -546,9 +546,9 @@ def get_struct_copy(builder, dst, src_name, src_type, size, types): builder.add("%s = vk_zalloc(queue->alloc, %s, 8, VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);" % (dst, size)) builder.add("if (%s == NULL) goto err;" % (dst)) - builder.add("memcpy((void*)%s, %s, %s);" % (dst, src_name, size)) - builder.add("%s *%s = (void *) %s; (void) %s;" % (src_type, tmp_dst_name, dst, tmp_dst_name)) - builder.add("%s *%s = (void *) %s; (void) %s;" % (src_type, tmp_src_name, src_name, tmp_src_name)) + builder.add("%s *%s = (void *)%s;" % (src_type, tmp_dst_name, dst)) + builder.add("%s *%s = (void *)%s;" % (src_type, tmp_src_name, src_name)) + builder.add("memcpy(%s, %s, %s);" % (tmp_dst_name, tmp_src_name, size)) if src_type in types: for member in types[src_type].members: