Fix Swapchain issue working with wayland

Author: MathewBenson

.github/workflows/job-test-linux.yml

@@ -24,9 +24,10 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: Build-linux-${{ inputs.configuration }}
+          path: Result.Linux.x64.${{ inputs.configuration }}
 
       - name: Update access permission of ZEngineTests
-        run: chmod +x ./tests/ZEngineTests
+        run: chmod +x ./Result.Linux.x64.${{ inputs.configuration }}/tests/ZEngineTests
 
       - name: Run Tests
         env:

.github/workflows/job-test-macOS.yml

@@ -20,16 +20,13 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Install Dependencies
-        run: brew install vulkan-headers vulkan-loader assimp spirv-headers spirv-tools spirv-cross glslang glfw glew yaml-cpp spdlog googletest fmt
-
       - name: Download Artifacts
         uses: actions/download-artifact@v4
         with:
           name: Build-macOS-${{ inputs.architecture }}-${{ inputs.configuration }}
 
       - name: Update access permission of ZEngineTests
-        run: chmod +x ./tests/ZEngineTests
+        run: chmod +x ./Result.Darwin.${{inputs.architecture}}.${{ inputs.configuration }}/tests/ZEngineTests
 
       - name: Run Tests
         env:

.github/workflows/job-test-windows.yml

@@ -19,6 +19,9 @@ jobs:
 
       - name: Download All Artifacts
         uses: actions/download-artifact@v4
+        with:
+          path: Result.Windows.x64.MultiConfig
+          name: Build-Windows-x64-${{ inputs.configuration }}
 
       - name: Run Tests
         shell: pwsh

Scripts/RunTests.ps1

@@ -63,10 +63,20 @@ function RunTests {
         [string]$Configuration
     )
 
-    [string]$testExecutablePath = "tests/ZEngineTests"
-
-    if ($IsWindows) {
-            $testExecutablePath = "tests/ZEngineTests.exe"      
+    [string]$testExecutablePath = ""
+    switch ($SystemName) {
+        "Windows" {
+            $testExecutablePath = [IO.Path]::Combine($OutputBuildDirectory, "tests", "ZEngineTests.exe")
+        }
+        "Darwin" {
+            $testExecutablePath = Join-Path $OutputBuildDirectory -ChildPath "tests/ZEngineTests"
+        }
+        "Linux" {
+            $testExecutablePath = Join-Path $OutputBuildDirectory -ChildPath "tests/ZEngineTests"
+            }
+        Default {
+            throw 'This system is not supported'
+        }
     }
 
     # Check if the executable exists

ZEngine/ZEngine/CMakeLists.txt

@@ -75,5 +75,5 @@ endif()
 
 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
     target_link_libraries(zEngineLib PUBLIC stdc++fs)
-    target_compile_definitions(zEngineLib PUBLIC GLFW_EXPOSE_NATIVE_X11)
+    target_compile_definitions(zEngineLib PUBLIC GLFW_EXPOSE_NATIVE_WAYLAND)
 endif ()

ZEngine/ZEngine/Hardwares/VulkanDevice.cpp

@@ -1060,13 +1060,10 @@ namespace ZEngine::Hardwares
     {
         VkSurfaceCapabilitiesKHR capabilities{};
         vkGetPhysicalDeviceSurfaceCapabilitiesKHR(PhysicalDevice, Surface, &capabilities);
-        if (capabilities.currentExtent.width != std::numeric_limits<uint32_t>::max())
-        {
-            SwapchainImageWidth  = capabilities.currentExtent.width;
-            SwapchainImageHeight = capabilities.currentExtent.height;
-        }
+        SwapchainImageWidth                            = std::clamp(CurrentWindow->GetWidth(), capabilities.minImageExtent.width, capabilities.maxImageExtent.width);
+        SwapchainImageHeight                           = std::clamp(CurrentWindow->GetHeight(), capabilities.minImageExtent.height, capabilities.maxImageExtent.height);
 
-        auto                     min_image_count       = std::clamp(capabilities.minImageCount, capabilities.minImageCount, capabilities.maxImageCount == 0 ? std::numeric_limits<decltype(capabilities.maxImageCount)>::max() : capabilities.maxImageCount);
+        auto                     min_image_count       = SwapchainImageCount < capabilities.minImageCount ? capabilities.minImageCount : SwapchainImageCount;
         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
@@ -2093,7 +2090,7 @@ namespace ZEngine::Hardwares
 
     void Image2DBuffer::Dispose()
     {
-        if (this && m_buffer_image)
+        if (m_buffer_image)
         {
             Device->EnqueueBufferImageForDeletion(m_buffer_image);
             m_buffer_image = {};

dependencies.cmake

@@ -33,7 +33,7 @@ FetchContent_Declare(
   glfw3
   GIT_REPOSITORY https://github.com/glfw/glfw.git
   GIT_SHALLOW TRUE
-  GIT_TAG 3.3.10
+  GIT_TAG 3.4
   )
 
 FetchContent_Declare(