Remove multiview requirement in extended dyn state tests
VK_KHR_multiview was wrongly being required for extended dynamic states
using several viewports, when the only needed check is to verify the
number of viewports does not exceed the maxViewports limit.
Affected tests:
dEQP-VK.pipeline.extended_dynamic_state.*2_viewports*
dEQP-VK.pipeline.extended_dynamic_state.*2_scissors*
Components: Vulkan
VK-GL-CTS issue: 2832
Change-Id: I72b2c09153ed2303b7d64bdd78c756ddfa838137
diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineExtendedDynamicStateTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineExtendedDynamicStateTests.cpp
index 260b83a..bfab1b2 100644
--- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineExtendedDynamicStateTests.cpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineExtendedDynamicStateTests.cpp
@@ -679,17 +679,16 @@
// Check the number of viewports needed and the corresponding limits.
const auto& viewportConfig = m_testConfig.viewportConfig;
- auto numViews = viewportConfig.staticValue.size();
+ auto numViewports = viewportConfig.staticValue.size();
if (viewportConfig.dynamicValue)
- numViews = std::max(numViews, viewportConfig.dynamicValue.get().size());
+ numViewports = std::max(numViewports, viewportConfig.dynamicValue.get().size());
- if (numViews > 1)
+ if (numViewports > 1)
{
- context.requireDeviceFunctionality("VK_KHR_multiview");
const auto properties = vk::getPhysicalDeviceProperties(vki, physicalDevice);
- if (numViews > static_cast<decltype(numViews)>(properties.limits.maxViewports))
- TCU_THROW(NotSupportedError, "Number of viewports not supported (" + de::toString(numViews) + ")");
+ if (numViewports > static_cast<decltype(numViewports)>(properties.limits.maxViewports))
+ TCU_THROW(NotSupportedError, "Number of viewports not supported (" + de::toString(numViewports) + ")");
}
const auto& dbTestEnable = m_testConfig.depthBoundsTestEnableConfig;
