Fix descriptor indexing test dependency

The UBO and SSBO non-uniform indexing tests use runtimeDescriptorArray,
so this needs to be included in the checkSupport condition.

Components: Vulkan
Affects: dEQP-VK.ubo.*
         dEQP-VK.ssbo.*

Change-Id: I54edb2d06135a8d1d549a42ac97014dabc80c9dd

diff --git a/external/vulkancts/modules/vulkan/ssbo/vktSSBOLayoutCase.cpp b/external/vulkancts/modules/vulkan/ssbo/vktSSBOLayoutCase.cpp
index ff67861..574f48a 100644 (file)
--- a/external/vulkancts/modules/vulkan/ssbo/vktSSBOLayoutCase.cpp
+++ b/external/vulkancts/modules/vulkan/ssbo/vktSSBOLayoutCase.cpp
@@ -2608,7 +2608,8 @@ void SSBOLayoutCase::checkSupport(Context& context) const
                TCU_THROW(NotSupportedError, "scalarBlockLayout not supported");
        if (m_usePhysStorageBuffer && !context.isBufferDeviceAddressSupported())
                TCU_THROW(NotSupportedError, "Physical storage buffer pointers not supported");
-       if (!context.getDescriptorIndexingFeatures().shaderStorageBufferArrayNonUniformIndexing && usesDescriptorIndexing(m_interface))
+       if (usesDescriptorIndexing(m_interface) && (    !context.getDescriptorIndexingFeatures().shaderStorageBufferArrayNonUniformIndexing ||
+                                                                                                       !context.getDescriptorIndexingFeatures().runtimeDescriptorArray ) )
                TCU_THROW(NotSupportedError, "Descriptor indexing over storage buffer not supported");
 
        const vk::VkPhysicalDeviceProperties &properties = context.getDeviceProperties();

diff --git a/external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.cpp b/external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.cpp
index 943f54c..35bb5ed 100644 (file)
--- a/external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.cpp
+++ b/external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.cpp
@@ -2232,7 +2232,8 @@ TestInstance* UniformBlockCase::createInstance (Context& context) const
                TCU_THROW(NotSupportedError, "std430 not supported");
        if (!context.getScalarBlockLayoutFeatures().scalarBlockLayout && usesBlockLayout(LAYOUT_SCALAR))
                TCU_THROW(NotSupportedError, "scalarBlockLayout not supported");
-       if (!context.getDescriptorIndexingFeatures().shaderUniformBufferArrayNonUniformIndexing && usesBlockLayout(LAYOUT_DESCRIPTOR_INDEXING))
+       if (usesBlockLayout(LAYOUT_DESCRIPTOR_INDEXING) && (    !context.getDescriptorIndexingFeatures().shaderUniformBufferArrayNonUniformIndexing ||
+                                                                                                                       !context.getDescriptorIndexingFeatures().runtimeDescriptorArray ) )
                TCU_THROW(NotSupportedError, "Descriptor indexing over uniform buffer not supported");
 
        return new UniformBlockCaseInstance(context, m_bufferMode, m_uniformLayout, m_blockPointers);