* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*/
+
+/**
+ * @file
+ *
+ * We use the bindless descriptor model, which maps fairly closely to how
+ * Vulkan descriptor sets work. The two exceptions are input attachments and
+ * dynamic descriptors, which have to be patched when recording command
+ * buffers. We reserve an extra descriptor set for these. This descriptor set
+ * contains all the input attachments in the pipeline, in order, and then all
+ * the dynamic descriptors. The dynamic descriptors are stored in the CPU-side
+ * datastructure for each tu_descriptor_set, and then combined into one big
+ * descriptor set at CmdBindDescriptors time/draw time.
+ */
+
#include "tu_private.h"
#include <assert.h>
}
static uint32_t
-descriptor_size(enum VkDescriptorType type)
+descriptor_size(VkDescriptorType type)
{
switch (type) {
case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC:
case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC:
- return 0;
- 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:
- /* 64bit pointer */
- return 8;
- case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE:
- case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE:
case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT:
- return A6XX_TEX_CONST_DWORDS*4;
+ /* These are remapped to the special driver-managed descriptor set,
+ * hence they don't take up any space in the original descriptor set:
+ */
+ return 0;
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);
- case VK_DESCRIPTOR_TYPE_SAMPLER:
- return sizeof(struct tu_sampler);
+ /* We make offsets and sizes all 16 dwords, to match how the hardware
+ * interprets indices passed to sample/load/store instructions in
+ * multiples of 16 dwords. This means that "normal" descriptors are all
+ * of size 16, with padding for smaller descriptors like uniform storage
+ * descriptors which are less than 16 dwords. However combined images
+ * and samplers are actually two descriptors, so they have size 2.
+ */
+ return A6XX_TEX_CONST_DWORDS * 4 * 2;
default:
- unreachable("unknown descriptor type\n");
- return 0;
+ return A6XX_TEX_CONST_DWORDS * 4;
}
}
uint32_t samplers_offset = sizeof(struct tu_descriptor_set_layout) +
(max_binding + 1) * sizeof(set_layout->binding[0]);
- uint32_t size = samplers_offset + immutable_sampler_count * sizeof(struct tu_sampler);
+ uint32_t size = samplers_offset + immutable_sampler_count * A6XX_TEX_SAMP_DWORDS * 4;
set_layout = vk_alloc2(&device->alloc, pAllocator, size, 8,
VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
set_layout->flags = pCreateInfo->flags;
- /* We just allocate all the samplers at the end of the struct */
+ /* We just allocate all the immutable samplers at the end of the struct */
struct tu_sampler *samplers = (void*) &set_layout->binding[max_binding + 1];
VkDescriptorSetLayoutBinding *bindings = create_sorted_bindings(
set_layout->binding_count = max_binding + 1;
set_layout->shader_stages = 0;
- set_layout->dynamic_shader_stages = 0;
set_layout->has_immutable_samplers = false;
set_layout->size = 0;
+ set_layout->dynamic_ubo = 0;
memset(set_layout->binding, 0,
size - sizeof(struct tu_descriptor_set_layout));
- uint32_t buffer_count = 0;
uint32_t dynamic_offset_count = 0;
+ uint32_t input_attachment_count = 0;
+ uint32_t buffer_count = 0;
for (uint32_t j = 0; j < pCreateInfo->bindingCount; j++) {
const VkDescriptorSetLayoutBinding *binding = bindings + j;
uint32_t b = binding->binding;
- uint32_t alignment = 4;
- unsigned binding_buffer_count = 1;
-
- 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;
- break;
- default:
- break;
- }
- set_layout->size = align(set_layout->size, alignment);
set_layout->binding[b].type = binding->descriptorType;
set_layout->binding[b].array_size = binding->descriptorCount;
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].input_attachment_offset = input_attachment_count;
set_layout->binding[b].size = descriptor_size(binding->descriptorType);
+ set_layout->binding[b].shader_stages = binding->stageFlags;
if (variable_flags && binding->binding < variable_flags->bindingCount &&
(variable_flags->pBindingFlags[binding->binding] &
set_layout->size +=
binding->descriptorCount * set_layout->binding[b].size;
- buffer_count += binding->descriptorCount * binding_buffer_count;
- dynamic_offset_count += binding->descriptorCount *
- set_layout->binding[b].dynamic_offset_count;
+ if (binding->descriptorType != VK_DESCRIPTOR_TYPE_SAMPLER &&
+ binding->descriptorType != VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT)
+ buffer_count += binding->descriptorCount;
+ if (binding->descriptorType == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC ||
+ binding->descriptorType == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC) {
+ if (binding->descriptorType == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC) {
+ STATIC_ASSERT(MAX_DYNAMIC_BUFFERS <= 8 * sizeof(set_layout->dynamic_ubo));
+ set_layout->dynamic_ubo |=
+ ((1u << binding->descriptorCount) - 1) << dynamic_offset_count;
+ }
+
+ dynamic_offset_count += binding->descriptorCount;
+ }
+ if (binding->descriptorType == VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT)
+ input_attachment_count += binding->descriptorCount;
set_layout->shader_stages |= binding->stageFlags;
}
free(bindings);
- set_layout->buffer_count = buffer_count;
set_layout->dynamic_offset_count = dynamic_offset_count;
+ set_layout->input_attachment_count = input_attachment_count;
+ set_layout->buffer_count = buffer_count;
*pSetLayout = tu_descriptor_set_layout_to_handle(set_layout);
return vk_error(device->instance, VK_ERROR_OUT_OF_HOST_MEMORY);
layout->num_sets = pCreateInfo->setLayoutCount;
+ layout->input_attachment_count = 0;
+ layout->dynamic_offset_count = 0;
- unsigned dynamic_offset_count = 0;
+ unsigned dynamic_offset_count = 0, input_attachment_count = 0;
_mesa_sha1_init(&ctx);
for (uint32_t set = 0; set < pCreateInfo->setLayoutCount; set++) {
TU_FROM_HANDLE(tu_descriptor_set_layout, set_layout,
pCreateInfo->pSetLayouts[set]);
layout->set[set].layout = set_layout;
-
layout->set[set].dynamic_offset_start = dynamic_offset_count;
+ layout->set[set].input_attachment_start = input_attachment_count;
+ dynamic_offset_count += set_layout->dynamic_offset_count;
+ input_attachment_count += set_layout->input_attachment_count;
+
for (uint32_t b = 0; b < set_layout->binding_count; b++) {
- dynamic_offset_count += set_layout->binding[b].array_size *
- set_layout->binding[b].dynamic_offset_count;
if (set_layout->binding[b].immutable_samplers_offset)
_mesa_sha1_update(
&ctx,
}
layout->dynamic_offset_count = dynamic_offset_count;
+ layout->input_attachment_count = input_attachment_count;
layout->push_constant_size = 0;
for (unsigned i = 0; i < pCreateInfo->pushConstantRangeCount; ++i) {
buffer_count = layout->binding[layout->binding_count - 1].buffer_offset +
*variable_count * stride;
}
- unsigned range_offset = sizeof(struct tu_descriptor_set) +
+ unsigned dynamic_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;
+ unsigned mem_size = dynamic_offset +
+ A6XX_TEX_CONST_DWORDS * 4 * (layout->dynamic_offset_count +
+ layout->input_attachment_count);;
if (pool->host_memory_base) {
if (pool->host_memory_end - pool->host_memory_ptr < mem_size)
memset(set, 0, mem_size);
- if (layout->dynamic_offset_count) {
- set->dynamic_descriptors = (struct tu_descriptor_range*)((uint8_t*)set + range_offset);
+ if (layout->dynamic_offset_count + layout->input_attachment_count > 0) {
+ set->dynamic_descriptors = (uint32_t *)((uint8_t*)set + dynamic_offset);
}
set->layout = layout;
+ set->pool = pool;
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;
}
TU_FROM_HANDLE(tu_device, device, _device);
struct tu_descriptor_pool *pool;
uint64_t size = sizeof(struct tu_descriptor_pool);
- uint64_t bo_size = 0, bo_count = 0, range_count = 0;
+ uint64_t bo_size = 0, bo_count = 0, dynamic_count = 0;
for (unsigned i = 0; i < pCreateInfo->poolSizeCount; ++i) {
if (pCreateInfo->pPoolSizes[i].type != VK_DESCRIPTOR_TYPE_SAMPLER)
switch(pCreateInfo->pPoolSizes[i].type) {
case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC:
case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC:
- range_count += pCreateInfo->pPoolSizes[i].descriptorCount;
+ case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT:
+ dynamic_count += pCreateInfo->pPoolSizes[i].descriptorCount;
default:
break;
}
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;
+ host_size += A6XX_TEX_CONST_DWORDS * 4 * dynamic_count;
size += host_size;
} else {
size += sizeof(struct tu_descriptor_pool_entry) * pCreateInfo->maxSets;
struct tu_cmd_buffer *cmd_buffer,
unsigned *dst,
struct tu_bo **buffer_list,
- const VkBufferView _buffer_view)
+ const VkBufferView buffer_view)
{
- tu_finishme("texel buffer descriptor");
+ TU_FROM_HANDLE(tu_buffer_view, view, buffer_view);
+
+ memcpy(dst, view->descriptor, sizeof(view->descriptor));
+
+ if (cmd_buffer)
+ tu_bo_list_add(&cmd_buffer->bo_list, view->buffer->bo, MSM_SUBMIT_BO_READ);
+ else
+ *buffer_list = view->buffer->bo;
+}
+
+static uint32_t get_range(struct tu_buffer *buf, VkDeviceSize offset,
+ VkDeviceSize range)
+{
+ if (range == VK_WHOLE_SIZE) {
+ return buf->size - offset;
+ } else {
+ return range;
+ }
}
static void write_buffer_descriptor(struct tu_device *device,
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;
+ uint64_t va = tu_buffer_iova(buffer) + buffer_info->offset;
+ uint32_t range = get_range(buffer, buffer_info->offset, buffer_info->range);
+ range = ALIGN_POT(range, 4) / 4;
+ dst[0] =
+ A6XX_IBO_0_TILE_MODE(TILE6_LINEAR) | A6XX_IBO_0_FMT(FMT6_32_UINT);
+ dst[1] = range;
+ dst[2] =
+ A6XX_IBO_2_UNK4 | A6XX_IBO_2_TYPE(A6XX_TEX_1D) | A6XX_IBO_2_UNK31;
+ dst[3] = 0;
+ dst[4] = A6XX_IBO_4_BASE_LO(va);
+ dst[5] = A6XX_IBO_5_BASE_HI(va >> 32);
+ for (int i = 6; i < A6XX_TEX_CONST_DWORDS; i++)
+ dst[i] = 0;
if (cmd_buffer)
tu_bo_list_add(&cmd_buffer->bo_list, buffer->bo, MSM_SUBMIT_BO_READ);
*buffer_list = buffer->bo;
}
-static void write_dynamic_buffer_descriptor(struct tu_device *device,
- struct tu_descriptor_range *range,
- struct tu_bo **buffer_list,
- const VkDescriptorBufferInfo *buffer_info)
+static void write_ubo_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;
- unsigned size = buffer_info->range;
- if (buffer_info->range == VK_WHOLE_SIZE)
- size = buffer->size - buffer_info->offset;
+ uint32_t range = get_range(buffer, buffer_info->offset, buffer_info->range);
+ /* The HW range is in vec4 units */
+ range = ALIGN_POT(range, 16) / 16;
+ uint64_t va = tu_buffer_iova(buffer) + buffer_info->offset;
+ dst[0] = A6XX_UBO_0_BASE_LO(va);
+ dst[1] = A6XX_UBO_1_BASE_HI(va >> 32) | A6XX_UBO_1_SIZE(range);
- va += buffer_info->offset + buffer->bo_offset;
- range->va = va;
- range->size = size;
-
- *buffer_list = buffer->bo;
+ if (cmd_buffer)
+ tu_bo_list_add(&cmd_buffer->bo_list, buffer->bo, MSM_SUBMIT_BO_READ);
+ else
+ *buffer_list = buffer->bo;
}
static void
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;
+ memcpy(dst, iview->storage_descriptor, sizeof(iview->storage_descriptor));
} else {
- descriptor = iview->descriptor;
+ memcpy(dst, iview->descriptor, sizeof(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
descriptor_type, image_info);
/* copy over sampler state */
if (has_sampler) {
- memcpy(dst + sampler_offset / sizeof(*dst), sampler, sizeof(*sampler));
+ memcpy(dst + A6XX_TEX_CONST_DWORDS, sampler, sizeof(*sampler));
}
}
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;
-
- const struct tu_sampler *samplers = tu_immutable_samplers(set->layout, binding_layout);
+ struct tu_bo **buffer_list = set->buffers;
ptr += binding_layout->offset / 4;
- ptr += binding_layout->size * writeset->dstArrayElement / 4;
+ ptr += (binding_layout->size / 4) * writeset->dstArrayElement;
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_DYNAMIC:
- case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC: {
- unsigned idx = writeset->dstArrayElement + j;
- idx += binding_layout->dynamic_offset_offset;
+ case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC: {
assert(!(set->layout->flags & VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR));
- write_dynamic_buffer_descriptor(device, set->dynamic_descriptors + idx,
- buffer_list, writeset->pBufferInfo + j);
+ unsigned idx = writeset->dstArrayElement + j;
+ idx += set->layout->input_attachment_count + binding_layout->dynamic_offset_offset;
+ write_ubo_descriptor(device, cmd_buffer,
+ set->dynamic_descriptors + A6XX_TEX_CONST_DWORDS * idx,
+ buffer_list, writeset->pBufferInfo + j);
break;
}
-
case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER:
+ write_ubo_descriptor(device, cmd_buffer, ptr, buffer_list,
+ writeset->pBufferInfo + j);
+ break;
+ case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC: {
+ assert(!(set->layout->flags & VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR));
+ unsigned idx = writeset->dstArrayElement + j;
+ idx += set->layout->input_attachment_count + binding_layout->dynamic_offset_offset;
+ write_buffer_descriptor(device, cmd_buffer,
+ set->dynamic_descriptors + A6XX_TEX_CONST_DWORDS * idx,
+ buffer_list, writeset->pBufferInfo + j);
+ break;
+ }
case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER:
write_buffer_descriptor(device, cmd_buffer, ptr, buffer_list,
writeset->pBufferInfo + j);
break;
case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE:
case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE:
- case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT:
write_image_descriptor(device, cmd_buffer, ptr, buffer_list,
writeset->descriptorType,
writeset->pImageInfo + j);
break;
+ case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT: {
+ unsigned idx = writeset->dstArrayElement + j;
+ idx += binding_layout->input_attachment_offset;
+ write_image_descriptor(device, cmd_buffer,
+ set->dynamic_descriptors + A6XX_TEX_CONST_DWORDS * idx,
+ buffer_list, writeset->descriptorType,
+ writeset->pImageInfo + j);
+ break;
+ }
case VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER:
write_combined_image_sampler_descriptor(device, cmd_buffer,
- A6XX_TEX_CONST_DWORDS*4,
+ A6XX_TEX_CONST_DWORDS * 4,
ptr, buffer_list,
writeset->descriptorType,
writeset->pImageInfo + j,
!binding_layout->immutable_samplers_offset);
- if (binding_layout->immutable_samplers_offset) {
- const unsigned idx = writeset->dstArrayElement + j;
- memcpy((char*)ptr + A6XX_TEX_CONST_DWORDS*4, &samplers[idx],
- sizeof(struct tu_sampler));
- }
break;
case VK_DESCRIPTOR_TYPE_SAMPLER:
write_sampler_descriptor(device, ptr, writeset->pImageInfo + j);
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;
+ struct tu_bo **src_buffer_list = src_set->buffers;
+ struct tu_bo **dst_buffer_list = dst_set->buffers;
src_ptr += src_binding_layout->offset / 4;
dst_ptr += dst_binding_layout->offset / 4;
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_set->layout->input_attachment_count;
+ dst_idx += dst_set->layout->input_attachment_count;
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;
+ uint32_t *src_dynamic, *dst_dynamic;
+ src_dynamic = src_set->dynamic_descriptors + src_idx * A6XX_TEX_CONST_DWORDS;
+ dst_dynamic = dst_set->dynamic_descriptors + dst_idx * A6XX_TEX_CONST_DWORDS;
+ memcpy(dst_dynamic, src_dynamic, A6XX_TEX_CONST_DWORDS * 4);
+ break;
+ }
+ case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT: {
+ unsigned src_idx = copyset->srcArrayElement + j;
+ unsigned dst_idx = copyset->dstArrayElement + j;
+ src_idx += src_binding_layout->input_attachment_offset;
+ dst_idx += dst_binding_layout->input_attachment_offset;
+
+ uint32_t *src_dynamic, *dst_dynamic;
+ src_dynamic = src_set->dynamic_descriptors + src_idx * A6XX_TEX_CONST_DWORDS;
+ dst_dynamic = dst_set->dynamic_descriptors + dst_idx * A6XX_TEX_CONST_DWORDS;
+ memcpy(dst_dynamic, src_dynamic, A6XX_TEX_CONST_DWORDS * 4);
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;
projects / mesa.git / blobdiff