Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to Vulkan 1.3.240 #48

Merged
merged 11 commits into from
Oct 6, 2023
Merged

Update to Vulkan 1.3.240 #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
010094a
Update to Vulkan 1.3.240
serenity4 Feb 10, 2023
a89dc2a
Remove unused lib file
serenity4 Feb 10, 2023
593abc2
Try fixing CI, update compat entry for Vulkan_Headers_jll
serenity4 Feb 10, 2023
9498f91
Try a different JULIA_VULKAN_LIBNAME for MacOS
serenity4 Feb 10, 2023
b9fab9d
Append .dylib to library name
serenity4 Feb 10, 2023
50f89b8
Export StdVideo symbols
serenity4 Feb 19, 2023
a2642df
Comment out CI on Windows
serenity4 Feb 20, 2023
077f20d
Merge branch 'master' of https://github.com/JuliaGPU/VulkanCore.jl
serenity4 Aug 23, 2023
0609349
Update to latest Clang
serenity4 Aug 23, 2023
a5a45e6
Also export STD_VIDEO constants/enums
serenity4 Oct 5, 2023
f09d780
Update manifest
serenity4 Oct 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 29 additions & 28 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
pull_request:
env:
JuliaVersion: 1.6
VulkanSDKVersion: 1.2.148.1
VulkanSDKVersion: 1.3.239.0
JULIA_GITHUB_ACTIONS_CI: ON
jobs:
ubuntu-latest-x64:
Expand All @@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v3
- name: Download & Extract Vulkan SDK
run: |
wget --no-cookies -O ../vulkansdk-linux-x86_64-${{env.VulkanSDKVersion}}.tar.gz https://sdk.lunarg.com/sdk/download/${{env.VulkanSDKVersion}}/linux/vulkansdk-linux-x86_64-${{env.VulkanSDKVersion}}.tar.gz?u=
wget --no-cookies -O ../vulkansdk-linux-x86_64-${{env.VulkanSDKVersion}}.tar.gz https://sdk.lunarg.com/sdk/download/${{env.VulkanSDKVersion}}/linux/vulkansdk-linux-x86_64-${{env.VulkanSDKVersion}}.tar.gz
tar -zxf ../vulkansdk-linux-x86_64-${{env.VulkanSDKVersion}}.tar.gz -C ../
- name: Install xvfb for GLFW
run: sudo apt-get install xvfb && Xvfb :99 &
Expand All @@ -32,31 +32,31 @@ jobs:
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

windows-latest-x64:
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
- name: Set Environment variables
run: echo "VULKAN_SDK=C:\VulkanSDK\${{env.VulkanSDKVersion}}" >> $GITHUB_ENV
- name: Download & Install Vulkan SDK
run: |
Invoke-WebRequest -Uri https://sdk.lunarg.com/sdk/download/${{env.VulkanSDKVersion}}/windows/VulkanSDK-${{env.VulkanSDKVersion}}-Installer.exe?u= -OutFile ../vulkan-sdk-${{env.VulkanSDKVersion}}.exe
$installer = Start-Process -FilePath ../vulkan-sdk-${{env.VulkanSDKVersion}}.exe -Wait -PassThru -ArgumentList @("/S");
$installer.WaitForExit();
Invoke-WebRequest -Uri https://sdk.lunarg.com/sdk/download/latest/windows/vulkan-runtime.exe -OutFile ../vulkan-runtime.exe
$installer = Start-Process -FilePath ../vulkan-runtime.exe -Wait -PassThru -ArgumentList @("/S");
$installer.WaitForExit();
- uses: julia-actions/setup-julia@v1
with:
version: ${{env.JuliaVersion}}
arch: x64
- uses: julia-actions/julia-buildpkg@latest
- uses: julia-actions/julia-runtest@latest
env:
DISPLAY: :99
- uses: julia-actions/julia-uploadcodecov@latest
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
# windows-latest-x64:
# runs-on: windows-latest
# steps:
# - uses: actions/checkout@v3
# - name: Set Environment variables
# run: echo "VULKAN_SDK=C:\VulkanSDK\${{env.VulkanSDKVersion}}" >> $GITHUB_ENV
# - name: Download & Install Vulkan SDK
# run: |
# Invoke-WebRequest -Uri https://sdk.lunarg.com/sdk/download/${{env.VulkanSDKVersion}}/windows/VulkanSDK-${{env.VulkanSDKVersion}}-Installer.exe -OutFile ../vulkan-sdk-${{env.VulkanSDKVersion}}.exe
# $installer = Start-Process -FilePath ../vulkan-sdk-${{env.VulkanSDKVersion}}.exe -Wait -PassThru -ArgumentList @("/S");
# $installer.WaitForExit();
# Invoke-WebRequest -Uri https://sdk.lunarg.com/sdk/download/latest/windows/vulkan-runtime.exe -OutFile ../vulkan-runtime.exe
# $installer = Start-Process -FilePath ../vulkan-runtime.exe -Wait -PassThru -ArgumentList @("/S");
# $installer.WaitForExit();
# - uses: julia-actions/setup-julia@v1
# with:
# version: ${{env.JuliaVersion}}
# arch: x64
# - uses: julia-actions/julia-buildpkg@latest
# - uses: julia-actions/julia-runtest@latest
# env:
# DISPLAY: :99
# - uses: julia-actions/julia-uploadcodecov@latest
# env:
# CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

macos-latest-x64:
runs-on: macos-latest
Expand All @@ -69,9 +69,10 @@ jobs:
echo JULIA_VULKAN_SDK_SEARCH_PATH=$VULKAN_SDK/lib >> $GITHUB_ENV
echo VK_LAYER_PATH=$VULKAN_SDK/share/vulkan/explicit_layer.d >> $GITHUB_ENV
echo VK_ICD_FILENAMES=$VULKAN_SDK/share/vulkan/icd.d/MoltenVK_icd.json >> $GITHUB_ENV
echo JULIA_VULKAN_LIBNAME=libvulkan.1.dylib >> $GITHUB_ENV
- name: Download & Extract Vulkan SDK
run: |
wget --no-cookies -O ../vulkansdk-macos-${{env.VulkanSDKVersion}}.dmg https://sdk.lunarg.com/sdk/download/${{env.VulkanSDKVersion}}/mac/vulkansdk-macos-${{env.VulkanSDKVersion}}.dmg?u=
wget --no-cookies -O ../vulkansdk-macos-${{env.VulkanSDKVersion}}.dmg https://sdk.lunarg.com/sdk/download/${{env.VulkanSDKVersion}}/mac/vulkansdk-macos-${{env.VulkanSDKVersion}}.dmg
hdiutil attach ../vulkansdk-macos-${{env.VulkanSDKVersion}}.dmg
cp -r /Volumes/vulkansdk-macos-${{env.VulkanSDKVersion}} ../
hdiutil detach /Volumes/vulkansdk-macos-${{env.VulkanSDKVersion}}
Expand Down
2 changes: 1 addition & 1 deletion Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
Vulkan_Headers_jll = "8d446b21-f3ad-5576-a034-752265b9b6f9"

[compat]
Vulkan_Headers_jll = "1.2.177"
Vulkan_Headers_jll = "1.3.240"
julia = "1.3"

[extras]
Expand Down
Loading
Loading