Skip to content

Commit f77f68a

Browse files
yaz0rocornut
authored andcommitted
CI: Windows: update to 1.4.326 + pull Vulkan from KhronosGroup's Vulkan-Headers and Vulkan-Loader. (#8925, #8778)
1 parent bed08da commit f77f68a

2 files changed

Lines changed: 16 additions & 4 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,25 @@ jobs:
3030
Invoke-WebRequest -Uri "https://www.libsdl.org/release/SDL2-devel-2.32.8-VC.zip" -OutFile "SDL2-devel-2.32.8-VC.zip"
3131
Expand-Archive -Path SDL2-devel-2.32.8-VC.zip
3232
echo "SDL2_DIR=$(pwd)\SDL2-devel-2.32.8-VC\SDL2-2.32.8\" >>${env:GITHUB_ENV}
33-
33+
3434
Invoke-WebRequest -Uri "https://www.libsdl.org/release/SDL3-devel-3.2.18-VC.zip" -OutFile "SDL3-devel-3.2.18-VC.zip"
3535
Expand-Archive -Path SDL3-devel-3.2.18-VC.zip
3636
echo "SDL3_DIR=$(pwd)\SDL3-devel-3.2.18-VC\SDL3-3.2.18\" >>${env:GITHUB_ENV}
3737
38-
Invoke-WebRequest -Uri "https://github.com/ocornut/imgui/files/3789205/vulkan-sdk-1.1.121.2.zip" -OutFile vulkan-sdk-1.1.121.2.zip
39-
Expand-Archive -Path vulkan-sdk-1.1.121.2.zip
40-
echo "VULKAN_SDK=$(pwd)\vulkan-sdk-1.1.121.2\" >>${env:GITHUB_ENV}
38+
# VulkanSDK (retrieve minimal bits of the SDK from git)
39+
$vulkanVersion = "1.4.326"
40+
# 1. Get the vulkan headers, we will treat that folder as the sdk folder to avoid having to copy headers around
41+
Invoke-WebRequest -Uri "https://github.com/KhronosGroup/Vulkan-Headers/archive/refs/tags/v$($vulkanVersion).zip" -OutFile Vulkan-Headers-$($vulkanVersion).zip
42+
Expand-Archive -Path Vulkan-Headers-$($vulkanVersion).zip
43+
echo "VULKAN_SDK=$(pwd)\Vulkan-Headers-$($vulkanVersion)\Vulkan-Headers-$($vulkanVersion)" >>${env:GITHUB_ENV}
44+
# 2. Get and build the vulkan loader source code (UPDATE_DEPS=On will make it automatically fetch its dependencies)
45+
Invoke-WebRequest -Uri "https://github.com/KhronosGroup/Vulkan-Loader/archive/refs/tags/v$($vulkanVersion).zip" -OutFile Vulkan-Loader-$($vulkanVersion).zip
46+
Expand-Archive -Path Vulkan-Loader-$($vulkanVersion).zip
47+
cmake -S Vulkan-Loader-$($vulkanVersion)\Vulkan-Loader-$($vulkanVersion) -B VulkanLoader-build -D UPDATE_DEPS=On
48+
cmake --build VulkanLoader-build
49+
# 3. Copy the built lib/dll to the expected place
50+
mkdir Vulkan-Headers-$($vulkanVersion)\Vulkan-Headers-$($vulkanVersion)\Lib
51+
copy VulkanLoader-build\loader\Debug\vulkan-1.* Vulkan-Headers-$($vulkanVersion)\Vulkan-Headers-$($vulkanVersion)\Lib\
4152
4253
- name: Fix Projects
4354
shell: powershell

‎docs/CHANGELOG.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ Other Changes:
177177
to play nice with -fsanitize=undefined. (#8874) [@i25e]
178178
- CI: Added SDL3 builds to MacOS and Windows. (#8819, #8778) [@scribam]
179179
- CI: Updated Windows CI to use a more recent SDL2. (#8819, #8778) [@scribam]
180+
- CI: Updates Windows CI to use a more recent VulkanSDK. (#8925, #8778) [@yaz0r]
180181
- Examples: SDL3+Metal: added SDL3+Metal example. (#8827, #8825) [@shi-yan]
181182
- Examples: SDL3+SDL_GPU: use SDL_WaitAndAcquireGPUSwapchainTexture() instead
182183
of SDL_AcquireGPUSwapchainTexture(). (#8830) [@itsdanott]

0 commit comments

Comments
 (0)
⌂ 换网址