From b4e704c5dbbfadd2387a927f7e3bcb75c7ab4703 Mon Sep 17 00:00:00 2001 From: spencer-lunarg Date: Tue, 14 Jan 2025 15:16:10 -0500 Subject: [PATCH] tests: Use VkExtent2D copy --- tests/framework/render.cpp | 3 +- tests/unit/arm_best_practices.cpp | 8 +-- tests/unit/best_practices.cpp | 12 ++--- tests/unit/best_practices_positive.cpp | 2 +- tests/unit/debug_extensions.cpp | 11 ++-- tests/unit/debug_extensions_positive.cpp | 7 ++- tests/unit/parent.cpp | 4 +- tests/unit/wsi.cpp | 67 ++++++++++++------------ tests/unit/wsi_positive.cpp | 22 ++++---- 9 files changed, 64 insertions(+), 72 deletions(-) diff --git a/tests/framework/render.cpp b/tests/framework/render.cpp index a8ff3872bc5..821755fec91 100644 --- a/tests/framework/render.cpp +++ b/tests/framework/render.cpp @@ -905,8 +905,7 @@ vkt::Swapchain VkRenderFramework::CreateSwapchain(VkSurfaceKHR surface, VkImageU swapchain_create_info.minImageCount = info.surface_capabilities.minImageCount; swapchain_create_info.imageFormat = info.surface_formats[0].format; swapchain_create_info.imageColorSpace = info.surface_formats[0].colorSpace; - swapchain_create_info.imageExtent = {info.surface_capabilities.minImageExtent.width, - info.surface_capabilities.minImageExtent.height}; + swapchain_create_info.imageExtent = info.surface_capabilities.minImageExtent; swapchain_create_info.imageArrayLayers = 1; swapchain_create_info.imageUsage = imageUsage; swapchain_create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; diff --git a/tests/unit/arm_best_practices.cpp b/tests/unit/arm_best_practices.cpp index de091b8c44c..3ad18734dc3 100644 --- a/tests/unit/arm_best_practices.cpp +++ b/tests/unit/arm_best_practices.cpp @@ -1,7 +1,7 @@ /* - * Copyright (c) 2015-2024 The Khronos Group Inc. - * Copyright (c) 2015-2024 Valve Corporation - * Copyright (c) 2015-2024 LunarG, Inc. + * Copyright (c) 2015-2025 The Khronos Group Inc. + * Copyright (c) 2015-2025 Valve Corporation + * Copyright (c) 2015-2025 LunarG, Inc. * Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -560,7 +560,7 @@ TEST_F(VkArmBestPracticesLayerTest, PresentModeTest) { swapchain_create_info.minImageCount = m_surface_capabilities.minImageCount; swapchain_create_info.imageFormat = m_surface_formats[0].format; swapchain_create_info.imageColorSpace = m_surface_formats[0].colorSpace; - swapchain_create_info.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + swapchain_create_info.imageExtent = m_surface_capabilities.minImageExtent; swapchain_create_info.imageArrayLayers = 1; swapchain_create_info.imageUsage = imageUsage; swapchain_create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; diff --git a/tests/unit/best_practices.cpp b/tests/unit/best_practices.cpp index c8b6b3f0cc4..bfd124d1f74 100644 --- a/tests/unit/best_practices.cpp +++ b/tests/unit/best_practices.cpp @@ -1,8 +1,8 @@ /* - * Copyright (c) 2015-2024 The Khronos Group Inc. - * Copyright (c) 2015-2024 Valve Corporation - * Copyright (c) 2015-2024 LunarG, Inc. - * Copyright (c) 2015-2024 Google, Inc. + * Copyright (c) 2015-2025 The Khronos Group Inc. + * Copyright (c) 2015-2025 Valve Corporation + * Copyright (c) 2015-2025 LunarG, Inc. + * Copyright (c) 2015-2025 Google, Inc. * Modifications Copyright (C) 2020 Advanced Micro Devices, Inc. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -858,7 +858,7 @@ TEST_F(VkBestPracticesLayerTest, TripleBufferingTest) { swapchain_create_info.minImageCount = 2; swapchain_create_info.imageFormat = m_surface_formats[0].format; swapchain_create_info.imageColorSpace = m_surface_formats[0].colorSpace; - swapchain_create_info.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + swapchain_create_info.imageExtent = m_surface_capabilities.minImageExtent; swapchain_create_info.imageArrayLayers = 1; swapchain_create_info.imageUsage = imageUsage; swapchain_create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -922,7 +922,7 @@ TEST_F(VkBestPracticesLayerTest, SwapchainCreationTest) { swapchain_create_info.imageFormat = m_surface_formats[0].format; swapchain_create_info.imageColorSpace = m_surface_formats[0].colorSpace; - swapchain_create_info.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + swapchain_create_info.imageExtent = m_surface_capabilities.minImageExtent; // GetPhysicalDeviceSurfacePresentModesKHR() not called before trying to create a swapchain m_errorMonitor->SetDesiredWarning("BestPractices-vkCreateSwapchainKHR-present-mode-no-surface"); diff --git a/tests/unit/best_practices_positive.cpp b/tests/unit/best_practices_positive.cpp index cdf257f4fb1..956b03da515 100644 --- a/tests/unit/best_practices_positive.cpp +++ b/tests/unit/best_practices_positive.cpp @@ -410,7 +410,7 @@ TEST_F(VkPositiveBestPracticesLayerTest, CreateFifoRelaxedSwapchain) { swapchain_create_info.minImageCount = 2; swapchain_create_info.imageFormat = m_surface_formats[0].format; swapchain_create_info.imageColorSpace = m_surface_formats[0].colorSpace; - swapchain_create_info.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + swapchain_create_info.imageExtent = m_surface_capabilities.minImageExtent; swapchain_create_info.imageArrayLayers = 1; swapchain_create_info.imageUsage = imageUsage; swapchain_create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; diff --git a/tests/unit/debug_extensions.cpp b/tests/unit/debug_extensions.cpp index cd105be7e42..7bfc3188e1f 100644 --- a/tests/unit/debug_extensions.cpp +++ b/tests/unit/debug_extensions.cpp @@ -1,8 +1,8 @@ /* - * Copyright (c) 2015-2024 The Khronos Group Inc. - * Copyright (c) 2015-2024 Valve Corporation - * Copyright (c) 2015-2024 LunarG, Inc. - * Copyright (c) 2015-2024 Google, Inc. + * Copyright (c) 2015-2025 The Khronos Group Inc. + * Copyright (c) 2015-2025 Valve Corporation + * Copyright (c) 2015-2025 LunarG, Inc. + * Copyright (c) 2015-2025 Google, Inc. * Modifications Copyright (C) 2020-2021 Advanced Micro Devices, Inc. All rights reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -547,8 +547,7 @@ TEST_F(NegativeDebugExtensions, SwapchainImagesDebugMarker) { swapchain_create_info.minImageCount = info.surface_capabilities.minImageCount; swapchain_create_info.imageFormat = info.surface_formats[0].format; swapchain_create_info.imageColorSpace = info.surface_formats[0].colorSpace; - swapchain_create_info.imageExtent = {info.surface_capabilities.minImageExtent.width, - info.surface_capabilities.minImageExtent.height}; + swapchain_create_info.imageExtent = info.surface_capabilities.minImageExtent; swapchain_create_info.imageArrayLayers = 1; swapchain_create_info.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; swapchain_create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; diff --git a/tests/unit/debug_extensions_positive.cpp b/tests/unit/debug_extensions_positive.cpp index 3be12114153..94c82b05aef 100644 --- a/tests/unit/debug_extensions_positive.cpp +++ b/tests/unit/debug_extensions_positive.cpp @@ -1,6 +1,6 @@ /* - * Copyright (c) 2015-2024 Valve Corporation - * Copyright (c) 2015-2024 LunarG, Inc. + * Copyright (c) 2015-2025 Valve Corporation + * Copyright (c) 2015-2025 LunarG, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -176,8 +176,7 @@ TEST_F(PositiveDebugExtensions, SwapchainImagesDebugMarker) { swapchain_create_info.minImageCount = info.surface_capabilities.minImageCount; swapchain_create_info.imageFormat = info.surface_formats[0].format; swapchain_create_info.imageColorSpace = info.surface_formats[0].colorSpace; - swapchain_create_info.imageExtent = {info.surface_capabilities.minImageExtent.width, - info.surface_capabilities.minImageExtent.height}; + swapchain_create_info.imageExtent = info.surface_capabilities.minImageExtent; swapchain_create_info.imageArrayLayers = 1; swapchain_create_info.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; swapchain_create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; diff --git a/tests/unit/parent.cpp b/tests/unit/parent.cpp index ab13f255cda..1ddd88a59e9 100644 --- a/tests/unit/parent.cpp +++ b/tests/unit/parent.cpp @@ -339,7 +339,7 @@ TEST_F(NegativeParent, Instance_Surface) { swapchain_ci.minImageCount = m_surface_capabilities.minImageCount; swapchain_ci.imageFormat = m_surface_formats[0].format; swapchain_ci.imageColorSpace = m_surface_formats[0].colorSpace; - swapchain_ci.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + swapchain_ci.imageExtent = m_surface_capabilities.minImageExtent; swapchain_ci.imageArrayLayers = 1; swapchain_ci.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; swapchain_ci.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -386,7 +386,7 @@ TEST_F(NegativeParent, Device_OldSwapchain) { swapchain_ci.minImageCount = m_surface_capabilities.minImageCount; swapchain_ci.imageFormat = m_surface_formats[0].format; swapchain_ci.imageColorSpace = m_surface_formats[0].colorSpace; - swapchain_ci.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + swapchain_ci.imageExtent = m_surface_capabilities.minImageExtent; swapchain_ci.imageArrayLayers = 1; swapchain_ci.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; swapchain_ci.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; diff --git a/tests/unit/wsi.cpp b/tests/unit/wsi.cpp index 69cba801d0d..f5baf784b53 100644 --- a/tests/unit/wsi.cpp +++ b/tests/unit/wsi.cpp @@ -14,6 +14,7 @@ #include "../framework/layer_validation_tests.h" #include "../framework/pipeline_helper.h" +#include "generated/vk_function_pointers.h" #ifdef VK_USE_PLATFORM_WAYLAND_KHR #include "wayland-client.h" @@ -50,7 +51,7 @@ TEST_F(NegativeWsi, InitSwapchainPotentiallyIncompatibleFlag) { swapchain_ci.minImageCount = m_surface_capabilities.minImageCount; swapchain_ci.imageFormat = m_surface_formats[0].format; swapchain_ci.imageColorSpace = m_surface_formats[0].colorSpace; - swapchain_ci.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + swapchain_ci.imageExtent = m_surface_capabilities.minImageExtent; swapchain_ci.imageArrayLayers = 1; swapchain_ci.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; swapchain_ci.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -362,7 +363,7 @@ TEST_F(NegativeWsi, SwapchainImageParams) { good_create_info.minImageCount = m_surface_capabilities.minImageCount; good_create_info.imageFormat = m_surface_formats[0].format; good_create_info.imageColorSpace = m_surface_formats[0].colorSpace; - good_create_info.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + good_create_info.imageExtent = m_surface_capabilities.minImageExtent; good_create_info.imageArrayLayers = 1; good_create_info.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; good_create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -684,7 +685,7 @@ TEST_F(NegativeWsi, SwapchainNotSupported) { swapchain_create_info.minImageCount = m_surface_capabilities.minImageCount; swapchain_create_info.imageFormat = m_surface_formats[0].format; swapchain_create_info.imageColorSpace = m_surface_formats[0].colorSpace; - swapchain_create_info.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + swapchain_create_info.imageExtent = m_surface_capabilities.minImageExtent; swapchain_create_info.imageArrayLayers = 1; swapchain_create_info.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; swapchain_create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -781,7 +782,7 @@ TEST_F(NegativeWsi, SwapchainImageFormatList) { swapchain_create_info.minImageCount = m_surface_capabilities.minImageCount; swapchain_create_info.imageFormat = valid_surface_format.format; swapchain_create_info.imageColorSpace = valid_surface_format.colorSpace; - swapchain_create_info.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + swapchain_create_info.imageExtent = m_surface_capabilities.minImageExtent; swapchain_create_info.imageArrayLayers = 1; swapchain_create_info.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; swapchain_create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -853,7 +854,7 @@ TEST_F(NegativeWsi, SwapchainMinImageCountNonShared) { swapchain_create_info.minImageCount = 1; // invalid swapchain_create_info.imageFormat = m_surface_formats[0].format; swapchain_create_info.imageColorSpace = m_surface_formats[0].colorSpace; - swapchain_create_info.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + swapchain_create_info.imageExtent = m_surface_capabilities.minImageExtent; swapchain_create_info.imageArrayLayers = 1; swapchain_create_info.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; swapchain_create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -917,7 +918,7 @@ TEST_F(NegativeWsi, SwapchainMinImageCountShared) { swapchain_create_info.minImageCount = 2; // invalid swapchain_create_info.imageFormat = m_surface_formats[0].format; swapchain_create_info.imageColorSpace = m_surface_formats[0].colorSpace; - swapchain_create_info.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + swapchain_create_info.imageExtent = m_surface_capabilities.minImageExtent; swapchain_create_info.imageArrayLayers = 1; swapchain_create_info.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; // implementations must support swapchain_create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -960,7 +961,7 @@ TEST_F(NegativeWsi, SwapchainUsageNonShared) { swapchain_create_info.minImageCount = m_surface_capabilities.minImageCount; swapchain_create_info.imageFormat = m_surface_formats[0].format; swapchain_create_info.imageColorSpace = m_surface_formats[0].colorSpace; - swapchain_create_info.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + swapchain_create_info.imageExtent = m_surface_capabilities.minImageExtent; swapchain_create_info.imageArrayLayers = 1; swapchain_create_info.imageUsage = VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT; swapchain_create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -1021,7 +1022,7 @@ TEST_F(NegativeWsi, SwapchainUsageShared) { swapchain_create_info.minImageCount = 1; swapchain_create_info.imageFormat = m_surface_formats[0].format; swapchain_create_info.imageColorSpace = m_surface_formats[0].colorSpace; - swapchain_create_info.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + swapchain_create_info.imageExtent = m_surface_capabilities.minImageExtent; swapchain_create_info.imageArrayLayers = 1; swapchain_create_info.imageUsage = VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT; swapchain_create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -1082,7 +1083,7 @@ TEST_F(NegativeWsi, SwapchainPresentShared) { swapchain_create_info.minImageCount = 1; swapchain_create_info.imageFormat = m_surface_formats[0].format; swapchain_create_info.imageColorSpace = m_surface_formats[0].colorSpace; - swapchain_create_info.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + swapchain_create_info.imageExtent = m_surface_capabilities.minImageExtent; swapchain_create_info.imageArrayLayers = 1; swapchain_create_info.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; // implementations must support swapchain_create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -1918,7 +1919,7 @@ TEST_F(NegativeWsi, SwapchainMaintenance1ExtensionAcquire) { swapchain_create_info.minImageCount = m_surface_capabilities.minImageCount; swapchain_create_info.imageFormat = m_surface_formats[0].format; swapchain_create_info.imageColorSpace = m_surface_formats[0].colorSpace; - swapchain_create_info.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + swapchain_create_info.imageExtent = m_surface_capabilities.minImageExtent; swapchain_create_info.imageArrayLayers = 1; swapchain_create_info.imageUsage = imageUsage; swapchain_create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -2236,7 +2237,7 @@ TEST_F(NegativeWsi, SwapchainMaintenance1ExtensionCaps) { swapchain_create_info.minImageCount = m_surface_capabilities.minImageCount; swapchain_create_info.imageFormat = m_surface_formats[0].format; swapchain_create_info.imageColorSpace = m_surface_formats[0].colorSpace; - swapchain_create_info.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + swapchain_create_info.imageExtent = m_surface_capabilities.minImageExtent; swapchain_create_info.imageArrayLayers = 1; swapchain_create_info.imageUsage = imageUsage; swapchain_create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -2361,7 +2362,7 @@ TEST_F(NegativeWsi, SwapchainMaintenance1ExtensionRelease) { swapchain_create_info.minImageCount = m_surface_capabilities.minImageCount; swapchain_create_info.imageFormat = m_surface_formats[0].format; swapchain_create_info.imageColorSpace = m_surface_formats[0].colorSpace; - swapchain_create_info.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + swapchain_create_info.imageExtent = m_surface_capabilities.minImageExtent; swapchain_create_info.imageArrayLayers = 1; swapchain_create_info.imageUsage = imageUsage; swapchain_create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -2493,7 +2494,7 @@ TEST_F(NegativeWsi, AcquireFullScreenExclusiveModeEXT) { swapchain_create_info.minImageCount = m_surface_capabilities.minImageCount; swapchain_create_info.imageFormat = m_surface_formats[0].format; swapchain_create_info.imageColorSpace = m_surface_formats[0].colorSpace; - swapchain_create_info.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + swapchain_create_info.imageExtent = m_surface_capabilities.minImageExtent; swapchain_create_info.imageArrayLayers = 1; swapchain_create_info.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; swapchain_create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -2550,7 +2551,7 @@ TEST_F(NegativeWsi, CreateSwapchainFullscreenExclusive) { swapchain_create_info.minImageCount = m_surface_capabilities.minImageCount; swapchain_create_info.imageFormat = m_surface_formats[0].format; swapchain_create_info.imageColorSpace = m_surface_formats[0].colorSpace; - swapchain_create_info.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + swapchain_create_info.imageExtent = m_surface_capabilities.minImageExtent; swapchain_create_info.imageArrayLayers = 1; swapchain_create_info.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; swapchain_create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -3098,7 +3099,7 @@ TEST_F(NegativeWsi, SwapchainAcquireImageRetired) { swapchain_create_info.minImageCount = m_surface_capabilities.minImageCount; swapchain_create_info.imageFormat = m_surface_formats[0].format; swapchain_create_info.imageColorSpace = m_surface_formats[0].colorSpace; - swapchain_create_info.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + swapchain_create_info.imageExtent = m_surface_capabilities.minImageExtent; swapchain_create_info.imageArrayLayers = 1; swapchain_create_info.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; swapchain_create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -3204,7 +3205,7 @@ TEST_F(NegativeWsi, UseDestroyedSwapchain) { swapchain_create_info.minImageCount = m_surface_capabilities.minImageCount; swapchain_create_info.imageFormat = m_surface_formats[0].format; swapchain_create_info.imageColorSpace = m_surface_formats[0].colorSpace; - swapchain_create_info.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + swapchain_create_info.imageExtent = m_surface_capabilities.minImageExtent; swapchain_create_info.imageArrayLayers = 1; swapchain_create_info.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; swapchain_create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -3280,7 +3281,7 @@ TEST_F(NegativeWsi, ImageCompressionControlSwapchainWithoutFeature) { create_info.minImageCount = m_surface_capabilities.minImageCount; create_info.imageFormat = m_surface_formats[0].format; create_info.imageColorSpace = m_surface_formats[0].colorSpace; - create_info.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + create_info.imageExtent = m_surface_capabilities.minImageExtent; create_info.imageArrayLayers = 1; create_info.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -3318,8 +3319,7 @@ TEST_F(NegativeWsi, PresentDuplicatedSwapchain) { swapchain_create_info.minImageCount = info.surface_capabilities.maxImageCount; swapchain_create_info.imageFormat = info.surface_formats[0].format; swapchain_create_info.imageColorSpace = info.surface_formats[0].colorSpace; - swapchain_create_info.imageExtent = {info.surface_capabilities.minImageExtent.width, - info.surface_capabilities.minImageExtent.height}; + swapchain_create_info.imageExtent = info.surface_capabilities.minImageExtent; swapchain_create_info.imageArrayLayers = 1; swapchain_create_info.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; swapchain_create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -3454,8 +3454,7 @@ TEST_F(NegativeWsi, NonSupportedPresentMode) { swapchain_create_info.minImageCount = info.surface_capabilities.minImageCount; swapchain_create_info.imageFormat = info.surface_formats[0].format; swapchain_create_info.imageColorSpace = info.surface_formats[0].colorSpace; - swapchain_create_info.imageExtent = {info.surface_capabilities.minImageExtent.width, - info.surface_capabilities.minImageExtent.height}; + swapchain_create_info.imageExtent = info.surface_capabilities.minImageExtent; swapchain_create_info.imageArrayLayers = 1; swapchain_create_info.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; swapchain_create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -3482,7 +3481,7 @@ TEST_F(NegativeWsi, SwapchainMaintenance1DeferredMemoryFlags) { swapchain_ci.minImageCount = m_surface_capabilities.minImageCount; swapchain_ci.imageFormat = m_surface_formats[0].format; swapchain_ci.imageColorSpace = m_surface_formats[0].colorSpace; - swapchain_ci.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + swapchain_ci.imageExtent = m_surface_capabilities.minImageExtent; swapchain_ci.imageArrayLayers = 1; swapchain_ci.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; swapchain_ci.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -3522,7 +3521,7 @@ TEST_F(NegativeWsi, SurfaceCounters) { swapchain_ci.minImageCount = m_surface_capabilities.minImageCount; swapchain_ci.imageFormat = m_surface_formats[0].format; swapchain_ci.imageColorSpace = m_surface_formats[0].colorSpace; - swapchain_ci.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + swapchain_ci.imageExtent = m_surface_capabilities.minImageExtent; swapchain_ci.imageArrayLayers = 1; swapchain_ci.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; swapchain_ci.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -3576,7 +3575,7 @@ TEST_F(NegativeWsi, MissingPresentModeFifoLatestReadyFeature) { swapchain_ci.minImageCount = m_surface_capabilities.minImageCount; swapchain_ci.imageFormat = m_surface_formats[0].format; swapchain_ci.imageColorSpace = m_surface_formats[0].colorSpace; - swapchain_ci.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + swapchain_ci.imageExtent = m_surface_capabilities.minImageExtent; swapchain_ci.imageArrayLayers = 1; swapchain_ci.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; swapchain_ci.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -3629,7 +3628,7 @@ TEST_F(NegativeWsi, MissingPresentModesCreateInfoFifoLatestReadyFeature) { swapchain_ci.minImageCount = m_surface_capabilities.minImageCount; swapchain_ci.imageFormat = m_surface_formats[0].format; swapchain_ci.imageColorSpace = m_surface_formats[0].colorSpace; - swapchain_ci.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + swapchain_ci.imageExtent = m_surface_capabilities.minImageExtent; swapchain_ci.imageArrayLayers = 1; swapchain_ci.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; swapchain_ci.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -3758,7 +3757,7 @@ TEST_F(NegativeWsi, InitSwapchainUnsupportedCompositeAlpha) { swapchain_ci.minImageCount = m_surface_capabilities.minImageCount; swapchain_ci.imageFormat = m_surface_formats[0].format; swapchain_ci.imageColorSpace = m_surface_formats[0].colorSpace; - swapchain_ci.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + swapchain_ci.imageExtent = m_surface_capabilities.minImageExtent; swapchain_ci.imageArrayLayers = 1; swapchain_ci.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; swapchain_ci.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -3791,7 +3790,7 @@ TEST_F(NegativeWsi, InitSwapchainUnsupportedImageArrayLayers) { swapchain_ci.minImageCount = m_surface_capabilities.minImageCount; swapchain_ci.imageFormat = m_surface_formats[0].format; swapchain_ci.imageColorSpace = m_surface_formats[0].colorSpace; - swapchain_ci.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + swapchain_ci.imageExtent = m_surface_capabilities.minImageExtent; swapchain_ci.imageArrayLayers = surface_capabilities.maxImageArrayLayers + 1u; swapchain_ci.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; swapchain_ci.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -3821,7 +3820,7 @@ TEST_F(NegativeWsi, InitSwapchainUnsupportedSurfaceFormat) { swapchain_ci.minImageCount = m_surface_capabilities.minImageCount; swapchain_ci.imageFormat = VK_FORMAT_R32G32B32A32_UINT; swapchain_ci.imageColorSpace = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR; - swapchain_ci.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + swapchain_ci.imageExtent = m_surface_capabilities.minImageExtent; swapchain_ci.imageArrayLayers = 1u; swapchain_ci.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; swapchain_ci.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -3851,7 +3850,7 @@ TEST_F(NegativeWsi, InitSwapchainMissingQueueFamilyIndices) { swapchain_ci.minImageCount = m_surface_capabilities.minImageCount; swapchain_ci.imageFormat = m_surface_formats[0].format; swapchain_ci.imageColorSpace = m_surface_formats[0].colorSpace; - swapchain_ci.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + swapchain_ci.imageExtent = m_surface_capabilities.minImageExtent; swapchain_ci.imageArrayLayers = 1u; swapchain_ci.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; swapchain_ci.imageSharingMode = VK_SHARING_MODE_CONCURRENT; @@ -3900,7 +3899,7 @@ TEST_F(NegativeWsi, InitSwapchainInvalidImageCount) { swapchain_ci.minImageCount = m_surface_capabilities.maxImageCount + 1u; swapchain_ci.imageFormat = m_surface_formats[0].format; swapchain_ci.imageColorSpace = m_surface_formats[0].colorSpace; - swapchain_ci.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + swapchain_ci.imageExtent = m_surface_capabilities.minImageExtent; swapchain_ci.imageArrayLayers = 1u; swapchain_ci.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; swapchain_ci.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -3930,7 +3929,7 @@ TEST_F(NegativeWsi, InitSwapchainInvalidOldSwapchain) { swapchain_ci.minImageCount = m_surface_capabilities.minImageCount; swapchain_ci.imageFormat = m_surface_formats[0].format; swapchain_ci.imageColorSpace = m_surface_formats[0].colorSpace; - swapchain_ci.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + swapchain_ci.imageExtent = m_surface_capabilities.minImageExtent; swapchain_ci.imageArrayLayers = 1u; swapchain_ci.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; swapchain_ci.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -4038,7 +4037,7 @@ TEST_F(NegativeWsi, PresentMismatchedSwapchainCount) { swapchain_ci.minImageCount = m_surface_capabilities.minImageCount; swapchain_ci.imageFormat = m_surface_formats[0].format; swapchain_ci.imageColorSpace = m_surface_formats[0].colorSpace; - swapchain_ci.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + swapchain_ci.imageExtent = m_surface_capabilities.minImageExtent; swapchain_ci.imageArrayLayers = 1u; swapchain_ci.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; swapchain_ci.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -4089,7 +4088,7 @@ TEST_F(NegativeWsi, InvalidRectLayer) { swapchain_ci.minImageCount = m_surface_capabilities.minImageCount; swapchain_ci.imageFormat = m_surface_formats[0].format; swapchain_ci.imageColorSpace = m_surface_formats[0].colorSpace; - swapchain_ci.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + swapchain_ci.imageExtent = m_surface_capabilities.minImageExtent; swapchain_ci.imageArrayLayers = 1u; swapchain_ci.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; swapchain_ci.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -4207,7 +4206,7 @@ TEST_F(NegativeWsi, UnsupportedCompositeAlpha) { swapchain_ci.minImageCount = m_surface_capabilities.minImageCount; swapchain_ci.imageFormat = m_surface_formats[0].format; swapchain_ci.imageColorSpace = m_surface_formats[0].colorSpace; - swapchain_ci.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + swapchain_ci.imageExtent = m_surface_capabilities.minImageExtent; swapchain_ci.imageArrayLayers = 1u; swapchain_ci.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; swapchain_ci.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; diff --git a/tests/unit/wsi_positive.cpp b/tests/unit/wsi_positive.cpp index c6e1a891051..a41913cee15 100644 --- a/tests/unit/wsi_positive.cpp +++ b/tests/unit/wsi_positive.cpp @@ -760,7 +760,7 @@ TEST_F(PositiveWsi, SwapchainPresentShared) { swapchain_create_info.minImageCount = 1; swapchain_create_info.imageFormat = m_surface_formats[0].format; swapchain_create_info.imageColorSpace = m_surface_formats[0].colorSpace; - swapchain_create_info.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + swapchain_create_info.imageExtent = m_surface_capabilities.minImageExtent; swapchain_create_info.imageArrayLayers = 1; swapchain_create_info.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; // implementations must support swapchain_create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -831,7 +831,7 @@ TEST_F(PositiveWsi, CreateSwapchainFullscreenExclusive) { swapchain_create_info.minImageCount = m_surface_capabilities.minImageCount; swapchain_create_info.imageFormat = m_surface_formats[0].format; swapchain_create_info.imageColorSpace = m_surface_formats[0].colorSpace; - swapchain_create_info.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + swapchain_create_info.imageExtent = m_surface_capabilities.minImageExtent; swapchain_create_info.imageArrayLayers = 1; swapchain_create_info.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; swapchain_create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -876,7 +876,7 @@ TEST_F(PositiveWsi, CreateSwapchainFullscreenExclusive2) { swapchain_create_info.minImageCount = m_surface_capabilities.minImageCount; swapchain_create_info.imageFormat = m_surface_formats[0].format; swapchain_create_info.imageColorSpace = m_surface_formats[0].colorSpace; - swapchain_create_info.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + swapchain_create_info.imageExtent = m_surface_capabilities.minImageExtent; swapchain_create_info.imageArrayLayers = 1; swapchain_create_info.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; swapchain_create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -992,7 +992,7 @@ TEST_F(PositiveWsi, SwapchainExclusiveModeQueueFamilyPropertiesReferences) { swapchain_create_info.minImageCount = m_surface_capabilities.minImageCount; swapchain_create_info.imageFormat = m_surface_formats[0].format; swapchain_create_info.imageColorSpace = m_surface_formats[0].colorSpace; - swapchain_create_info.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + swapchain_create_info.imageExtent = m_surface_capabilities.minImageExtent; swapchain_create_info.imageArrayLayers = 1; swapchain_create_info.imageUsage = imageUsage; swapchain_create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -1106,7 +1106,7 @@ TEST_F(PositiveWsi, ProtectedSwapchainImageColorAttachment) { swapchain_create_info.minImageCount = m_surface_capabilities.minImageCount; swapchain_create_info.imageFormat = m_surface_formats[0].format; swapchain_create_info.imageColorSpace = m_surface_formats[0].colorSpace; - swapchain_create_info.imageExtent = {m_surface_capabilities.minImageExtent.width, m_surface_capabilities.minImageExtent.height}; + swapchain_create_info.imageExtent = m_surface_capabilities.minImageExtent; swapchain_create_info.imageArrayLayers = 1; swapchain_create_info.imageUsage = imageUsage; swapchain_create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -1218,8 +1218,7 @@ TEST_F(PositiveWsi, CreateSwapchainWithPresentModeInfo) { swapchain_create_info.minImageCount = surface_caps.surfaceCapabilities.minImageCount; swapchain_create_info.imageFormat = m_surface_formats[0].format; swapchain_create_info.imageColorSpace = m_surface_formats[0].colorSpace; - swapchain_create_info.imageExtent = {surface_caps.surfaceCapabilities.minImageExtent.width, - surface_caps.surfaceCapabilities.minImageExtent.height}; + swapchain_create_info.imageExtent = surface_caps.surfaceCapabilities.minImageExtent; swapchain_create_info.imageArrayLayers = 1; swapchain_create_info.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; // implementations must support swapchain_create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -1316,8 +1315,7 @@ TEST_F(PositiveWsi, AcquireImageBeforeGettingSwapchainImages) { swapchain_create_info.minImageCount = info.surface_capabilities.minImageCount; swapchain_create_info.imageFormat = info.surface_formats[0].format; swapchain_create_info.imageColorSpace = info.surface_formats[0].colorSpace; - swapchain_create_info.imageExtent = {info.surface_capabilities.minImageExtent.width, - info.surface_capabilities.minImageExtent.height}; + swapchain_create_info.imageExtent = info.surface_capabilities.minImageExtent; swapchain_create_info.imageArrayLayers = 1; swapchain_create_info.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; swapchain_create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -1687,8 +1685,7 @@ TEST_F(PositiveWsi, DifferentPerPresentModeImageCount) { swapchain_create_info.minImageCount = surface_caps.surfaceCapabilities.minImageCount; swapchain_create_info.imageFormat = info.surface_formats[0].format; swapchain_create_info.imageColorSpace = info.surface_formats[0].colorSpace; - swapchain_create_info.imageExtent = {surface_caps.surfaceCapabilities.minImageExtent.width, - surface_caps.surfaceCapabilities.minImageExtent.height}; + swapchain_create_info.imageExtent = surface_caps.surfaceCapabilities.minImageExtent; swapchain_create_info.imageArrayLayers = 1; swapchain_create_info.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; swapchain_create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; @@ -1734,8 +1731,7 @@ TEST_F(PositiveWsi, ReleaseSwapchainImages) { swapchain_create_info.minImageCount = info.surface_capabilities.maxImageCount; swapchain_create_info.imageFormat = info.surface_formats[0].format; swapchain_create_info.imageColorSpace = info.surface_formats[0].colorSpace; - swapchain_create_info.imageExtent = {info.surface_capabilities.minImageExtent.width, - info.surface_capabilities.minImageExtent.height}; + swapchain_create_info.imageExtent = info.surface_capabilities.minImageExtent; swapchain_create_info.imageArrayLayers = 1; swapchain_create_info.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; swapchain_create_info.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE;