archive-gh-me/wgpu
1
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2025-12-08 21:26:17 +00:00
Code Issues Projects Releases Wiki Activity

Update Vulkan SDK (#6955)

Browse Source
This commit is contained in:
Connor Fitzgerald 2025-01-20 19:12:07 -05:00 committed by GitHub
parent 7fccb6bdb9
commit 04e40dd135
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.github/workflows/ci.yml vendored
View File

@ -3,11 +3,11 @@ name: CI
on: on:
push: push:
branches-ignore: [ branches-ignore: [
# We don't need to run on dependabot PRs. # We don't need to run on dependabot PRs.
"dependabot/**", "dependabot/**",
# This is the branch the merge queue creates. # This is the branch the merge queue creates.
"gh-readonly-queue/**" "gh-readonly-queue/**",
] ]
tags: [v0.*] tags: [v0.*]
pull_request: pull_request:
merge_group: merge_group:
@ -20,7 +20,7 @@ env:
# Sourced from https://vulkan.lunarg.com/sdk/home#linux # Sourced from https://vulkan.lunarg.com/sdk/home#linux
# #
# We don't include the 4th version number, as it's not used in any URL. # We don't include the 4th version number, as it's not used in any URL.
VULKAN_SDK_VERSION: "1.3.290" VULKAN_SDK_VERSION: "1.4.304"
# Sourced from https://www.nuget.org/packages/Microsoft.Direct3D.WARP # Sourced from https://www.nuget.org/packages/Microsoft.Direct3D.WARP
WARP_VERSION: "1.0.13" WARP_VERSION: "1.0.13"
@ -161,7 +161,7 @@ jobs:
target: wasm32-unknown-emscripten target: wasm32-unknown-emscripten
tier: 2 tier: 2
kind: wgpu-only kind: wgpu-only
# TODO: Uncomment once web-sys updates past 0.3.76 # TODO: Uncomment once web-sys updates past 0.3.76
# See https://github.com/rustwasm/wasm-bindgen/pull/4378 for details # See https://github.com/rustwasm/wasm-bindgen/pull/4378 for details
# - name: WebAssembly Core 1.0 # - name: WebAssembly Core 1.0
@ -169,7 +169,7 @@ jobs:
# target: wasm32v1-none # target: wasm32v1-none
# tier: 2 # tier: 2
# kind: no_std # kind: no_std
# Bare-metal x86-64 # Bare-metal x86-64
# TODO: Remove once web-sys updates past 0.3.76 # TODO: Remove once web-sys updates past 0.3.76
# Included while wasm32v1-none is failing to ensure `no_std` does not regress # Included while wasm32v1-none is failing to ensure `no_std` does not regress
@ -276,7 +276,7 @@ jobs:
# Check with all features. # Check with all features.
cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu-hal --all-features cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu-hal --all-features
cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu --all-features cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu --all-features
# Building for no_std platforms where every feature is enabled except "std". # Building for no_std platforms where every feature is enabled except "std".
- name: check no_std - name: check no_std
if: matrix.kind == 'no_std' if: matrix.kind == 'no_std'

18
.github/workflows/shaders.yml vendored
View File

@ -3,11 +3,11 @@ name: Shaders
on: on:
push: push:
branches-ignore: [ branches-ignore: [
# We don't need to run on dependabot PRs. # We don't need to run on dependabot PRs.
"dependabot/**", "dependabot/**",
# This is the branch the merge queue creates. # This is the branch the merge queue creates.
"gh-readonly-queue/**" "gh-readonly-queue/**",
] ]
tags: [v0.*] tags: [v0.*]
pull_request: pull_request:
merge_group: merge_group:
@ -16,9 +16,7 @@ env:
# Sourced from https://vulkan.lunarg.com/sdk/home#linux # Sourced from https://vulkan.lunarg.com/sdk/home#linux
# #
# We don't include the 4th version number, as it's not used in any URL. # We don't include the 4th version number, as it's not used in any URL.
# VULKAN_SDK_VERSION: "1.4.304"
# Held back from 1.3.290 by https://github.com/gfx-rs/wgpu/issues/6307
VULKAN_SDK_VERSION: "1.3.283"
# Sourced from https://github.com/microsoft/DirectXShaderCompiler/releases # Sourced from https://github.com/microsoft/DirectXShaderCompiler/releases
# #
@ -89,7 +87,7 @@ jobs:
naga-validate-linux: naga-validate-linux:
name: "Validate: SPIR-V/GLSL/DOT/WGSL" name: "Validate: SPIR-V/GLSL/DOT/WGSL"
runs-on: ubuntu-latest runs-on: ubuntu-24.04
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@ -102,7 +100,7 @@ jobs:
# vulkan sdk # vulkan sdk
wget -qO - https://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add - wget -qO - https://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add -
sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-$VULKAN_SDK_VERSION-jammy.list https://packages.lunarg.com/vulkan/$VULKAN_SDK_VERSION/lunarg-vulkan-$VULKAN_SDK_VERSION-jammy.list sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-$VULKAN_SDK_VERSION-noble.list https://packages.lunarg.com/vulkan/$VULKAN_SDK_VERSION/lunarg-vulkan-$VULKAN_SDK_VERSION-noble.list
sudo apt-get update sudo apt-get update
sudo apt install -y vulkan-sdk sudo apt install -y vulkan-sdk

8
wgpu-hal/src/vulkan/instance.rs
View File

@ -63,6 +63,14 @@ unsafe extern "system" fn debug_utils_messenger_callback(
return vk::FALSE; return vk::FALSE;
} }
// Silence Vulkan Validation error "VUID-vkCmdCopyImageToBuffer-pRegions-00184".
// While we aren't sure yet, we suspect this is probably a VVL issue.
// https://github.com/KhronosGroup/Vulkan-ValidationLayers/issues/9276
const VUID_VKCMDCOPYIMAGETOBUFFER_PREGIONS_00184: i32 = 0x45ef177c;
if cd.message_id_number == VUID_VKCMDCOPYIMAGETOBUFFER_PREGIONS_00184 {
return vk::FALSE;
}
let level = match message_severity { let level = match message_severity {
vk::DebugUtilsMessageSeverityFlagsEXT::VERBOSE => log::Level::Debug, vk::DebugUtilsMessageSeverityFlagsEXT::VERBOSE => log::Level::Debug,
vk::DebugUtilsMessageSeverityFlagsEXT::INFO => log::Level::Info, vk::DebugUtilsMessageSeverityFlagsEXT::INFO => log::Level::Info,