diff --git a/external/vulkancts/modules/vulkan/api/vktApiMemoryRequirementInvarianceTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiMemoryRequirementInvarianceTests.cpp index 6e2723fe35..bb0667f1c7 100644 --- a/external/vulkancts/modules/vulkan/api/vktApiMemoryRequirementInvarianceTests.cpp +++ b/external/vulkancts/modules/vulkan/api/vktApiMemoryRequirementInvarianceTests.cpp @@ -180,12 +180,18 @@ ImageAllocator::ImageAllocator (deRandom& random, deBool dedicated, std::vector< else m_colorFormat = (VkFormat)optimalformats[deRandom_getUint32(&random) % optimalformats.size()]; - int widthAlignment = (isYCbCr420Format(m_colorFormat) || isYCbCr422Format(m_colorFormat)) ? 2 : 1; - int heightAlignment = isYCbCr420Format(m_colorFormat) ? 2 : 1; + if (!isPvrtcFormat(m_colorFormat)) { + int widthAlignment = (isYCbCr420Format(m_colorFormat) || isYCbCr422Format(m_colorFormat)) ? 2 : 1; + int heightAlignment = isYCbCr420Format(m_colorFormat) ? 2 : 1; + + // Random small size for causing potential alignment issues + m_size = tcu::IVec2((deRandom_getUint32(&random) % 16 + 3) & ~(widthAlignment - 1), + (deRandom_getUint32(&random) % 16 + 3) & ~(heightAlignment - 1)); + } else { + m_size = tcu::IVec2(pow(2, deRandom_getUint32(&random) % 4), + pow(2, deRandom_getUint32(&random) % 4)); + } - // Random small size for causing potential alignment issues - m_size = tcu::IVec2((deRandom_getUint32(&random) % 16 + 3) & ~(widthAlignment - 1), - (deRandom_getUint32(&random) % 16 + 3) & ~(heightAlignment - 1)); // Pick random memory type from the supported set m_memoryType = memoryTypes[deRandom_getUint32(&random) % memoryTypes.size()]; } diff --git a/external/vulkancts/modules/vulkan/vktTestCase.cpp b/external/vulkancts/modules/vulkan/vktTestCase.cpp index 4ab6fb5f90..eccc430351 100644 --- a/external/vulkancts/modules/vulkan/vktTestCase.cpp +++ b/external/vulkancts/modules/vulkan/vktTestCase.cpp @@ -103,6 +103,7 @@ vector filterExtensions (const vector& extensions "VK_NV_representative_fragment_test", "VK_NV_shader_atomic_float16_vector", "VK_MVK_macos_surface", + "VK_IMG_format_pvrtc" }; const char* exclusions[] =