diff options
| author | Hans-Kristian Arntzen <post@arntzen-software.no> | 2022-09-27 16:48:33 +0300 |
|---|---|---|
| committer | Hans-Kristian Arntzen <post@arntzen-software.no> | 2022-11-10 16:28:46 +0300 |
| commit | 2427bcfb9c4d3bbdc87f4a7d7bc3983b0a389918 (patch) | |
| tree | f1143eecc2ba81500289951fed35eea189c91366 | |
| parent | db5db4d540cde499c684d7d5ae52ff6c96b3ba99 (diff) | |
vkd3d: Remove BINDLESS_SET_AUX_BUFFER references.
Signed-off-by: Hans-Kristian Arntzen <post@arntzen-software.no>
| -rw-r--r-- | libs/vkd3d/resource.c | 25 | ||||
| -rw-r--r-- | libs/vkd3d/vkd3d_private.h | 5 |
2 files changed, 5 insertions, 25 deletions
diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index a42e9942..bd21fca0 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -3275,28 +3275,9 @@ void d3d12_desc_copy_single(vkd3d_cpu_descriptor_va_t dst_va, vkd3d_cpu_descript if (flags & VKD3D_DESCRIPTOR_FLAG_RAW_VA_AUX_BUFFER) { - if (dst.heap->raw_va_aux_buffer.host_ptr) - { - const VkDeviceAddress *src_vas = src.heap->raw_va_aux_buffer.host_ptr; - VkDeviceAddress *dst_vas = dst.heap->raw_va_aux_buffer.host_ptr; - dst_vas[dst.offset] = src_vas[src.offset]; - } - else - { - binding = vkd3d_bindless_state_find_set( - &device->bindless_state, VKD3D_BINDLESS_SET_UAV | VKD3D_BINDLESS_SET_AUX_BUFFER); - - vk_copy = &vk_copies[copy_count++]; - vk_copy->sType = VK_STRUCTURE_TYPE_COPY_DESCRIPTOR_SET; - vk_copy->pNext = NULL; - vk_copy->srcSet = src.heap->sets[binding.set].vk_descriptor_set; - vk_copy->srcBinding = binding.binding; - vk_copy->srcArrayElement = src.offset; - vk_copy->dstSet = dst.heap->sets[binding.set].vk_descriptor_set; - vk_copy->dstBinding = binding.binding; - vk_copy->dstArrayElement = dst.offset; - vk_copy->descriptorCount = 1; - } + const VkDeviceAddress *src_vas = src.heap->raw_va_aux_buffer.host_ptr; + VkDeviceAddress *dst_vas = dst.heap->raw_va_aux_buffer.host_ptr; + dst_vas[dst.offset] = src_vas[src.offset]; } if (copy_count) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 9de5b13e..61a98c36 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -2880,9 +2880,8 @@ enum vkd3d_bindless_set_flag VKD3D_BINDLESS_SET_UAV = (1u << 3), VKD3D_BINDLESS_SET_IMAGE = (1u << 4), VKD3D_BINDLESS_SET_BUFFER = (1u << 5), - VKD3D_BINDLESS_SET_AUX_BUFFER = (1u << 6), - VKD3D_BINDLESS_SET_RAW_SSBO = (1u << 7), - VKD3D_BINDLESS_SET_MUTABLE = (1u << 8), + VKD3D_BINDLESS_SET_RAW_SSBO = (1u << 6), + VKD3D_BINDLESS_SET_MUTABLE = (1u << 7), VKD3D_BINDLESS_SET_EXTRA_RAW_VA_AUX_BUFFER = (1u << 24), VKD3D_BINDLESS_SET_EXTRA_OFFSET_BUFFER = (1u << 25), |