Fixes for VK_EXT_image_compression_control swapchain tests

Ensure VK_KHR_get_surface_capabilities2 is requested when creating
Vulkan instances for the swapchain tests. This is required by
functions:
- vkGetPhysicalDeviceSurfaceCapabilities2KHR
- vkGetPhysicalDeviceSurfaceFormats2KHR

Enable imageCompressionControlSwapchain when creating devices for the
swapchain tests.

Properly set compressionControlPlaneCount depending on compression
flags.

Components: Vulkan

VK-GL-CTS issue: 4105

Affects:
dEQP-VK.api.image_compression_control.swapchain.*

Change-Id: I6b1ac25724ac605b91824e784a018f3e4fd717b7

diff --git a/external/vulkancts/modules/vulkan/api/vktApiImageCompressionControlTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiImageCompressionControlTests.cpp
index 1ecdc7c..43f379c 100644 (file)
--- a/external/vulkancts/modules/vulkan/api/vktApiImageCompressionControlTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiImageCompressionControlTests.cpp
@@ -370,7 +370,6 @@ static tcu::TestStatus ahbImageCreateTest(Context& context, TestParams testParam
                                                                                                   &queueFamilyIndex,
                                                                                                   vk::VK_IMAGE_LAYOUT_UNDEFINED };
 
-
                checkAhbImageSupport(context, testParams, width, height, vkUsage);
 
                Move<VkImage>                      image                = vk::createImage(vkd, device, &createInfo);
@@ -492,6 +491,7 @@ CustomInstance createInstanceWithWsi(Context& context, Type wsiType, const vecto
 
        extensions.push_back("VK_KHR_surface");
        extensions.push_back(getExtensionName(wsiType));
+       extensions.push_back("VK_KHR_get_surface_capabilities2");
 
        vector<string> instanceExtensions;
        for (const auto& ext : extensions)
@@ -556,7 +556,9 @@ Move<VkDevice> createDeviceWithWsi(const PlatformInterface& vkp, deUint32 apiVer
                        TCU_THROW(NotSupportedError, extName + " is not supported");
        }
 
-       const void*                                        pNext        = nullptr;
+       vk::VkPhysicalDeviceImageCompressionControlSwapchainFeaturesEXT imageCompressionSwapchain = initVulkanStructure();
+       imageCompressionSwapchain.imageCompressionControlSwapchain = VK_TRUE;
+
        const VkPhysicalDeviceFeatures features = {};
 
        // Convert from std::vector<std::string> to std::vector<const char*>.
@@ -566,7 +568,7 @@ Move<VkDevice> createDeviceWithWsi(const PlatformInterface& vkp, deUint32 apiVer
                                   [](const std::string& s) { return s.c_str(); });
 
        const VkDeviceCreateInfo deviceParams = { VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO,
-                                                                                         pNext,
+                                                                                         &imageCompressionSwapchain,
                                                                                          (VkDeviceCreateFlags)0,
                                                                                          1u,
                                                                                          &queueInfo,
@@ -618,14 +620,16 @@ static tcu::TestStatus swapchainCreateTest(Context& context, TestParams testPara
 
        const InstanceHelper     instHelper(context, testParams.wsiType);
        const wsi::NativeObjects native(context, instHelper.supportedExtensions, testParams.wsiType);
+       const bool                               is_fixed_rate_ex = testParams.control.flags == VK_IMAGE_COMPRESSION_FIXED_RATE_EXPLICIT_EXT;
 
        VkExtent2D                                                      extent2d = { 16, 16 };
        VkImageCompressionFixedRateFlagsEXT planeFlags[3]{};
 
-       for (unsigned i{}; i < (testParams.control.flags == VK_IMAGE_COMPRESSION_FIXED_RATE_EXPLICIT_EXT ? 24 : 1); i++)
+       for (unsigned i{}; i < (is_fixed_rate_ex ? 24 : 1); i++)
        {
                planeFlags[0] ^= 3 << i;
-               if (testParams.control.flags == VK_IMAGE_COMPRESSION_FIXED_RATE_EXPLICIT_EXT)
+
+               if (is_fixed_rate_ex)
                {
                        testParams.control.pFixedRateFlags = planeFlags;
                }
@@ -660,6 +664,9 @@ static tcu::TestStatus swapchainCreateTest(Context& context, TestParams testPara
                {
                        testParams.format = format.surfaceFormat.format;
 
+                       const uint32_t numPlanes = isYCbCrFormat(testParams.format) ? getPlaneCount(testParams.format) : 1;
+                       testParams.control.compressionControlPlaneCount = is_fixed_rate_ex ? numPlanes : 0;
+
                        VkSwapchainCreateInfoKHR swapchainInfo = initVulkanStructure();
                        swapchainInfo.surface                              = surface.get();
                        swapchainInfo.minImageCount                        = caps.surfaceCapabilities.minImageCount;