From dfa0c29d94a6cadd3948a818f6d9aa04f967200d Mon Sep 17 00:00:00 2001 From: Aitor Camacho Date: Mon, 13 Nov 2023 13:12:20 +0100 Subject: [PATCH] tests: Fix VUID-07908 tests Remove VUID-07908 from NegativeDynamicRendering.RenderingFragmentDensityMapAttachment Account for VUID-07908 changes in NegativeDynamicRendering.FragmentDensityMapAttachmentLayerCount --- tests/unit/dynamic_rendering.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/unit/dynamic_rendering.cpp b/tests/unit/dynamic_rendering.cpp index bad153d6f55..598d2e4e476 100644 --- a/tests/unit/dynamic_rendering.cpp +++ b/tests/unit/dynamic_rendering.cpp @@ -3598,7 +3598,6 @@ TEST_F(NegativeDynamicRendering, RenderingFragmentDensityMapAttachment) { VkImageView image_view2 = image2.targetView(VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_ASPECT_COLOR_BIT, 0, VK_REMAINING_MIP_LEVELS, 0, VK_REMAINING_ARRAY_LAYERS, VK_IMAGE_VIEW_TYPE_2D_ARRAY); rendering_fragment_density.imageView = image_view2; - m_errorMonitor->SetDesiredFailureMsg(kErrorBit, "VUID-VkRenderingFragmentDensityMapAttachmentInfoEXT-apiVersion-07908"); m_errorMonitor->SetDesiredFailureMsg(kErrorBit, "VUID-VkRenderingInfo-imageView-06109"); m_commandBuffer->BeginRendering(begin_rendering_info); m_errorMonitor->VerifyFound(); @@ -3680,8 +3679,11 @@ TEST_F(NegativeDynamicRendering, FragmentDensityMapAttachmentLayerCount) { VK_FORMAT_FEATURE_FRAGMENT_DENSITY_MAP_BIT_EXT)) { GTEST_SKIP() << "VK_FORMAT_FEATURE_FRAGMENT_DENSITY_MAP_BIT_EXT not supported"; } - if (!multiview_features.multiview) { - GTEST_SKIP() << "Test requires (unsupported) multiview"; + if (multiview_features.multiview || physDevProps().apiVersion >= VK_API_VERSION_1_1) { + auto mayor_version = VK_API_VERSION_MAJOR(physDevProps().apiVersion); + auto minor_version = VK_API_VERSION_MINOR(physDevProps().apiVersion); + GTEST_SKIP() << "Test requires multiview to be unsupported (" << multiview_features.multiview + << ") or physical device's api version (" << mayor_version << "." << minor_version << ") to be less than 1.1"; } InitRenderTarget();