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

nvk: Replace asserts with conditional that sets type_list = NULL

Browse Source 
Signed-off-by: Rebecca Mckeever <rebecca.mckeever@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
This commit is contained in:
Rebecca Mckeever
2023-01-13 20:35:00 -08:00
committed by Marge Bot
parent b7e39f5e15
commit 34e842eedb
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nouveau/vulkan/nvk_descriptor_set.c
+6 -12
View File
@@ -226,8 +226,6 @@ nvk_UpdateDescriptorSets(VkDevice device,
const struct nvk_descriptor_set_binding_layout *dst_binding_layout =
&dst->layout->binding[copy->dstBinding];
assert(dst_binding_layout->type == src_binding_layout->type);
if (dst_binding_layout->stride > 0 && src_binding_layout->stride > 0) {
for (uint32_t j = 0; j < copy->descriptorCount; j++) {
ASSERTED uint32_t dst_max_size, src_max_size;
@@ -371,11 +369,9 @@ nvk_CreateDescriptorPool(VkDevice _device,
uint32_t max_align = 0;
for (unsigned i = 0; i < pCreateInfo->poolSizeCount; ++i) {
const VkMutableDescriptorTypeListEXT *type_list = NULL;
if (pCreateInfo->pPoolSizes[i].type == VK_DESCRIPTOR_TYPE_MUTABLE_EXT) {
assert(mutable_info != NULL);
assert(i <= mutable_info->mutableDescriptorTypeListCount);
type_list = &mutable_info->pMutableDescriptorTypeLists[i];
}
if (pCreateInfo->pPoolSizes[i].type == VK_DESCRIPTOR_TYPE_MUTABLE_EXT &&
mutable_info && i < mutable_info->mutableDescriptorTypeListCount)
type_list = &mutable_info->pMutableDescriptorTypeLists[i];
uint32_t stride, align;
nvk_descriptor_stride_align_for_type(pCreateInfo->pPoolSizes[i].type,
@@ -385,11 +381,9 @@ nvk_CreateDescriptorPool(VkDevice _device,
for (unsigned i = 0; i < pCreateInfo->poolSizeCount; ++i) {
const VkMutableDescriptorTypeListEXT *type_list = NULL;
if (pCreateInfo->pPoolSizes[i].type == VK_DESCRIPTOR_TYPE_MUTABLE_EXT) {
assert(mutable_info != NULL);
assert(i <= mutable_info->mutableDescriptorTypeListCount);
type_list = &mutable_info->pMutableDescriptorTypeLists[i];
}
if (pCreateInfo->pPoolSizes[i].type == VK_DESCRIPTOR_TYPE_MUTABLE_EXT &&
mutable_info && i < mutable_info->mutableDescriptorTypeListCount)
type_list = &mutable_info->pMutableDescriptorTypeLists[i];
uint32_t stride, align;
nvk_descriptor_stride_align_for_type(pCreateInfo->pPoolSizes[i].type,
src/nouveau/vulkan/nvk_descriptor_set_layout.c
+4 -2
View File
@@ -53,7 +53,9 @@ nvk_descriptor_stride_align_for_type(VkDescriptorType type,
case VK_DESCRIPTOR_TYPE_MUTABLE_EXT:
*stride = *align = 0;
for (unsigned i = 0; i < type_list->descriptorTypeCount; i++) {
if (type_list == NULL)
*stride = *align = NVK_MAX_DESCRIPTOR_SIZE;
for (unsigned i = 0; type_list && i < type_list->descriptorTypeCount; i++) {
/* This shouldn't recurse */
assert(type_list->pDescriptorTypes[i] !=
VK_DESCRIPTOR_TYPE_MUTABLE_EXT);
@@ -172,7 +174,7 @@ nvk_CreateDescriptorSetLayout(VkDevice _device,
const VkMutableDescriptorTypeListEXT *type_list = NULL;
if (binding->descriptorType == VK_DESCRIPTOR_TYPE_MUTABLE_EXT) {
assert(mutable_info != NULL);
assert(info_idx <= mutable_info->mutableDescriptorTypeListCount);
assert(info_idx < mutable_info->mutableDescriptorTypeListCount);
type_list = &mutable_info->pMutableDescriptorTypeLists[info_idx];
}