From f766d34f713e43974c6fb5b7b443062ef61e59ca Mon Sep 17 00:00:00 2001 From: ziga-lunarg Date: Sun, 19 Feb 2023 13:27:26 +0100 Subject: [PATCH] Fix checking support in texture filtering tests The tests use mipmaps even if the test parameter for mipmaps is false and the check support function does not do that Components: Vulkan VK-GL-CTS issue: 4294 Affected tests: dEQP-VK.texture.filtering.2d_array.* Change-Id: Iabd33803fc952f3ea4c7598674fd9f58b53070d4 --- external/vulkancts/modules/vulkan/texture/vktTextureFilteringTests.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/external/vulkancts/modules/vulkan/texture/vktTextureFilteringTests.cpp b/external/vulkancts/modules/vulkan/texture/vktTextureFilteringTests.cpp index f3ec40f..e441ab8 100644 --- a/external/vulkancts/modules/vulkan/texture/vktTextureFilteringTests.cpp +++ b/external/vulkancts/modules/vulkan/texture/vktTextureFilteringTests.cpp @@ -128,7 +128,8 @@ void checkTextureSupport (Context& context, const Texture2DArrayTestCaseParamete context.requireDeviceFunctionality("VK_KHR_sampler_mirror_clamp_to_edge"); #ifndef CTS_USES_VULKANSC - if (testParameters.format == VK_FORMAT_R10X6G10X6B10X6A10X6_UNORM_4PACK16 && testParameters.mipmaps && context.getRGBA10X6FormatsFeaturesEXT().formatRgba10x6WithoutYCbCrSampler == VK_FALSE) + bool mipmaps = (deLog2Floor32(de::max(testParameters.width, testParameters.height)) + 1) > 1 || testParameters.mipmaps; + if (testParameters.format == VK_FORMAT_R10X6G10X6B10X6A10X6_UNORM_4PACK16 && mipmaps && context.getRGBA10X6FormatsFeaturesEXT().formatRgba10x6WithoutYCbCrSampler == VK_FALSE) TCU_THROW(NotSupportedError, "formatRgba10x6WithoutYCbCrSampler not supported"); #endif } -- 2.7.4