Remove LLVM 20 limitation

MathewBensonCode · MathewBensonCode · commit b99850abad6e · 2026-03-28T20:23:19.000+03:00
- clang-format ignore on CoroutineScheduler.h and VulkanDevice.h for
  operator bool()
- update ubuntu CI workflow to use version 21 as it tends to be behind
  in its inbuild version
diff --git a/.github/workflows/Engine-CI.yml b/.github/workflows/Engine-CI.yml
@@ -1,6 +1,6 @@
 on:
   push:
-    branches: [ master, develop, arena-integration ]
+    branches: [ master, develop, arena-integration, testllvm22 ]
   pull_request:
     branches: [ master, develop, arena-integration ]
 
diff --git a/.github/workflows/job-cmakebuild-linux.yml b/.github/workflows/job-cmakebuild-linux.yml
@@ -25,16 +25,17 @@ jobs:
     - name: Register the Microsoft repository GPG keys
       run: sudo dpkg -i packages-microsoft-prod.deb
 
-    - name: Install LLVM-20
+    - name: Install LLVM-21
       run: |
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
-          sudo ./llvm.sh 20
+          sudo ./llvm.sh 21
 
-    - name: Update the list of packages after we added packages.microsoft.com
+    - name: Update the list of packages
       run: sudo apt-get update
-    - name: Install development library
-      run: sudo apt-get install libasound2-dev libgl1-mesa-dev libpulse-dev libdbus-1-dev libx11-dev libxcursor-dev libxext-dev libxi-dev libxinerama-dev libxrandr-dev libxss-dev libxt-dev libxxf86vm-dev cmake apt-transport-https software-properties-common gcc g++ powershell clang-format-20 libwayland-dev libxkbcommon-dev dotnet-sdk-8.0
+
+    - name: Install Dependencies
+      run: sudo apt-get install libasound2-dev libgl1-mesa-dev libpulse-dev libdbus-1-dev libx11-dev libxcursor-dev libxext-dev libxi-dev libxinerama-dev libxrandr-dev libxss-dev libxt-dev libxxf86vm-dev cmake apt-transport-https software-properties-common gcc g++ powershell clang-format-21 glslang-tools libwayland-dev libxkbcommon-dev
 
     - name: CMake Build
       run: .\Scripts\BuildEngine.ps1 -Configurations ${{inputs.configuration}}
diff --git a/.github/workflows/job-cmakebuild-macOS.yml b/.github/workflows/job-cmakebuild-macOS.yml
@@ -26,6 +26,9 @@ jobs:
       - name: Install NuGet CLI
         run: brew install nuget
 
+      - name: Update LLVM
+        run: brew install llvm
+
       - name: CMake Build
         run: .\Scripts\BuildEngine.ps1 -Configurations ${{inputs.configuration}} -Architecture ${{inputs.architecture}} -RunClangFormat 0
         shell: pwsh
diff --git a/.github/workflows/job-deploy-windows.yml b/.github/workflows/job-deploy-windows.yml
@@ -15,7 +15,7 @@ on:
 jobs:
   deploy:
     name: deploy-windows-x64-${{ inputs.configuration }}
-    runs-on: windows-2022
+    runs-on: windows-2025
     steps:
       - uses: actions/download-artifact@v4
         with:
