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

panvk: implement runtimeDescriptorArray and descriptorBindingVariableDescriptorCount

Browse Source 
Runtime descriptor array doesn't require any changes, variable descriptor
count is already mostly supported and just needs handling for
maxVariableDescriptorCount.

Signed-off-by: Olivia Lee <olivia.lee@collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Reviewed-by: Lars-Ivar Hesselberg Simonsen <lars-ivar.simonsen@arm.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35408>
This commit is contained in:
Olivia Lee
2025-06-09 23:14:26 -07:00
committed by Marge Bot
parent f725bc4475
commit e7a439f73b
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/panfrost/vulkan/panvk_vX_descriptor_set_layout.c
+22 -2
View File
@@ -243,12 +243,23 @@ panvk_per_arch(GetDescriptorSetLayoutSupport)(
VkDevice _device, const VkDescriptorSetLayoutCreateInfo *pCreateInfo,
VkDescriptorSetLayoutSupport *pSupport)
{
const VkDescriptorSetLayoutBindingFlagsCreateInfo *binding_flags =
vk_find_struct_const(pCreateInfo->pNext,
DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO);
VkDescriptorSetVariableDescriptorCountLayoutSupport *var_desc_count =
vk_find_struct(pSupport->pNext,
DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_LAYOUT_SUPPORT);
pSupport->supported = false;
unsigned desc_count = 0, dyn_buf_count = 0;
unsigned desc_count = 0, dyn_buf_count = 0, non_variable_count = 0,
variable_stride = 0;
for (unsigned i = 0; i < pCreateInfo->bindingCount; i++) {
const VkDescriptorSetLayoutBinding *binding = &pCreateInfo->pBindings[i];
VkDescriptorType type = binding->descriptorType;
VkDescriptorBindingFlags flags =
binding_flags && binding_flags->bindingCount > 0 ?
binding_flags->pBindingFlags[i] : 0;
if (vk_descriptor_type_is_dynamic(type)) {
dyn_buf_count += binding->descriptorCount;
@@ -279,7 +290,13 @@ panvk_per_arch(GetDescriptorSetLayoutSupport)(
.samplers_per_desc = samplers_per_desc,
};
desc_count += panvk_get_desc_stride(&layout) * binding->descriptorCount;
unsigned stride = panvk_get_desc_stride(&layout);
unsigned count = stride * binding->descriptorCount;
desc_count += count;
if (flags & VK_DESCRIPTOR_BINDING_VARIABLE_DESCRIPTOR_COUNT_BIT)
variable_stride = stride;
else
non_variable_count += count;
}
if (desc_count > PANVK_MAX_DESCS_PER_SET ||
@@ -287,4 +304,7 @@ panvk_per_arch(GetDescriptorSetLayoutSupport)(
return;
pSupport->supported = true;
if (var_desc_count)
var_desc_count->maxVariableDescriptorCount = variable_stride != 0 ?
(PANVK_MAX_DESCS_PER_SET - non_variable_count) / variable_stride : 0;
}
src/panfrost/vulkan/panvk_vX_physical_device.c
+2 -2
View File
@@ -300,8 +300,8 @@ panvk_per_arch(get_physical_device_features)(
.descriptorBindingStorageTexelBufferUpdateAfterBind = false,
.descriptorBindingUpdateUnusedWhilePending = false,
.descriptorBindingPartiallyBound = false,
.descriptorBindingVariableDescriptorCount = false,
.runtimeDescriptorArray = false,
.descriptorBindingVariableDescriptorCount = true,
.runtimeDescriptorArray = true,
.samplerFilterMinmax = PAN_ARCH >= 10,
.scalarBlockLayout = true,