summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Byszewski <piotr.byszewski@mobica.com>2023-03-03 13:06:59 +0100
committerPiotr Byszewski <piotr.byszewski@mobica.com>2023-03-03 13:06:59 +0100
commit7a635c0ca68efa31b6a45ed292ca0c5bed25993c (patch)
tree9ade91b697dd82a246a62cba05bbabd60c9af62d
parente73a6490066791c7f27378f09bb1294c4bad1b8d (diff)
parent593dd0c9df0b0fa915a190b8dfbff038af5fd1f0 (diff)
downloadVK-GL-CTS-7a635c0ca68efa31b6a45ed292ca0c5bed25993c.tar.gz
VK-GL-CTS-7a635c0ca68efa31b6a45ed292ca0c5bed25993c.tar.bz2
VK-GL-CTS-7a635c0ca68efa31b6a45ed292ca0c5bed25993c.zip
Merge vk-gl-cts/vulkan-cts-1.2.8 into vk-gl-cts/vulkan-cts-1.3.0
Change-Id: I2cdda0aa78f3796624c037050f5fad0cbf757575
-rw-r--r--external/vulkancts/modules/vulkan/binding_model/vktBindingValveMutableTests.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/external/vulkancts/modules/vulkan/binding_model/vktBindingValveMutableTests.cpp b/external/vulkancts/modules/vulkan/binding_model/vktBindingValveMutableTests.cpp
index e18cba3dc..7684e3733 100644
--- a/external/vulkancts/modules/vulkan/binding_model/vktBindingValveMutableTests.cpp
+++ b/external/vulkancts/modules/vulkan/binding_model/vktBindingValveMutableTests.cpp
@@ -3959,13 +3959,14 @@ tcu::TestCaseGroup* createDescriptorValveMutableTests (tcu::TestContext& testCtx
DescriptorSet::BindingPtrVector setBindings;
std::vector<SingleBinding> arrayBindings;
- // Single mutable descriptor as the first binding.
- setBindings.emplace_back(new SingleBinding(VK_DESCRIPTOR_TYPE_MUTABLE_VALVE, mandatoryTypes));
-
- // Descriptor array as the second binding.
+ // Add single type beyond the mandatory ones.
auto arrayBindingDescTypes = mandatoryTypes;
arrayBindingDescTypes.push_back(descriptorType);
+ // Single mutable descriptor as the first binding.
+ setBindings.emplace_back(new SingleBinding(VK_DESCRIPTOR_TYPE_MUTABLE_VALVE, arrayBindingDescTypes));
+
+ // Descriptor array as the second binding.
if (aliasingCase.aliasing)
{
// With aliasing, the descriptor types rotate in each descriptor.