Rename various things for more inclusive language

[platform/upstream/VK-GL-CTS.git] / external / vulkancts / modules / vulkan / wsi / vktWsiIncrementalPresentTests.cpp

diff --git a/external/vulkancts/modules/vulkan/wsi/vktWsiIncrementalPresentTests.cpp b/external/vulkancts/modules/vulkan/wsi/vktWsiIncrementalPresentTests.cpp
index 54889e3..8e58955 100644 (file)
--- a/external/vulkancts/modules/vulkan/wsi/vktWsiIncrementalPresentTests.cpp
+++ b/external/vulkancts/modules/vulkan/wsi/vktWsiIncrementalPresentTests.cpp
@@ -101,39 +101,6 @@ vk::VkPhysicalDeviceFeatures getDeviceNullFeatures (void)
        return features;
 }
 
-deUint32 getNumQueueFamilyIndices (const vk::InstanceInterface& vki, vk::VkPhysicalDevice physicalDevice)
-{
-       deUint32        numFamilies             = 0;
-
-       vki.getPhysicalDeviceQueueFamilyProperties(physicalDevice, &numFamilies, DE_NULL);
-
-       return numFamilies;
-}
-
-vector<deUint32> getSupportedQueueFamilyIndices (const vk::InstanceInterface& vki, vk::VkPhysicalDevice physicalDevice, vk::VkSurfaceKHR surface)
-{
-       const deUint32          numTotalFamilyIndices   = getNumQueueFamilyIndices(vki, physicalDevice);
-       vector<deUint32>        supportedFamilyIndices;
-
-       for (deUint32 queueFamilyNdx = 0; queueFamilyNdx < numTotalFamilyIndices; ++queueFamilyNdx)
-       {
-               if (vk::wsi::getPhysicalDeviceSurfaceSupport(vki, physicalDevice, queueFamilyNdx, surface) != VK_FALSE)
-                       supportedFamilyIndices.push_back(queueFamilyNdx);
-       }
-
-       return supportedFamilyIndices;
-}
-
-deUint32 chooseQueueFamilyIndex (const vk::InstanceInterface& vki, vk::VkPhysicalDevice physicalDevice, vk::VkSurfaceKHR surface)
-{
-       const vector<deUint32>  supportedFamilyIndices  = getSupportedQueueFamilyIndices(vki, physicalDevice, surface);
-
-       if (supportedFamilyIndices.empty())
-               TCU_THROW(NotSupportedError, "Device doesn't support presentation");
-
-       return supportedFamilyIndices[0];
-}
-
 vk::Move<vk::VkDevice> createDeviceWithWsi (const vk::PlatformInterface&               vkp,
                                                                                        vk::VkInstance                                          instance,
                                                                                        const vk::InstanceInterface&            vki,
@@ -745,7 +712,7 @@ std::vector<vk::VkSwapchainCreateInfoKHR> generateSwapchainConfigs (vk::VkSurfac
                                                                                                        ? de::max(31u, properties.minImageExtent.height)
                                                                                                        : de::min(deSmallestGreaterOrEquallPowerOfTwoU32(currentHeight+1), properties.maxImageExtent.height));
        const vk::VkExtent2D            imageSize               = { imageWidth, imageHeight };
-       const vk::VkExtent2D            dummySize               = { de::max(31u, properties.minImageExtent.width), de::max(31u, properties.minImageExtent.height) };
+       const vk::VkExtent2D            unusedSize              = { de::max(31u, properties.minImageExtent.width), de::max(31u, properties.minImageExtent.height) };
 
        {
                size_t presentModeNdx;
@@ -797,8 +764,8 @@ std::vector<vk::VkSwapchainCreateInfoKHR> generateSwapchainConfigs (vk::VkSurfac
 
                createInfos.push_back(createInfo);
 
-               // add an extra dummy swapchain
-               const vk::VkSwapchainCreateInfoKHR              dummyInfo               =
+               // add an extra unused swapchain
+               const vk::VkSwapchainCreateInfoKHR              unusedInfo              =
                {
                        vk::VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR,
                        DE_NULL,
@@ -807,7 +774,7 @@ std::vector<vk::VkSwapchainCreateInfoKHR> generateSwapchainConfigs (vk::VkSurfac
                        properties.minImageCount,
                        imageFormat,
                        imageColorSpace,
-                       dummySize,
+                       unusedSize,
                        imageLayers,
                        imageUsage,
                        vk::VK_SHARING_MODE_EXCLUSIVE,
@@ -820,7 +787,7 @@ std::vector<vk::VkSwapchainCreateInfoKHR> generateSwapchainConfigs (vk::VkSurfac
                        (vk::VkSwapchainKHR)0
                };
 
-               createInfos.push_back(dummyInfo);
+               createInfos.push_back(unusedInfo);
        }
 
        return createInfos;
@@ -839,7 +806,7 @@ IncrementalPresentTestInstance::IncrementalPresentTestInstance (Context& context
        , m_nativeWindow                        (createWindow(*m_nativeDisplay, tcu::nothing<UVec2>()))
        , m_surface                                     (vk::wsi::createSurface(m_vki, m_instance, testConfig.wsiType, *m_nativeDisplay, *m_nativeWindow))
 
-       , m_queueFamilyIndex            (chooseQueueFamilyIndex(m_vki, m_physicalDevice, *m_surface))
+       , m_queueFamilyIndex            (vk::wsi::chooseQueueFamilyIndex(m_vki, m_physicalDevice, *m_surface))
        , m_deviceExtensions            (vk::enumerateDeviceExtensionProperties(m_vki, m_physicalDevice, DE_NULL))
        , m_device                                      (createDeviceWithWsi(m_vkp, m_instance, m_vki, m_physicalDevice, m_deviceExtensions, m_queueFamilyIndex, testConfig.useIncrementalPresent, context.getTestContext().getCommandLine().isValidationEnabled()))
        , m_vkd                                         (m_vkp, m_instance, *m_device)