Remove LLVM 20 limitation

- 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

Author: MathewBensonCode

.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 ]
 

.github/workflows/job-clangformat.yml

@@ -11,6 +11,9 @@ jobs:
         name: clang-format
         runs-on: windows-2022
         steps:
+            - name: Update llvm
+              run: choco upgrade llvm
+
             - name: Checkout repository
               uses: actions/checkout@v4
 

.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}}

.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

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

@@ -23,6 +23,9 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Update-LLVM
+        run: choco upgrade llvm
+
       - name: CMake Build
         run: .\Scripts\BuildEngine.ps1 -Configurations ${{inputs.configuration}} -RunClangFormat 0
         shell: pwsh

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 () {

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

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

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();
         }
 

repoConfiguration.json

@@ -24,7 +24,6 @@
         },
         "LLVM": {
             "Version": "20.1.7",
-            "MaximumVersion": "20.2.0"
         }
     }
 }