Revert Swapchain Related Changes to VulkanDevice.cpp

- Being worked on by another branch.

Author: MathewBenson

ZEngine/ZEngine/Hardwares/VulkanDevice.cpp

@@ -1060,23 +1060,26 @@ namespace ZEngine::Hardwares
     {
         VkSurfaceCapabilitiesKHR capabilities{};
         vkGetPhysicalDeviceSurfaceCapabilitiesKHR(PhysicalDevice, Surface, &capabilities);
-        SwapchainImageWidth                            = std::clamp(CurrentWindow->GetWidth(), capabilities.minImageExtent.width, capabilities.maxImageExtent.width);
-        SwapchainImageHeight                           = std::clamp(CurrentWindow->GetHeight(), capabilities.minImageExtent.height, capabilities.maxImageExtent.height);
+        if (capabilities.currentExtent.width != std::numeric_limits<uint32_t>::max())
+        {
+            SwapchainImageWidth  = capabilities.currentExtent.width;
+            SwapchainImageHeight = capabilities.currentExtent.height;
+        }
 
-        auto                     min_image_count       = SwapchainImageCount < capabilities.minImageCount ? capabilities.minImageCount : SwapchainImageCount;
+        auto                     min_image_count       = std::clamp(capabilities.minImageCount, capabilities.minImageCount + 1, capabilities.maxImageCount);
         VkSwapchainCreateInfoKHR swapchain_create_info = {
             .sType = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR, .pNext = nullptr, .surface = Surface, .minImageCount = min_image_count, .imageFormat = SurfaceFormat.format, .imageColorSpace = SurfaceFormat.colorSpace, .imageExtent = VkExtent2D{.width = SwapchainImageWidth, .height = SwapchainImageHeight},
                                 .imageArrayLayers = 1, .imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT, .preTransform = capabilities.currentTransform, .compositeAlpha = VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR, .presentMode = PresentMode, .clipped = VK_TRUE
         };
 
         if (SwapchainImageViews.capacity() <= 0)
         {
-            SwapchainImageViews.init(Arena, SwapchainImageCount);
+            SwapchainImageViews.init(Arena, SwapchainImageCount, SwapchainImageCount);
         }
 
         if (SwapchainFramebuffers.capacity() <= 0)
         {
-            SwapchainFramebuffers.init(Arena, SwapchainImageCount);
+            SwapchainFramebuffers.init(Arena, SwapchainImageCount, SwapchainImageCount);
         }
 
         auto            scratch             = ZGetScratch(Arena);
@@ -1095,12 +1098,18 @@ namespace ZEngine::Hardwares
 
         ZENGINE_VALIDATE_ASSERT(vkCreateSwapchainKHR(LogicalDevice, &swapchain_create_info, nullptr, &SwapchainHandle) == VK_SUCCESS, "Failed to create Swapchain")
 
-        ZENGINE_VALIDATE_ASSERT(vkGetSwapchainImagesKHR(LogicalDevice, SwapchainHandle, &SwapchainImageCount, nullptr) == VK_SUCCESS, "Failed to get Images count from Swapchain")
+        uint32_t image_count = 0;
+        ZENGINE_VALIDATE_ASSERT(vkGetSwapchainImagesKHR(LogicalDevice, SwapchainHandle, &image_count, nullptr) == VK_SUCCESS, "Failed to get Images count from Swapchain")
 
-        Array<VkImage> SwapchainImages = {};
+        if (image_count < SwapchainImageCount)
+        {
+            ZENGINE_CORE_WARN("Max Swapchain image count supported is {}, but requested {}", image_count, SwapchainImageCount);
+            SwapchainImageCount = image_count;
+            ZENGINE_CORE_WARN("Swapchain image count has changed from {} to {}", SwapchainImageCount, image_count);
+        }
 
+        Array<VkImage> SwapchainImages = {};
         SwapchainImages.init(scratch.Arena, SwapchainImageCount, SwapchainImageCount);
-
         ZENGINE_VALIDATE_ASSERT(vkGetSwapchainImagesKHR(LogicalDevice, SwapchainHandle, &SwapchainImageCount, SwapchainImages.data()) == VK_SUCCESS, "Failed to get VkImages from Swapchain")
 
         /*Transition Image from Undefined to Present_src*/
@@ -1127,12 +1136,12 @@ namespace ZEngine::Hardwares
 
         for (int i = 0; i < SwapchainImageCount; ++i)
         {
-            SwapchainImageViews.push(CreateImageView(SwapchainImages[i], SurfaceFormat.format, VK_IMAGE_VIEW_TYPE_2D, VK_IMAGE_ASPECT_COLOR_BIT));
+            SwapchainImageViews[i] = CreateImageView(SwapchainImages[i], SurfaceFormat.format, VK_IMAGE_VIEW_TYPE_2D, VK_IMAGE_ASPECT_COLOR_BIT);
 
             Array<VkImageView> fb_images_views;
             fb_images_views.init(scratch.Arena, 1);
             fb_images_views.push(SwapchainImageViews[i]);
-            SwapchainFramebuffers.push(CreateFramebuffer(ArrayView{fb_images_views}, SwapchainAttachment->GetHandle(), SwapchainImageWidth, SwapchainImageHeight));
+            SwapchainFramebuffers[i] = CreateFramebuffer(ArrayView{fb_images_views}, SwapchainAttachment->GetHandle(), SwapchainImageWidth, SwapchainImageHeight);
         }
 
         ZReleaseScratch(scratch);