fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 06:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nvk: Use nvk_edb_buffer_view_descriptor for EDB descriptor set layouts

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30580>
This commit is contained in:
Faith Ekstrand 2024-08-07 21:27:29 -05:00 • committed by Marge Bot
parent 3b94c5c22a
commit 677f40383d
3 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/nouveau/vulkan/nvk_descriptor_set.c
View file

@ -507,7 +507,7 @@ nvk_CreateDescriptorPool(VkDevice _device,
type_list = &mutable_info->pMutableDescriptorTypeLists[i];
uint32_t stride, alignment;
nvk_descriptor_stride_align_for_type(pdev,
nvk_descriptor_stride_align_for_type(pdev, 0 /* not DESCRIPTOR_BUFFER */,
pCreateInfo->pPoolSizes[i].type,
type_list, &stride, &alignment);
max_align = MAX2(max_align, alignment);
@ -521,7 +521,7 @@ nvk_CreateDescriptorPool(VkDevice _device,
type_list = &mutable_info->pMutableDescriptorTypeLists[i];
uint32_t stride, alignment;
nvk_descriptor_stride_align_for_type(pdev,
nvk_descriptor_stride_align_for_type(pdev, 0 /* not DESCRIPTOR_BUFFER */,
pCreateInfo->pPoolSizes[i].type,
type_list, &stride, &alignment);
mem_size += MAX2(stride, max_align) *

19
src/nouveau/vulkan/nvk_descriptor_set_layout.c
View file

@ -28,6 +28,7 @@ binding_has_immutable_samplers(const VkDescriptorSetLayoutBinding *binding)
void
nvk_descriptor_stride_align_for_type(const struct nvk_physical_device *pdev,
VkPipelineLayoutCreateFlags layout_flags,
VkDescriptorType type,
const VkMutableDescriptorTypeListEXT *type_list,
uint32_t *stride, uint32_t *alignment)
@ -47,7 +48,11 @@ nvk_descriptor_stride_align_for_type(const struct nvk_physical_device *pdev,
case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER:
case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER:
*stride = *alignment = sizeof(struct nvk_buffer_view_descriptor);
if (layout_flags & VK_DESCRIPTOR_SET_LAYOUT_CREATE_DESCRIPTOR_BUFFER_BIT_EXT) {
*stride = *alignment = sizeof(struct nvk_edb_buffer_view_descriptor);
} else {
*stride = *alignment = sizeof(struct nvk_buffer_view_descriptor);
}
break;
case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER:
@ -74,7 +79,7 @@ nvk_descriptor_stride_align_for_type(const struct nvk_physical_device *pdev,
assert(type_list->pDescriptorTypes[i] !=
VK_DESCRIPTOR_TYPE_MUTABLE_EXT);
uint32_t desc_stride, desc_align;
nvk_descriptor_stride_align_for_type(pdev,
nvk_descriptor_stride_align_for_type(pdev, layout_flags,
type_list->pDescriptorTypes[i],
NULL, &desc_stride, &desc_align);
*stride = MAX2(*stride, desc_stride);
@ -144,6 +149,7 @@ nvk_CreateDescriptorSetLayout(VkDevice device,
if (!vk_descriptor_set_layout_multizalloc(&dev->vk, &ma))
return vk_error(dev, VK_ERROR_OUT_OF_HOST_MEMORY);
layout->flags = pCreateInfo->flags;
layout->binding_count = num_bindings;
for (uint32_t j = 0; j < pCreateInfo->bindingCount; j++) {
@ -213,7 +219,8 @@ nvk_CreateDescriptorSetLayout(VkDevice device,
mutable_info, info_idx);
uint32_t stride, alignment;
nvk_descriptor_stride_align_for_type(pdev, binding->descriptorType,
nvk_descriptor_stride_align_for_type(pdev, pCreateInfo->flags,
binding->descriptorType,
type_list, &stride, &alignment);
uint8_t max_plane_count = 1;
@ -332,7 +339,8 @@ nvk_GetDescriptorSetLayoutSupport(VkDevice device,
mutable_info, i);
uint32_t stride, alignment;
nvk_descriptor_stride_align_for_type(pdev, binding->descriptorType,
nvk_descriptor_stride_align_for_type(pdev, pCreateInfo->flags,
binding->descriptorType,
type_list, &stride, &alignment);
max_align = MAX2(max_align, alignment);
}
@ -363,7 +371,8 @@ nvk_GetDescriptorSetLayoutSupport(VkDevice device,
mutable_info, i);
uint32_t stride, alignment;
nvk_descriptor_stride_align_for_type(pdev, binding->descriptorType,
nvk_descriptor_stride_align_for_type(pdev, pCreateInfo->flags,
binding->descriptorType,
type_list, &stride, &alignment);
if (stride > 0) {

3
src/nouveau/vulkan/nvk_descriptor_set_layout.h
View file

@ -45,6 +45,8 @@ struct nvk_descriptor_set_binding_layout {
struct nvk_descriptor_set_layout {
struct vk_descriptor_set_layout vk;
VkDescriptorSetLayoutCreateFlagBits flags;
/* Size of the descriptor buffer for this descriptor set */
/* Does not contain the size needed for variable count descriptors */
uint32_t non_variable_descriptor_buffer_size;
@ -68,6 +70,7 @@ VK_DEFINE_NONDISP_HANDLE_CASTS(nvk_descriptor_set_layout, vk.base,
void
nvk_descriptor_stride_align_for_type(const struct nvk_physical_device *pdev,
VkPipelineLayoutCreateFlags layout_flags,
VkDescriptorType type,
const VkMutableDescriptorTypeListEXT *type_list,
uint32_t *stride, uint32_t *alignment);