diff --git a/.pick_status.json b/.pick_status.json index beb85d42c84..c7e7301a4ce 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -634,7 +634,7 @@ "description": "dzn: Fix src/dest confusion for some non-bindless descriptor copies", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "5d2b4ee4f493bec3ddd510a742902dad87da5dde" }, diff --git a/src/microsoft/vulkan/dzn_descriptor_set.c b/src/microsoft/vulkan/dzn_descriptor_set.c index c9625b04275..e95fdd646dc 100644 --- a/src/microsoft/vulkan/dzn_descriptor_set.c +++ b/src/microsoft/vulkan/dzn_descriptor_set.c @@ -2251,9 +2251,9 @@ dzn_descriptor_set_copy(struct dzn_device *device, } if (dzn_descriptor_type_depends_on_shader_usage(src_type, device->bindless)) { - src_heap_offset = dst_set->heap_offsets[type] + + src_heap_offset = src_set->heap_offsets[type] + dzn_descriptor_set_ptr_get_heap_offset(src_set->layout, type, &src_ptr, true, device->bindless); - dst_heap_offset = src_set->heap_offsets[type] + + dst_heap_offset = dst_set->heap_offsets[type] + dzn_descriptor_set_ptr_get_heap_offset(dst_set->layout, type, &dst_ptr, true, device->bindless); assert(src_heap_offset != ~0); assert(dst_heap_offset != ~0);