Merge "Fix support check for dynamic state tests" into android14-tests-dev
diff --git a/external/vulkancts/framework/vulkan/vkDeviceFeatures.cpp b/external/vulkancts/framework/vulkan/vkDeviceFeatures.cpp
index 7766e42..48df519 100644
--- a/external/vulkancts/framework/vulkan/vkDeviceFeatures.cpp
+++ b/external/vulkancts/framework/vulkan/vkDeviceFeatures.cpp
@@ -151,7 +151,8 @@
{
#ifndef CTS_USES_VULKANSC
// Some non-standard promotions may need feature structs filled in anyway.
- if (!strcmp(featureName, "VK_EXT_extended_dynamic_state") && vk13Supported)
+ if (!strcmp(featureName, "VK_EXT_extended_dynamic_state") &&
+ (de::contains(allDeviceExtensions.begin(), allDeviceExtensions.end(), "VK_EXT_extended_dynamic_state")))
{
FeatureStructWrapperBase *p = (*featureStructCreationData.creatorFunction)();
if (p == DE_NULL)
@@ -161,7 +162,8 @@
f->extendedDynamicState = true;
m_features.push_back(p);
}
- if (!strcmp(featureName, "VK_EXT_extended_dynamic_state2") && vk13Supported)
+ if (!strcmp(featureName, "VK_EXT_extended_dynamic_state2") &&
+ (de::contains(allDeviceExtensions.begin(), allDeviceExtensions.end(), "VK_EXT_extended_dynamic_state2")))
{
FeatureStructWrapperBase *p = (*featureStructCreationData.creatorFunction)();
if (p == DE_NULL)
