Skip to content

Commit 84b7005

Browse files
committed
Remove LLVM 20 limitation
- clang-format ignore on CoroutineScheduler.h and VulkanDevice.h for operator bool() - update ubuntu CI workflow to use version 21.
1 parent f7a203d commit 84b7005

File tree

6 files changed

+15
-11
lines changed

6 files changed

+15
-11
lines changed

.github/workflows/Engine-CI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
on:
22
push:
3-
branches: [ master, develop, arena-integration ]
3+
branches: [ master, develop, arena-integration, update-llvm ]
44
pull_request:
55
branches: [ master, develop, arena-integration ]
66

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@ jobs:
2525
- name: Register the Microsoft repository GPG keys
2626
run: sudo dpkg -i packages-microsoft-prod.deb
2727

28-
- name: Install LLVM-20
28+
- name: Install LLVM-21
2929
run: |
3030
wget https://apt.llvm.org/llvm.sh
3131
chmod +x llvm.sh
32-
sudo ./llvm.sh 20
32+
sudo ./llvm.sh 21
3333
3434
- name: Update the list of packages
3535
run: sudo apt-get update
3636

3737
- name: Install Dependencies
38-
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 glslang-tools libwayland-dev libxkbcommon-dev
38+
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
3939

4040
- name: CMake Build
4141
run: .\Scripts\BuildEngine.ps1 -Configurations ${{inputs.configuration}}

Scripts/Shared.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ function Find-ClangFormat () {
201201
}
202202
if ($IsLinux) {
203203
'/usr/bin/clang-format'
204+
'/usr/bin/clang-format-21'
204205
'/usr/bin/clang-format-20'
205206
}
206207
'clang-format'

ZEngine/ZEngine/Core/CoroutineScheduler.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@ namespace ZEngine::Core
1414

1515
ReadyCallback Ready = nullptr;
1616
ExecuteCallback Action = nullptr;
17-
17+
// clang-format off
1818
operator bool() noexcept
1919
{
2020
return (Ready && Action);
2121
}
22+
// clang-format on
2223
};
2324

2425
struct CoroutineScheduler

ZEngine/ZEngine/Hardwares/VulkanDevice.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,12 @@ namespace ZEngine::Hardwares
7575
BufferType Type = BufferType::UNKNOWN;
7676
VkBuffer Handle = VK_NULL_HANDLE;
7777
VmaAllocation Allocation = nullptr;
78-
78+
// clang-format off
7979
operator bool() const
8080
{
8181
return (Handle != VK_NULL_HANDLE);
8282
}
83+
// clang-format on
8384
};
8485

8586
struct BufferImage
@@ -89,11 +90,12 @@ namespace ZEngine::Hardwares
8990
VkImageView ViewHandle{VK_NULL_HANDLE};
9091
VkSampler Sampler{VK_NULL_HANDLE};
9192
VmaAllocation Allocation{nullptr};
92-
93+
// clang-format off
9394
operator bool() const
9495
{
9596
return (Handle != VK_NULL_HANDLE);
9697
}
98+
// clang-format on
9799
};
98100

99101
struct IGraphicBuffer

repoConfiguration.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
"ShaderC": {
77
"MinimumVersion": "11.1.0",
88
"Windows": {
9-
"Url": "https://storage.googleapis.com/shaderc/artifacts/prod/graphics_shader_compiler/shaderc/windows/continuous_release_2019/26/20230810-123915/install.zip"
9+
"Url": "https://storage.googleapis.com/shaderc/artifacts/prod/graphics_shader_compiler/shaderc/windows/vs2022_amd64_release_continuous/29/20260112-140346/install.zip"
1010
},
1111
"macOS": {
12-
"Url": "https://storage.googleapis.com/shaderc/artifacts/prod/graphics_shader_compiler/shaderc/macos/continuous_clang_release/472/20240708-061139/install.tgz"
12+
"Url": "https://storage.googleapis.com/shaderc/artifacts/prod/graphics_shader_compiler/shaderc/macos/continuous_clang_release/519/20260112-140351/install.tgz"
1313
},
1414
"Linux": {
15-
"Url": "https://storage.googleapis.com/shaderc/artifacts/prod/graphics_shader_compiler/shaderc/linux/continuous_gcc_release/500/20250807-100822/install.tgz"
15+
"Url": "https://storage.googleapis.com/shaderc/artifacts/prod/graphics_shader_compiler/shaderc/linux/continuous_clang_release/510/20260112-140346/install.tgz"
1616
}
1717
},
1818
"GlslangValidator": {
@@ -24,7 +24,7 @@
2424
},
2525
"LLVM": {
2626
"Version": "20.1.7",
27-
"MaximumVersion": "20.2.0"
27+
"MaximumVersion": "22.0.0"
2828
}
2929
}
3030
}

0 commit comments

Comments
 (0)