Revert "Fix YCbCr requirement in image_format_properties tests"

This reverts commit 066eac79983dacc684c82f603da6c790e2dd8273.

Change-Id: Ia36f493e063c33acd18bf51b33a1ef4ad0d8b2ff

diff --git a/external/vulkancts/framework/vulkan/vkImageUtil.cpp b/external/vulkancts/framework/vulkan/vkImageUtil.cpp
index 5abf263..73729f1 100644 (file)
--- a/external/vulkancts/framework/vulkan/vkImageUtil.cpp
+++ b/external/vulkancts/framework/vulkan/vkImageUtil.cpp
@@ -3216,19 +3216,4 @@ bool checkSparseImageFormatSupport (const VkPhysicalDevice               physicalDevice,
        return (sparseImageFormatPropVec.size() != 0);
 }
 
-deUint32 getYCbCrFormatElementSize (VkFormat format)
-{
-       const PlanarFormatDescription   desc            = getYCbCrPlanarFormatDescription(format);
-       deInt32                                                 totalSize       = 0;
-
-       for (deUint32 planeNdx = 0; planeNdx < desc.numPlanes; ++planeNdx)
-       {
-               const deInt32 elementSize = desc.planes[planeNdx].elementSizeBytes;
-
-               totalSize = deAlign32(totalSize, elementSize);
-               totalSize += elementSize;
-       }
-       return totalSize;
-}
-
 } // vk

diff --git a/external/vulkancts/framework/vulkan/vkImageUtil.hpp b/external/vulkancts/framework/vulkan/vkImageUtil.hpp
index 4f4993c..6dc4a8f 100644 (file)
--- a/external/vulkancts/framework/vulkan/vkImageUtil.hpp
+++ b/external/vulkancts/framework/vulkan/vkImageUtil.hpp
@@ -210,11 +210,6 @@ void                                                       allocateAndBindSparseImage              (const vk::DeviceInterface&                                             vk,
                                                                                                                                 tcu::TextureFormat                                                             format,
                                                                                                                                 vk::VkImage                                                                    destImage);
 
-/*--------------------------------------------------------------------*//*!
- * Returns the element size of the given YCbCr format.
- *//*--------------------------------------------------------------------*/
-deUint32                                               getYCbCrFormatElementSize               (VkFormat format);
-
 } // vk
 
 #endif // _VKIMAGEUTIL_HPP

diff --git a/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
index df6b869..6575297 100644 (file)
--- a/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
@@ -2422,12 +2422,8 @@ VkImageCreateFlags getValidImageCreateFlags (const VkPhysicalDeviceFeatures& dev
        return flags;
 }
 
-bool isValidImageCreateFlagCombination (VkImageCreateFlags createFlags)
+bool isValidImageCreateFlagCombination (VkImageCreateFlags)
 {
-       // If create flags contains VK_IMAGE_CREATE_SPARSE_RESIDENCY_BIT or VK_IMAGE_CREATE_SPARSE_ALIASED_BIT, it must also contain VK_IMAGE_CREATE_SPARSE_BINDING_BIT
-       if ((createFlags & (VK_IMAGE_CREATE_SPARSE_RESIDENCY_BIT | VK_IMAGE_CREATE_SPARSE_ALIASED_BIT)) != 0 && (createFlags & VK_IMAGE_CREATE_SPARSE_BINDING_BIT) == 0)
-               return false;
-
        return true;
 }
 
@@ -2463,6 +2459,9 @@ bool isRequiredImageParameterCombination (const VkPhysicalDeviceFeatures& device
        DE_ASSERT(deviceFeatures.sparseBinding || (createFlags & (VK_IMAGE_CREATE_SPARSE_BINDING_BIT|VK_IMAGE_CREATE_SPARSE_RESIDENCY_BIT)) == 0);
        DE_ASSERT(deviceFeatures.sparseResidencyAliased || (createFlags & VK_IMAGE_CREATE_SPARSE_ALIASED_BIT) == 0);
 
+       if (isYCbCrFormat(format) && (createFlags & (VK_IMAGE_CREATE_SPARSE_BINDING_BIT | VK_IMAGE_CREATE_SPARSE_ALIASED_BIT | VK_IMAGE_CREATE_SPARSE_RESIDENCY_BIT)))
+               return false;
+
        if (createFlags & VK_IMAGE_CREATE_SPARSE_RESIDENCY_BIT)
        {
                if (isCompressedFormat(format))
@@ -2471,14 +2470,7 @@ bool isRequiredImageParameterCombination (const VkPhysicalDeviceFeatures&        device
                if (isDepthStencilFormat(format))
                        return false;
 
-               deUint32 elementSize;
-
-               if (isYCbCrFormat(format))
-                       elementSize = getYCbCrFormatElementSize(format);
-               else
-                       elementSize = mapVkFormat(format).getPixelSize();
-
-               if (!deIsPowerOfTwo32(elementSize))
+               if (!deIsPowerOfTwo32(mapVkFormat(format).getPixelSize()))
                        return false;
 
                switch (imageType)