diff --git a/src/vulkan/util/vk_cmd_queue_gen.py b/src/vulkan/util/vk_cmd_queue_gen.py index aba8b25a5e1..5437ffebefc 100644 --- a/src/vulkan/util/vk_cmd_queue_gen.py +++ b/src/vulkan/util/vk_cmd_queue_gen.py @@ -466,8 +466,7 @@ def get_array_copy(command, param): else: field_size = "sizeof(*%s)" % field_name allocation = "%s = vk_zalloc(queue->alloc, %s * (%s), 8, VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);\n if (%s == NULL) goto err;\n" % (field_name, field_size, param.len, field_name) - const_cast = remove_suffix(param.decl.replace("const", ""), param.name) - copy = "memcpy((%s)%s, %s, %s * (%s));" % (const_cast, field_name, param.name, field_size, param.len) + copy = "memcpy((void*)%s, %s, %s * (%s));" % (field_name, param.name, field_size, param.len) return "%s\n %s" % (allocation, copy) def get_array_member_copy(struct, src_name, member): @@ -477,8 +476,7 @@ def get_array_member_copy(struct, src_name, member): else: field_size = "sizeof(*%s) * %s->%s" % (field_name, struct, member.len) allocation = "%s = vk_zalloc(queue->alloc, %s, 8, VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);\n if (%s == NULL) goto err;\n" % (field_name, field_size, field_name) - const_cast = remove_suffix(member.decl.replace("const", ""), member.name) - copy = "memcpy((%s)%s, %s->%s, %s);" % (const_cast, field_name, src_name, member.name, field_size) + copy = "memcpy((void*)%s, %s->%s, %s);" % (field_name, src_name, member.name, field_size) return "if (%s->%s) {\n %s\n %s\n}\n" % (src_name, member.name, allocation, copy) def get_pnext_member_copy(struct, src_type, member, types, level):