diff --git a/Scripts/Shared.ps1 b/Scripts/Shared.ps1
@@ -189,7 +189,6 @@ function Find-GlslangValidator () {
 function Find-ClangFormat () {
     $repoConfiguration = Get-RepositoryConfiguration
     $LLVMMinimumVersion = $repoConfiguration.Requirements.LLVM.Version
-    $LLVMMaximumVersion = $repoConfiguration.Requirements.LLVM.MaximumVersion
 
     $candidates = @(
         if ($IsMacOS) {
@@ -201,6 +200,8 @@ function Find-ClangFormat () {
         }
         if ($IsLinux) {
             '/usr/bin/clang-format'
+            '/usr/bin/clang-format-22'
+            '/usr/bin/clang-format-21'
             '/usr/bin/clang-format-20'
         }
         'clang-format'
@@ -209,16 +210,11 @@ function Find-ClangFormat () {
     foreach ($candidate in $candidates) {
         $clangFormatCommand = Get-Command $candidate -ErrorAction SilentlyContinue
         if ($clangFormatCommand) {
-            if ((& $clangFormatCommand --version | Out-String) -match "clang-format version ([\d\.]*)") {
-                [Version] $clangFormatVersion = $Matches[1]
-                if ((CompareVersion $clangFormatVersion $LLVMMinimumVersion) -and (CompareVersion $LLVMMaximumVersion $clangFormatVersion)) {
                     return $clangFormatCommand.Source
-                }
-            }
         }
     }
 
-    throw "Failed to find clang-format min $LLVMMinimumVersion max $LLVMMaximumVersion. Tried: " + ($candidates -join ', ')
+    throw "Failed to find clang-format min $LLVMMinimumVersion. Tried: " + ($candidates -join ', ')
 }
 
 function Setup-ShaderCCompilerTool () {
diff --git a/ZEngine/ZEngine/Core/CoroutineScheduler.h b/ZEngine/ZEngine/Core/CoroutineScheduler.h
@@ -14,11 +14,12 @@ namespace ZEngine::Core
 
         ReadyCallback   Ready  = nullptr;
         ExecuteCallback Action = nullptr;
-
+        // clang-format off
         operator bool() noexcept
         {
             return (Ready && Action);
         }
+        // clang-format on
     };
 
     struct CoroutineScheduler
diff --git a/ZEngine/ZEngine/Hardwares/VulkanDevice.cpp b/ZEngine/ZEngine/Hardwares/VulkanDevice.cpp
@@ -633,15 +633,15 @@ namespace ZEngine::Hardwares
         VkSemaphore          semaphores[] = {signal_semaphore->GetHandle()};
         VkCommandBuffer      buffers[]    = {command_buffer->GetHandle()};
         VkSubmitInfo         submit_info  = {
-                     .sType                = VK_STRUCTURE_TYPE_SUBMIT_INFO,
-                     .pNext                = nullptr,
-                     .waitSemaphoreCount   = 0,
-                     .pWaitSemaphores      = 0,
-                     .pWaitDstStageMask    = flags,
-                     .commandBufferCount   = 1,
-                     .pCommandBuffers      = buffers,
-                     .signalSemaphoreCount = 0,
-                     .pSignalSemaphores    = 0,
+            .sType                = VK_STRUCTURE_TYPE_SUBMIT_INFO,
+            .pNext                = nullptr,
+            .waitSemaphoreCount   = 0,
+            .pWaitSemaphores      = 0,
+            .pWaitDstStageMask    = flags,
+            .commandBufferCount   = 1,
+            .pCommandBuffers      = buffers,
+            .signalSemaphoreCount = 0,
+            .pSignalSemaphores    = 0,
         };
 
         ZENGINE_VALIDATE_ASSERT(vkQueueSubmit(GetQueue(command_buffer->QueueType).Handle, 1, &submit_info, fence->GetHandle()) == VK_SUCCESS, "Failed to submit queue")
@@ -2582,10 +2582,10 @@ namespace ZEngine::Hardwares
         uint32_t                             byte_per_pixel = Specifications::BytePerChannelMap[VALUE_FROM_SPEC_MAP(Specifications::ImageFormat::R8G8B8A8_SRGB)];
 
         Specifications::TextureSpecification spec           = {
-                      .Width        = width,
-                      .Height       = height,
-                      .BytePerPixel = byte_per_pixel,
-                      .Format       = Specifications::ImageFormat::R8G8B8A8_SRGB,
+            .Width        = width,
+            .Height       = height,
+            .BytePerPixel = byte_per_pixel,
+            .Format       = Specifications::ImageFormat::R8G8B8A8_SRGB,
         };
 
         auto tex_handle = CreateTexture(spec);
diff --git a/ZEngine/ZEngine/Hardwares/VulkanDevice.h b/ZEngine/ZEngine/Hardwares/VulkanDevice.h
@@ -76,11 +76,12 @@ namespace ZEngine::Hardwares
         BufferType    Type       = BufferType::UNKNOWN;
         VkBuffer      Handle     = VK_NULL_HANDLE;
         VmaAllocation Allocation = nullptr;
-
+        // clang-format off
         operator bool() const
         {
             return (Handle != VK_NULL_HANDLE);
         }
+        // clang-format on
     };
 
     struct BufferImage
@@ -90,11 +91,12 @@ namespace ZEngine::Hardwares
         VkImageView   ViewHandle{VK_NULL_HANDLE};
         VkSampler     Sampler{VK_NULL_HANDLE};
         VmaAllocation Allocation{nullptr};
-
+        // clang-format off
         operator bool() const
         {
             return (Handle != VK_NULL_HANDLE);
         }
+        // clang-format on
     };
 
     struct IGraphicBuffer
diff --git a/ZEngine/ZEngine/Rendering/Renderers/RendererPasses.cpp b/ZEngine/ZEngine/Rendering/Renderers/RendererPasses.cpp
@@ -52,7 +52,7 @@ namespace ZEngine::Rendering::Renderers
                                  .EnablePipelineDepthTest(true)
                                  .UseShader("initial")
                                  .Detach();
-            *output_pass = device->CreateRenderPass(pass_spec);
+            *output_pass   = device->CreateRenderPass(pass_spec);
             (*output_pass)->Bake();
         }
     }
