Fixes protected memory swapchain image format oom

Some image format test cases (like the image extent cases)
could create configs too large for the protected heap

Components: Vulkan
VK-GL-CTS Issue: 1793

Affects:
dEQP-VK.protected_memory.interaction.wsi.android.swapchain.create.image_format

Change-Id: If98f43a85ff289d091e3bb7c75d998a666efac80

diff --git a/external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemWsiSwapchainTests.cpp b/external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemWsiSwapchainTests.cpp
index b53979f..642463c 100644 (file)
--- a/external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemWsiSwapchainTests.cpp
+++ b/external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemWsiSwapchainTests.cpp
@@ -330,11 +330,63 @@ std::vector<vk::VkSwapchainCreateInfoKHR> generateSwapchainParameterCases (vk::w
 
                case TEST_DIMENSION_IMAGE_FORMAT:
                {
+                       const vk::DeviceInterface&                              vkd                                     = context.getDeviceInterface();
+                       vk::VkDevice                                                    device                          = context.getDevice();
+                       vk::VkPhysicalDeviceMemoryProperties    memoryProperties        = vk::getPhysicalDeviceMemoryProperties(context.getInstanceDriver(), context.getPhysicalDevice());
+                       vk::VkDeviceSize                                                protectedHeapSize       = 0;
+                       vk::VkDeviceSize                                                maxMemoryUsage          = 0;
+
+                       for (deUint32 memType = 0; memType < memoryProperties.memoryTypeCount; memType++)
+                       {
+                               deUint32 heapIndex      = memoryProperties.memoryTypes[memType].heapIndex;
+                               if (memoryProperties.memoryTypes[memType].propertyFlags & vk::VK_MEMORY_PROPERTY_PROTECTED_BIT)
+                               {
+                                       protectedHeapSize = de::max(protectedHeapSize, memoryProperties.memoryHeaps[heapIndex].size);
+                                       maxMemoryUsage    = protectedHeapSize / 4 ; /* Use at maximum 25% of heap */
+                               }
+                       }
+
                        for (std::vector<vk::VkSurfaceFormatKHR>::const_iterator curFmt = formats.begin(); curFmt != formats.end(); ++curFmt)
                        {
-                               cases.push_back(baseParameters);
-                               cases.back().imageFormat                = curFmt->format;
-                               cases.back().imageColorSpace    = curFmt->colorSpace;
+                           vk::VkMemoryRequirements memoryRequirements;
+                           {
+                                       const vk::VkImageCreateInfo imageInfo =
+                                       {
+                                               vk::VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO,
+                                               DE_NULL,
+                                               vk::VK_IMAGE_CREATE_PROTECTED_BIT,
+                                               vk::VK_IMAGE_TYPE_2D,
+                                               curFmt->format,
+                                               {
+                                                       platformProperties.swapchainExtent == vk::wsi::PlatformProperties::SWAPCHAIN_EXTENT_SETS_WINDOW_SIZE
+                                                               ? capabilities.minImageExtent.width : capabilities.currentExtent.width,
+                                                       platformProperties.swapchainExtent == vk::wsi::PlatformProperties::SWAPCHAIN_EXTENT_SETS_WINDOW_SIZE
+                                                       ? capabilities.minImageExtent.height : capabilities.currentExtent.height,
+                                                       1,
+                                               },
+                                               1,      // mipLevels
+                                               baseParameters.imageArrayLayers,
+                                               vk::VK_SAMPLE_COUNT_1_BIT,
+                                               vk::VK_IMAGE_TILING_OPTIMAL,
+                                               baseParameters.imageUsage,
+                                               baseParameters.imageSharingMode,
+                                               baseParameters.queueFamilyIndexCount,
+                                               baseParameters.pQueueFamilyIndices,
+                                               vk::VK_IMAGE_LAYOUT_UNDEFINED
+                                       };
+
+                                               vk::Move<vk::VkImage> image = vk::createImage(vkd, device, &imageInfo);
+
+                                               memoryRequirements = vk::getImageMemoryRequirements(vkd, device, *image);
+                                       }
+
+                                       // Check for the image size requirement based on double/triple buffering
+                                       if (memoryRequirements.size  * capabilities.minImageCount < maxMemoryUsage)
+                                       {
+                                               cases.push_back(baseParameters);
+                                               cases.back().imageFormat                = curFmt->format;
+                                               cases.back().imageColorSpace    = curFmt->colorSpace;
+                                       }
                        }
 
                        break;