From 6674f04fc23a63b6aa11ed7f48d6f0efb2a460ce Mon Sep 17 00:00:00 2001 From: Jesse Natalie Date: Wed, 24 May 2023 11:11:58 -0700 Subject: [PATCH] dzn: Fix src/dest confusion for some non-bindless descriptor copies Fixes: 5d2b4ee4 ("dzn: Allocate descriptor sets in buffers for bindless mode") Part-of: --- src/microsoft/vulkan/dzn_descriptor_set.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/microsoft/vulkan/dzn_descriptor_set.c b/src/microsoft/vulkan/dzn_descriptor_set.c index 792222d5344..cce4fef80f0 100644 --- a/src/microsoft/vulkan/dzn_descriptor_set.c +++ b/src/microsoft/vulkan/dzn_descriptor_set.c @@ -2304,9 +2304,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);