@@ -91,7 +91,7 @@ namespace ZEngine::Rendering::Renderers
                                  .UseShader("depth_prepass_scene")
                                  .Detach();
 
-            *output_pass = device->CreateRenderPass(pass_spec);
+            *output_pass   = device->CreateRenderPass(pass_spec);
             (*output_pass)->Bake();
         }
 
@@ -167,7 +167,7 @@ namespace ZEngine::Rendering::Renderers
                                  .UseShader("skybox")
                                  .Detach();
 
-            *output_pass = device->CreateRenderPass(pass_spec);
+            *output_pass   = device->CreateRenderPass(pass_spec);
             (*output_pass)->Bake();
         }
 
@@ -255,7 +255,7 @@ namespace ZEngine::Rendering::Renderers
                                  .EnablePipelineDepthTest(true)
                                  .UseShader("infinite_grid")
                                  .Detach();
-            *output_pass = device->CreateRenderPass(pass_spec);
+            *output_pass   = device->CreateRenderPass(pass_spec);
             (*output_pass)->Bake();
         }
 
diff --git a/repoConfiguration.json b/repoConfiguration.json
@@ -24,7 +24,6 @@
         },
         "LLVM": {
             "Version": "20.1.7",
-            "MaximumVersion": "20.2.0"
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -14,11 +14,12 @@ namespace ZEngine::Core`
`14`	`14`
`15`	`15`	`ReadyCallback Ready = nullptr;`
`16`	`16`	`ExecuteCallback Action = nullptr;`
`17`		`-`
	`17`	`+ // clang-format off`
`18`	`18`	`operator bool() noexcept`
`19`	`19`	`{`
`20`	`20`	`return (Ready && Action);`
`21`	`21`	`}`
	`22`	`+ // clang-format on`
`22`	`23`	`};`
`23`	`24`
`24`	`25`	`struct CoroutineScheduler`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ namespace ZEngine::Rendering::Renderers`
`52`	`52`	`.EnablePipelineDepthTest(true)`
`53`	`53`	`.UseShader("initial")`
`54`	`54`	`.Detach();`
`55`		`- *output_pass = device->CreateRenderPass(pass_spec);`
	`55`	`+ *output_pass = device->CreateRenderPass(pass_spec);`
`56`	`56`	`(*output_pass)->Bake();`
`57`	`57`	`}`
`58`	`58`	`}`
`@@ -91,7 +91,7 @@ namespace ZEngine::Rendering::Renderers`
`91`	`91`	`.UseShader("depth_prepass_scene")`
`92`	`92`	`.Detach();`
`93`	`93`
`94`		`- *output_pass = device->CreateRenderPass(pass_spec);`
	`94`	`+ *output_pass = device->CreateRenderPass(pass_spec);`
`95`	`95`	`(*output_pass)->Bake();`
`96`	`96`	`}`
`97`	`97`
`@@ -167,7 +167,7 @@ namespace ZEngine::Rendering::Renderers`
`167`	`167`	`.UseShader("skybox")`
`168`	`168`	`.Detach();`
`169`	`169`
`170`		`- *output_pass = device->CreateRenderPass(pass_spec);`
	`170`	`+ *output_pass = device->CreateRenderPass(pass_spec);`
`171`	`171`	`(*output_pass)->Bake();`
`172`	`172`	`}`
`173`	`173`
`@@ -255,7 +255,7 @@ namespace ZEngine::Rendering::Renderers`
`255`	`255`	`.EnablePipelineDepthTest(true)`
`256`	`256`	`.UseShader("infinite_grid")`
`257`	`257`	`.Detach();`
`258`		`- *output_pass = device->CreateRenderPass(pass_spec);`
	`258`	`+ *output_pass = device->CreateRenderPass(pass_spec);`
`259`	`259`	`(*output_pass)->Bake();`
`260`	`260`	`}`
`261`	`261`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@`
`24`	`24`	`},`
`25`	`25`	`"LLVM": {`
`26`	`26`	`"Version": "20.1.7",`
`27`		`- "MaximumVersion": "20.2.0"`
`28`	`27`	`}`
`29`	`28`	`}`
`30`	`29`	`}`