From ffae1f8b291f371156c638b2d2b9423eaae96e6b Mon Sep 17 00:00:00 2001 From: Pyry Haulos Date: Thu, 25 Aug 2016 12:05:25 -0400 Subject: [PATCH] Revert "Revert CUBE_COMPATIBLE flag check from "Fix required sample count tests"" This reverts commit 1106b0194f7571aebfdf76766760d91be772d8e7. Fixes #440 Change-Id: Icdb5f71cd87b970edd1bf1770b4a0c15418f600b --- external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp index 1ba05ef..f3f441c 100644 --- a/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp +++ b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp @@ -1740,7 +1740,7 @@ tcu::TestStatus imageFormatProperties (Context& context, ImageFormatPropertyCase results.check(imageType != VK_IMAGE_TYPE_3D || (properties.maxExtent.width >= 1 && properties.maxExtent.height >= 1 && properties.maxExtent.depth >= 1), "Invalid dimensions for 3D image"); results.check(imageType != VK_IMAGE_TYPE_3D || properties.maxArrayLayers == 1, "Invalid maxArrayLayers for 3D image"); - if (tiling == VK_IMAGE_TILING_OPTIMAL && imageType == VK_IMAGE_TYPE_2D && + if (tiling == VK_IMAGE_TILING_OPTIMAL && imageType == VK_IMAGE_TYPE_2D && !(curCreateFlags & VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT) && ((supportedFeatures & (VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT | VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT)) || ((supportedFeatures & VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT) && deviceFeatures.shaderStorageImageMultisample))) { -- 2.7.4