From c39afe68f0390d45130c1317b3b7e65f55542c36 Mon Sep 17 00:00:00 2001 From: Jonathan Marek Date: Wed, 25 Sep 2019 23:00:16 -0400 Subject: [PATCH] turnip: basic descriptor sets (uniform buffer and samplers) Mostly copy-paste from radv, with a few modifications. Signed-off-by: Jonathan Marek Reviewed-by: Kristian H. Kristensen Acked-by: Eric Anholt --- src/freedreno/vulkan/tu_descriptor_set.c | 526 ++++++++++++++++++----- src/freedreno/vulkan/tu_private.h | 6 +- 2 files changed, 430 insertions(+), 102 deletions(-) diff --git a/src/freedreno/vulkan/tu_descriptor_set.c b/src/freedreno/vulkan/tu_descriptor_set.c index 0f49d26e2bb..e2a92689c75 100644 --- a/src/freedreno/vulkan/tu_descriptor_set.c +++ b/src/freedreno/vulkan/tu_descriptor_set.c @@ -61,6 +61,22 @@ create_sorted_bindings(const VkDescriptorSetLayoutBinding *bindings, return sorted_bindings; } +static uint32_t +descriptor_size(enum VkDescriptorType type) +{ + switch (type) { + case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER: + /* UBO pointer */ + return 8; + case VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER: + /* texture const + tu_sampler struct (includes border color) */ + return A6XX_TEX_CONST_DWORDS*4 + sizeof(struct tu_sampler); + default: + unreachable("unknown descriptor type\n"); + return 0; + } +} + VkResult tu_CreateDescriptorSetLayout( VkDevice _device, @@ -79,18 +95,12 @@ tu_CreateDescriptorSetLayout( DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO_EXT); uint32_t max_binding = 0; - uint32_t immutable_sampler_count = 0; - for (uint32_t j = 0; j < pCreateInfo->bindingCount; j++) { + for (uint32_t j = 0; j < pCreateInfo->bindingCount; j++) max_binding = MAX2(max_binding, pCreateInfo->pBindings[j].binding); - if (pCreateInfo->pBindings[j].pImmutableSamplers) - immutable_sampler_count += pCreateInfo->pBindings[j].descriptorCount; - } - uint32_t samplers_offset = + uint32_t size = sizeof(struct tu_descriptor_set_layout) + (max_binding + 1) * sizeof(set_layout->binding[0]); - size_t size = - samplers_offset + immutable_sampler_count * 4 * sizeof(uint32_t); set_layout = vk_alloc2(&device->alloc, pAllocator, size, 8, VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); @@ -125,50 +135,8 @@ tu_CreateDescriptorSetLayout( for (uint32_t j = 0; j < pCreateInfo->bindingCount; j++) { const VkDescriptorSetLayoutBinding *binding = bindings + j; uint32_t b = binding->binding; - uint32_t alignment; - unsigned binding_buffer_count = 0; - - switch (binding->descriptorType) { - case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC: - case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC: - assert(!(pCreateInfo->flags & - VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR)); - set_layout->binding[b].dynamic_offset_count = 1; - set_layout->dynamic_shader_stages |= binding->stageFlags; - set_layout->binding[b].size = 0; - binding_buffer_count = 1; - alignment = 1; - break; - case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER: - case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER: - case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER: - case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER: - set_layout->binding[b].size = 16; - binding_buffer_count = 1; - alignment = 16; - break; - case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE: - case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE: - case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT: - /* main descriptor + fmask descriptor */ - set_layout->binding[b].size = 64; - binding_buffer_count = 1; - alignment = 32; - break; - case VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER: - /* main descriptor + fmask descriptor + sampler */ - set_layout->binding[b].size = 96; - binding_buffer_count = 1; - alignment = 32; - break; - case VK_DESCRIPTOR_TYPE_SAMPLER: - set_layout->binding[b].size = 16; - alignment = 16; - break; - default: - unreachable("unknown descriptor type\n"); - break; - } + uint32_t alignment = 8; + unsigned binding_buffer_count = 1; set_layout->size = align(set_layout->size, alignment); set_layout->binding[b].type = binding->descriptorType; @@ -176,6 +144,7 @@ tu_CreateDescriptorSetLayout( set_layout->binding[b].offset = set_layout->size; set_layout->binding[b].buffer_offset = buffer_count; set_layout->binding[b].dynamic_offset_offset = dynamic_offset_count; + set_layout->binding[b].size = descriptor_size(binding->descriptorType); if (variable_flags && binding->binding < variable_flags->bindingCount && (variable_flags->pBindingFlags[binding->binding] & @@ -187,11 +156,6 @@ tu_CreateDescriptorSetLayout( set_layout->has_variable_descriptors = true; } - if (binding->pImmutableSamplers) { - set_layout->binding[b].immutable_samplers_offset = samplers_offset; - set_layout->has_immutable_samplers = true; - } - set_layout->size += binding->descriptorCount * set_layout->binding[b].size; buffer_count += binding->descriptorCount * binding_buffer_count; @@ -254,37 +218,8 @@ tu_GetDescriptorSetLayoutSupport( for (uint32_t i = 0; i < pCreateInfo->bindingCount; i++) { const VkDescriptorSetLayoutBinding *binding = bindings + i; - uint64_t descriptor_size = 0; - uint64_t descriptor_alignment = 1; - switch (binding->descriptorType) { - case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC: - case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC: - break; - case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER: - case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER: - case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER: - case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER: - descriptor_size = 16; - descriptor_alignment = 16; - break; - case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE: - case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE: - case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT: - descriptor_size = 64; - descriptor_alignment = 32; - break; - case VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER: - descriptor_size = 96; - descriptor_alignment = 32; - break; - case VK_DESCRIPTOR_TYPE_SAMPLER: - descriptor_size = 16; - descriptor_alignment = 16; - break; - default: - unreachable("unknown descriptor type\n"); - break; - } + uint64_t descriptor_sz = descriptor_size(binding->descriptorType); + uint64_t descriptor_alignment = 8; if (size && !align_u64(size, descriptor_alignment)) { supported = false; @@ -292,8 +227,8 @@ tu_GetDescriptorSetLayoutSupport( size = align_u64(size, descriptor_alignment); uint64_t max_count = UINT64_MAX; - if (descriptor_size) - max_count = (UINT64_MAX - size) / descriptor_size; + if (descriptor_sz) + max_count = (UINT64_MAX - size) / descriptor_sz; if (max_count < binding->descriptorCount) { supported = false; @@ -305,7 +240,7 @@ tu_GetDescriptorSetLayoutSupport( variable_count->maxVariableDescriptorCount = MIN2(UINT32_MAX, max_count); } - size += binding->descriptorCount * descriptor_size; + size += binding->descriptorCount * descriptor_sz; } free(bindings); @@ -394,6 +329,134 @@ tu_DestroyPipelineLayout(VkDevice _device, #define EMPTY 1 +static VkResult +tu_descriptor_set_create(struct tu_device *device, + struct tu_descriptor_pool *pool, + const struct tu_descriptor_set_layout *layout, + const uint32_t *variable_count, + struct tu_descriptor_set **out_set) +{ + struct tu_descriptor_set *set; + uint32_t buffer_count = layout->buffer_count; + if (variable_count) { + unsigned stride = 1; + if (layout->binding[layout->binding_count - 1].type == VK_DESCRIPTOR_TYPE_SAMPLER || + layout->binding[layout->binding_count - 1].type == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) + stride = 0; + buffer_count = layout->binding[layout->binding_count - 1].buffer_offset + + *variable_count * stride; + } + unsigned range_offset = sizeof(struct tu_descriptor_set) + + sizeof(struct tu_bo *) * buffer_count; + unsigned mem_size = range_offset + + sizeof(struct tu_descriptor_range) * layout->dynamic_offset_count; + + if (pool->host_memory_base) { + if (pool->host_memory_end - pool->host_memory_ptr < mem_size) + return vk_error(device->instance, VK_ERROR_OUT_OF_POOL_MEMORY); + + set = (struct tu_descriptor_set*)pool->host_memory_ptr; + pool->host_memory_ptr += mem_size; + } else { + set = vk_alloc2(&device->alloc, NULL, mem_size, 8, + VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); + + if (!set) + return vk_error(device->instance, VK_ERROR_OUT_OF_HOST_MEMORY); + } + + memset(set, 0, mem_size); + + if (layout->dynamic_offset_count) { + set->dynamic_descriptors = (struct tu_descriptor_range*)((uint8_t*)set + range_offset); + } + + set->layout = layout; + uint32_t layout_size = layout->size; + if (variable_count) { + assert(layout->has_variable_descriptors); + uint32_t stride = layout->binding[layout->binding_count - 1].size; + if (layout->binding[layout->binding_count - 1].type == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) + stride = 1; + + layout_size = layout->binding[layout->binding_count - 1].offset + + *variable_count * stride; + } + + if (layout_size) { + set->size = layout_size; + + if (!pool->host_memory_base && pool->entry_count == pool->max_entry_count) { + vk_free2(&device->alloc, NULL, set); + return vk_error(device->instance, VK_ERROR_OUT_OF_POOL_MEMORY); + } + + /* try to allocate linearly first, so that we don't spend + * time looking for gaps if the app only allocates & + * resets via the pool. */ + if (pool->current_offset + layout_size <= pool->size) { + set->mapped_ptr = (uint32_t*)(pool->bo.map + pool->current_offset); + set->va = pool->bo.iova + pool->current_offset; + if (!pool->host_memory_base) { + pool->entries[pool->entry_count].offset = pool->current_offset; + pool->entries[pool->entry_count].size = layout_size; + pool->entries[pool->entry_count].set = set; + pool->entry_count++; + } + pool->current_offset += layout_size; + } else if (!pool->host_memory_base) { + uint64_t offset = 0; + int index; + + for (index = 0; index < pool->entry_count; ++index) { + if (pool->entries[index].offset - offset >= layout_size) + break; + offset = pool->entries[index].offset + pool->entries[index].size; + } + + if (pool->size - offset < layout_size) { + vk_free2(&device->alloc, NULL, set); + return vk_error(device->instance, VK_ERROR_OUT_OF_POOL_MEMORY); + } + + set->mapped_ptr = (uint32_t*)(pool->bo.map + offset); + set->va = pool->bo.iova + offset; + memmove(&pool->entries[index + 1], &pool->entries[index], + sizeof(pool->entries[0]) * (pool->entry_count - index)); + pool->entries[index].offset = offset; + pool->entries[index].size = layout_size; + pool->entries[index].set = set; + pool->entry_count++; + } else + return vk_error(device->instance, VK_ERROR_OUT_OF_POOL_MEMORY); + } + + *out_set = set; + return VK_SUCCESS; +} + +static void +tu_descriptor_set_destroy(struct tu_device *device, + struct tu_descriptor_pool *pool, + struct tu_descriptor_set *set, + bool free_bo) +{ + assert(!pool->host_memory_base); + + if (free_bo && set->size && !pool->host_memory_base) { + uint32_t offset = (uint8_t*)set->mapped_ptr - (uint8_t*)pool->bo.map; + for (int i = 0; i < pool->entry_count; ++i) { + if (pool->entries[i].offset == offset) { + memmove(&pool->entries[i], &pool->entries[i+1], + sizeof(pool->entries[i]) * (pool->entry_count - i - 1)); + --pool->entry_count; + break; + } + } + } + vk_free2(&device->alloc, NULL, set); +} + VkResult tu_CreateDescriptorPool(VkDevice _device, const VkDescriptorPoolCreateInfo *pCreateInfo, @@ -401,8 +464,53 @@ tu_CreateDescriptorPool(VkDevice _device, VkDescriptorPool *pDescriptorPool) { TU_FROM_HANDLE(tu_device, device, _device); - tu_use_args(device); - tu_stub(); + struct tu_descriptor_pool *pool; + uint64_t size = sizeof(struct tu_descriptor_pool); + uint64_t bo_size = 0, bo_count = 0, range_count = 0; + + for (unsigned i = 0; i < pCreateInfo->poolSizeCount; ++i) { + if (pCreateInfo->pPoolSizes[i].type != VK_DESCRIPTOR_TYPE_SAMPLER) + bo_count += pCreateInfo->pPoolSizes[i].descriptorCount; + + bo_size += descriptor_size(pCreateInfo->pPoolSizes[i].type) * + pCreateInfo->pPoolSizes[i].descriptorCount; + } + + if (!(pCreateInfo->flags & VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT)) { + uint64_t host_size = pCreateInfo->maxSets * sizeof(struct tu_descriptor_set); + host_size += sizeof(struct tu_bo*) * bo_count; + host_size += sizeof(struct tu_descriptor_range) * range_count; + size += host_size; + } else { + size += sizeof(struct tu_descriptor_pool_entry) * pCreateInfo->maxSets; + } + + pool = vk_alloc2(&device->alloc, pAllocator, size, 8, + VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); + if (!pool) + return vk_error(device->instance, VK_ERROR_OUT_OF_HOST_MEMORY); + + memset(pool, 0, sizeof(*pool)); + + if (!(pCreateInfo->flags & VK_DESCRIPTOR_POOL_CREATE_FREE_DESCRIPTOR_SET_BIT)) { + pool->host_memory_base = (uint8_t*)pool + sizeof(struct tu_descriptor_pool); + pool->host_memory_ptr = pool->host_memory_base; + pool->host_memory_end = (uint8_t*)pool + size; + } + + if (bo_size) { + VkResult ret; + + ret = tu_bo_init_new(device, &pool->bo, bo_size); + assert(ret == VK_SUCCESS); + + ret = tu_bo_map(device, &pool->bo); + assert(ret == VK_SUCCESS); + } + pool->size = bo_size; + pool->max_entry_count = pCreateInfo->maxSets; + + *pDescriptorPool = tu_descriptor_pool_to_handle(pool); return VK_SUCCESS; } @@ -411,6 +519,21 @@ tu_DestroyDescriptorPool(VkDevice _device, VkDescriptorPool _pool, const VkAllocationCallbacks *pAllocator) { + TU_FROM_HANDLE(tu_device, device, _device); + TU_FROM_HANDLE(tu_descriptor_pool, pool, _pool); + + if (!pool) + return; + + if (!pool->host_memory_base) { + for(int i = 0; i < pool->entry_count; ++i) { + tu_descriptor_set_destroy(device, pool, pool->entries[i].set, false); + } + } + + if (pool->size) + tu_bo_finish(device, &pool->bo); + vk_free2(&device->alloc, pAllocator, pool); } VkResult @@ -421,8 +544,16 @@ tu_ResetDescriptorPool(VkDevice _device, TU_FROM_HANDLE(tu_device, device, _device); TU_FROM_HANDLE(tu_descriptor_pool, pool, descriptorPool); - tu_use_args(device, pool); - tu_stub(); + if (!pool->host_memory_base) { + for(int i = 0; i < pool->entry_count; ++i) { + tu_descriptor_set_destroy(device, pool, pool->entries[i].set, false); + } + pool->entry_count = 0; + } + + pool->current_offset = 0; + pool->host_memory_ptr = pool->host_memory_base; + return VK_SUCCESS; } @@ -434,9 +565,44 @@ tu_AllocateDescriptorSets(VkDevice _device, TU_FROM_HANDLE(tu_device, device, _device); TU_FROM_HANDLE(tu_descriptor_pool, pool, pAllocateInfo->descriptorPool); - tu_use_args(device, pool); - tu_stub(); - return VK_SUCCESS; + VkResult result = VK_SUCCESS; + uint32_t i; + struct tu_descriptor_set *set = NULL; + + const VkDescriptorSetVariableDescriptorCountAllocateInfoEXT *variable_counts = + vk_find_struct_const(pAllocateInfo->pNext, DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_ALLOCATE_INFO_EXT); + const uint32_t zero = 0; + + /* allocate a set of buffers for each shader to contain descriptors */ + for (i = 0; i < pAllocateInfo->descriptorSetCount; i++) { + TU_FROM_HANDLE(tu_descriptor_set_layout, layout, + pAllocateInfo->pSetLayouts[i]); + + const uint32_t *variable_count = NULL; + if (variable_counts) { + if (i < variable_counts->descriptorSetCount) + variable_count = variable_counts->pDescriptorCounts + i; + else + variable_count = &zero; + } + + assert(!(layout->flags & VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR)); + + result = tu_descriptor_set_create(device, pool, layout, variable_count, &set); + if (result != VK_SUCCESS) + break; + + pDescriptorSets[i] = tu_descriptor_set_to_handle(set); + } + + if (result != VK_SUCCESS) { + tu_FreeDescriptorSets(_device, pAllocateInfo->descriptorPool, + i, pDescriptorSets); + for (i = 0; i < pAllocateInfo->descriptorSetCount; i++) { + pDescriptorSets[i] = VK_NULL_HANDLE; + } + } + return result; } VkResult @@ -448,11 +614,79 @@ tu_FreeDescriptorSets(VkDevice _device, TU_FROM_HANDLE(tu_device, device, _device); TU_FROM_HANDLE(tu_descriptor_pool, pool, descriptorPool); - tu_use_args(device, pool); - tu_stub(); + for (uint32_t i = 0; i < count; i++) { + TU_FROM_HANDLE(tu_descriptor_set, set, pDescriptorSets[i]); + + if (set && !pool->host_memory_base) + tu_descriptor_set_destroy(device, pool, set, true); + } return VK_SUCCESS; } +static void write_buffer_descriptor(struct tu_device *device, + struct tu_cmd_buffer *cmd_buffer, + unsigned *dst, + struct tu_bo **buffer_list, + const VkDescriptorBufferInfo *buffer_info) +{ + TU_FROM_HANDLE(tu_buffer, buffer, buffer_info->buffer); + uint64_t va = buffer->bo->iova; + + va += buffer_info->offset + buffer->bo_offset; + dst[0] = va; + dst[1] = va >> 32; + + if (cmd_buffer) + tu_bo_list_add(&cmd_buffer->bo_list, buffer->bo, MSM_SUBMIT_BO_READ); + else + *buffer_list = buffer->bo; +} + +static void +write_image_descriptor(struct tu_device *device, + struct tu_cmd_buffer *cmd_buffer, + unsigned size, unsigned *dst, + struct tu_bo **buffer_list, + VkDescriptorType descriptor_type, + const VkDescriptorImageInfo *image_info) +{ + TU_FROM_HANDLE(tu_image_view, iview, image_info->imageView); + uint32_t *descriptor; + + if (descriptor_type == VK_DESCRIPTOR_TYPE_STORAGE_IMAGE) { + descriptor = iview->storage_descriptor; + } else { + descriptor = iview->descriptor; + } + + memcpy(dst, descriptor, sizeof(iview->descriptor)); + + if (cmd_buffer) + tu_bo_list_add(&cmd_buffer->bo_list, iview->image->bo, MSM_SUBMIT_BO_READ); + else + *buffer_list = iview->image->bo; +} + +static void +write_combined_image_sampler_descriptor(struct tu_device *device, + struct tu_cmd_buffer *cmd_buffer, + unsigned sampler_offset, + unsigned *dst, + struct tu_bo **buffer_list, + VkDescriptorType descriptor_type, + const VkDescriptorImageInfo *image_info, + bool has_sampler) +{ + TU_FROM_HANDLE(tu_sampler, sampler, image_info->sampler); + + write_image_descriptor(device, cmd_buffer, sampler_offset, dst, buffer_list, + descriptor_type, image_info); + /* copy over sampler state */ + if (has_sampler) { + memcpy(dst + sampler_offset / sizeof(*dst), sampler, sizeof(*sampler)); + } +} + void tu_update_descriptor_sets(struct tu_device *device, struct tu_cmd_buffer *cmd_buffer, @@ -462,6 +696,98 @@ tu_update_descriptor_sets(struct tu_device *device, uint32_t descriptorCopyCount, const VkCopyDescriptorSet *pDescriptorCopies) { + uint32_t i, j; + for (i = 0; i < descriptorWriteCount; i++) { + const VkWriteDescriptorSet *writeset = &pDescriptorWrites[i]; + TU_FROM_HANDLE(tu_descriptor_set, set, + dstSetOverride ? dstSetOverride : writeset->dstSet); + const struct tu_descriptor_set_binding_layout *binding_layout = + set->layout->binding + writeset->dstBinding; + uint32_t *ptr = set->mapped_ptr; + struct tu_bo **buffer_list = set->descriptors; + + ptr += binding_layout->offset / 4; + + ptr += binding_layout->size * writeset->dstArrayElement / 4; + buffer_list += binding_layout->buffer_offset; + buffer_list += writeset->dstArrayElement; + for (j = 0; j < writeset->descriptorCount; ++j) { + switch(writeset->descriptorType) { + case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER: + write_buffer_descriptor(device, cmd_buffer, ptr, buffer_list, + writeset->pBufferInfo + j); + break; + case VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER: + write_combined_image_sampler_descriptor(device, cmd_buffer, + A6XX_TEX_CONST_DWORDS*4, + ptr, buffer_list, + writeset->descriptorType, + writeset->pImageInfo + j, + !binding_layout->immutable_samplers_offset); + break; + default: + unreachable("unimplemented descriptor type"); + break; + } + ptr += binding_layout->size / 4; + ++buffer_list; + } + } + + for (i = 0; i < descriptorCopyCount; i++) { + const VkCopyDescriptorSet *copyset = &pDescriptorCopies[i]; + TU_FROM_HANDLE(tu_descriptor_set, src_set, + copyset->srcSet); + TU_FROM_HANDLE(tu_descriptor_set, dst_set, + copyset->dstSet); + const struct tu_descriptor_set_binding_layout *src_binding_layout = + src_set->layout->binding + copyset->srcBinding; + const struct tu_descriptor_set_binding_layout *dst_binding_layout = + dst_set->layout->binding + copyset->dstBinding; + uint32_t *src_ptr = src_set->mapped_ptr; + uint32_t *dst_ptr = dst_set->mapped_ptr; + struct tu_bo **src_buffer_list = src_set->descriptors; + struct tu_bo **dst_buffer_list = dst_set->descriptors; + + src_ptr += src_binding_layout->offset / 4; + dst_ptr += dst_binding_layout->offset / 4; + + src_ptr += src_binding_layout->size * copyset->srcArrayElement / 4; + dst_ptr += dst_binding_layout->size * copyset->dstArrayElement / 4; + + src_buffer_list += src_binding_layout->buffer_offset; + src_buffer_list += copyset->srcArrayElement; + + dst_buffer_list += dst_binding_layout->buffer_offset; + dst_buffer_list += copyset->dstArrayElement; + + for (j = 0; j < copyset->descriptorCount; ++j) { + switch (src_binding_layout->type) { + case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC: + case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC: { + unsigned src_idx = copyset->srcArrayElement + j; + unsigned dst_idx = copyset->dstArrayElement + j; + struct tu_descriptor_range *src_range, *dst_range; + src_idx += src_binding_layout->dynamic_offset_offset; + dst_idx += dst_binding_layout->dynamic_offset_offset; + + src_range = src_set->dynamic_descriptors + src_idx; + dst_range = dst_set->dynamic_descriptors + dst_idx; + *dst_range = *src_range; + break; + } + default: + memcpy(dst_ptr, src_ptr, src_binding_layout->size); + } + src_ptr += src_binding_layout->size / 4; + dst_ptr += dst_binding_layout->size / 4; + + if (src_binding_layout->type != VK_DESCRIPTOR_TYPE_SAMPLER) { + /* Sampler descriptors don't have a buffer list. */ + dst_buffer_list[j] = src_buffer_list[j]; + } + } + } } void diff --git a/src/freedreno/vulkan/tu_private.h b/src/freedreno/vulkan/tu_private.h index 050fe5928fc..170be1a149e 100644 --- a/src/freedreno/vulkan/tu_private.h +++ b/src/freedreno/vulkan/tu_private.h @@ -586,6 +586,8 @@ struct tu_descriptor_set uint64_t va; uint32_t *mapped_ptr; struct tu_descriptor_range *dynamic_descriptors; + + struct tu_bo *descriptors[0]; }; struct tu_push_descriptor_set @@ -603,7 +605,7 @@ struct tu_descriptor_pool_entry struct tu_descriptor_pool { - uint8_t *mapped_ptr; + struct tu_bo bo; uint64_t current_offset; uint64_t size; @@ -1229,7 +1231,7 @@ struct tu_image VkDeviceMemory owned_memory; /* Set when bound */ - const struct tu_bo *bo; + struct tu_bo *bo; VkDeviceSize bo_offset; };