KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lavapipe: unbreak push descriptor templates 

the stride/offset calculation on this was all wrong, so just unroll the
template before enqueuing to present a uniform stream of descriptors
without trying to copy potentially megabytes of data

Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12708>
This commit is contained in:
Mike Blumenkrantz 2021-09-02 16:16:40 -04:00 committed by Marge Bot
parent 522f135d06
commit fd3eaabf28
2 changed files with 54 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/gallium/frontends/lavapipe/lvp_cmd_buffer.c
View File

@ -443,34 +443,60 @@ VKAPI_ATTR void VKAPI_CALL lvp_CmdPushDescriptorSetWithTemplateKHR(
for (unsigned i = 0; i < templ->entry_count; i++) { for (unsigned i = 0; i < templ->entry_count; i++) {
VkDescriptorUpdateTemplateEntry *entry = &templ->entry[i]; VkDescriptorUpdateTemplateEntry *entry = &templ->entry[i];
if (entry->descriptorCount > 1) { switch (entry->descriptorType) {
info_size += entry->stride * entry->descriptorCount; case VK_DESCRIPTOR_TYPE_SAMPLER:
} else { case VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER:
switch (entry->descriptorType) { case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE:
case VK_DESCRIPTOR_TYPE_SAMPLER: case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE:
case VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER: case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT:
case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE: info_size += sizeof(VkDescriptorImageInfo) * entry->descriptorCount;
case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE: break;
case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT: case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER:
info_size += sizeof(VkDescriptorImageInfo); case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER:
break; info_size += sizeof(VkBufferView) * entry->descriptorCount;
case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER: break;
case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER: case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER:
info_size += sizeof(VkBufferView); case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER:
break; case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC:
case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER: case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC:
case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER: default:
case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC: info_size += sizeof(VkDescriptorBufferInfo) * entry->descriptorCount;
case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC: break;
default:
info_size += sizeof(VkDescriptorBufferInfo);
break;
}
} }
} }
cmd->u.push_descriptor_set_with_template_khr.data = vk_zalloc(cmd_buffer->queue.alloc, info_size, 8, VK_SYSTEM_ALLOCATION_SCOPE_COMMAND); cmd->u.push_descriptor_set_with_template_khr.data = vk_zalloc(cmd_buffer->queue.alloc, info_size, 8, VK_SYSTEM_ALLOCATION_SCOPE_COMMAND);
memcpy(cmd->u.push_descriptor_set_with_template_khr.data, pData, info_size);
uint64_t offset = 0;
for (unsigned i = 0; i < templ->entry_count; i++) {
VkDescriptorUpdateTemplateEntry *entry = &templ->entry[i];
unsigned size = 0;
switch (entry->descriptorType) {
case VK_DESCRIPTOR_TYPE_SAMPLER:
case VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER:
case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE:
case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE:
case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT:
size = sizeof(VkDescriptorImageInfo);
break;
case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER:
case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER:
size = sizeof(VkBufferView);
break;
case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER:
case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER:
case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC:
case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC:
default:
size = sizeof(VkDescriptorBufferInfo);
break;
}
for (unsigned i = 0; i < entry->descriptorCount; i++) {
memcpy((uint8_t*)cmd->u.push_descriptor_set_with_template_khr.data + offset, (const uint8_t*)pData + entry->offset + i * entry->stride, size);
offset += size;
}
}
} }
VKAPI_ATTR void VKAPI_CALL lvp_CmdBindDescriptorSets( VKAPI_ATTR void VKAPI_CALL lvp_CmdBindDescriptorSets(

6
src/gallium/frontends/lavapipe/lvp_execute.c
View File

@ -3277,10 +3277,10 @@ static void handle_push_descriptor_set_with_template(struct vk_cmd_queue_entry *
pds->descriptor_writes = (struct VkWriteDescriptorSet *)(pds + 1); pds->descriptor_writes = (struct VkWriteDescriptorSet *)(pds + 1);
const uint8_t *next_info = (const uint8_t *) (pds->descriptor_writes + templ->entry_count); const uint8_t *next_info = (const uint8_t *) (pds->descriptor_writes + templ->entry_count);
const uint8_t *pSrc = cmd->u.push_descriptor_set_with_template_khr.data;
for (unsigned i = 0; i < templ->entry_count; i++) { for (unsigned i = 0; i < templ->entry_count; i++) {
struct VkWriteDescriptorSet *desc = &pds->descriptor_writes[i]; struct VkWriteDescriptorSet *desc = &pds->descriptor_writes[i];
struct VkDescriptorUpdateTemplateEntry *entry = &templ->entry[i]; struct VkDescriptorUpdateTemplateEntry *entry = &templ->entry[i];
const uint8_t *pSrc = ((const uint8_t *) cmd->u.push_descriptor_set_with_template_khr.data) + entry->offset;
/* dstSet is ignored */ /* dstSet is ignored */
desc->dstBinding = entry->dstBinding; desc->dstBinding = entry->dstBinding;
@ -3300,11 +3300,13 @@ static void handle_push_descriptor_set_with_template(struct vk_cmd_queue_entry *
case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT: case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT:
memcpy((VkDescriptorImageInfo*)&desc->pImageInfo[j], pSrc, sizeof(VkDescriptorImageInfo)); memcpy((VkDescriptorImageInfo*)&desc->pImageInfo[j], pSrc, sizeof(VkDescriptorImageInfo));
next_info += sizeof(VkDescriptorImageInfo); next_info += sizeof(VkDescriptorImageInfo);
pSrc += sizeof(VkDescriptorImageInfo);
break; break;
case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER: case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER:
case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER: case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER:
memcpy((VkBufferView*)&desc->pTexelBufferView[j], pSrc, sizeof(VkBufferView)); memcpy((VkBufferView*)&desc->pTexelBufferView[j], pSrc, sizeof(VkBufferView));
next_info += sizeof(VkBufferView); next_info += sizeof(VkBufferView);
pSrc += sizeof(VkBufferView);
break; break;
case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER: case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER:
case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER: case VK_DESCRIPTOR_TYPE_STORAGE_BUFFER:
@ -3313,9 +3315,9 @@ static void handle_push_descriptor_set_with_template(struct vk_cmd_queue_entry *
default: default:
memcpy((VkDescriptorBufferInfo*)&desc->pBufferInfo[j], pSrc, sizeof(VkDescriptorBufferInfo)); memcpy((VkDescriptorBufferInfo*)&desc->pBufferInfo[j], pSrc, sizeof(VkDescriptorBufferInfo));
next_info += sizeof(VkDescriptorBufferInfo); next_info += sizeof(VkDescriptorBufferInfo);
pSrc += sizeof(VkDescriptorBufferInfo);
break; break;
} }
pSrc += entry->stride;
} }
} }
handle_push_descriptor_set_generic(pds, state); handle_push_descriptor_set_generic(pds, state);