summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHyunjun Ko <zzoon@igalia.com>2022-11-23 17:46:24 +0900
committerMatthew Netsch <quic_mnetsch@quicinc.com>2022-12-01 16:37:12 +0000
commitae8b8a07118a4e0dfc185a531abe234e9956725b (patch)
tree29892bc0faca853a383295a7ff0b6ccbe51d0f51
parent9c7d7075e4ff6ca3d6872c4319268da5b0e4a5da (diff)
downloadVK-GL-CTS-ae8b8a07118a4e0dfc185a531abe234e9956725b.tar.gz
VK-GL-CTS-ae8b8a07118a4e0dfc185a531abe234e9956725b.tar.bz2
VK-GL-CTS-ae8b8a07118a4e0dfc185a531abe234e9956725b.zip
Fix invalid usage of descriptorCount for inline uniform
blocks. Affects: dEQP-VK.binding_model.descriptorset_random.*.iublimit* VK-GL-CTS Issue: 4115 Components: Vulkan Change-Id: I649d86b859ca642b47c1fda4aa915e1d6616c898
-rw-r--r--external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorSetRandomTests.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorSetRandomTests.cpp b/external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorSetRandomTests.cpp
index 7d461f931..1e2a702a3 100644
--- a/external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorSetRandomTests.cpp
+++ b/external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorSetRandomTests.cpp
@@ -594,6 +594,13 @@ void generateRandomLayout(RandomLayout& randomLayout, const CaseDef &caseDef, de
binding.descriptorCount = (arraySizes[b] ? arraySizes[b] : 1) * 16 + 16; // add 16 for "ivec4 unused"
numInlineUniformBlocks++;
}
+ else
+ {
+ // The meaning of descriptorCount for inline uniform blocks is diferrent from usual, which means
+ // (descriptorCount == 0) doesn't mean it will be discarded.
+ // So we use a similar trick to the below by replacing with a different type of descriptor.
+ binding.descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE;
+ }
}
else
{