diff --git a/.pick_status.json b/.pick_status.json index 906b50b2d30..c90d92ccdf8 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -958,7 +958,7 @@ "description": "tu: Correctly preserve old push descriptor contents", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "6d4f33e469b301b2fc4f398f62c81ef66f9150be" }, diff --git a/src/freedreno/vulkan/tu_cmd_buffer.c b/src/freedreno/vulkan/tu_cmd_buffer.c index 26391605f23..db685707da7 100644 --- a/src/freedreno/vulkan/tu_cmd_buffer.c +++ b/src/freedreno/vulkan/tu_cmd_buffer.c @@ -1806,7 +1806,7 @@ void tu_CmdPushDescriptorSetKHR(VkCommandBuffer commandBuffer, /* preserve previous content if the layout is the same: */ if (set->layout == layout) - memcpy(set_mem.map, set->mapped_ptr, MIN2(set->size, layout->size)); + memcpy(set_mem.map, set->mapped_ptr, layout->size); set->layout = layout; set->mapped_ptr = set_mem.map; @@ -1845,7 +1845,7 @@ void tu_CmdPushDescriptorSetWithTemplateKHR( /* preserve previous content if the layout is the same: */ if (set->layout == layout) - memcpy(set_mem.map, set->mapped_ptr, MIN2(set->size, layout->size)); + memcpy(set_mem.map, set->mapped_ptr, layout->size); set->layout = layout; set->mapped_ptr = set_mem.map;