Update to Vulkan 1.3.240 (#48)

* Update to Vulkan 1.3.240 * Remove unused lib file * Try fixing CI, update compat entry for Vulkan_Headers_jll * Try a different JULIA_VULKAN_LIBNAME for MacOS * Append .dylib to library name * Export StdVideo symbols * Comment out CI on Windows It is getting stuck on the SDK download, let's prevent it from running a very long job for now * Update to latest Clang * Also export STD_VIDEO constants/enums * Update manifest
JuliaGPU · Oct 6, 2023 · 1936f24 · 1936f24
1 parent fc8b160
commit 1936f24
Show file tree

Hide file tree

Showing 20 changed files with 126,980 additions and 57,362 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -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:
@@ -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 &
@@ -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
@@ -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}}

diff --git a/Project.toml b/Project.toml
@@ -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]