diff --git a/wgpu-core/Cargo.toml b/wgpu-core/Cargo.toml index d4f9e88ab8..0c57bf11c6 100644 --- a/wgpu-core/Cargo.toml +++ b/wgpu-core/Cargo.toml @@ -36,7 +36,7 @@ thiserror = "1" [dependencies.naga] git = "https://github.com/gfx-rs/naga" -rev = "d4bedaf" +rev = "e226cf3" #version = "0.6" features = ["wgsl-in"] diff --git a/wgpu-hal/Cargo.toml b/wgpu-hal/Cargo.toml index e0fe942f21..075039580b 100644 --- a/wgpu-hal/Cargo.toml +++ b/wgpu-hal/Cargo.toml @@ -69,12 +69,12 @@ core-graphics-types = "0.1" [dependencies.naga] git = "https://github.com/gfx-rs/naga" -rev = "d4bedaf" +rev = "e226cf3" #version = "0.6" [dev-dependencies.naga] git = "https://github.com/gfx-rs/naga" -rev = "d4bedaf" +rev = "e226cf3" #version = "0.6" features = ["wgsl-in"] diff --git a/wgpu-hal/src/auxil/mod.rs b/wgpu-hal/src/auxil/mod.rs index 5e45e00784..56a2ba351d 100644 --- a/wgpu-hal/src/auxil/mod.rs +++ b/wgpu-hal/src/auxil/mod.rs @@ -10,6 +10,9 @@ pub mod db { pub mod nvidia { pub const VENDOR: u32 = 0x10DE; } + pub mod qualcomm { + pub const VENDOR: u32 = 0x5143; + } } pub fn map_naga_stage(stage: naga::ShaderStage) -> wgt::ShaderStages { diff --git a/wgpu-hal/src/vulkan/adapter.rs b/wgpu-hal/src/vulkan/adapter.rs index 107483a27b..0b5b3e0218 100644 --- a/wgpu-hal/src/vulkan/adapter.rs +++ b/wgpu-hal/src/vulkan/adapter.rs @@ -843,6 +843,10 @@ impl super::Adapter { spv::WriterFlags::DEBUG, self.instance.flags.contains(crate::InstanceFlags::DEBUG), ); + flags.set( + spv::WriterFlags::LABEL_VARYINGS, + self.phd_capabilities.properties.vendor_id != crate::auxil::db::qualcomm::VENDOR, + ); spv::Options { lang_version: (1, 0), flags, diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml index d37e2dc20a..f8ad038f40 100644 --- a/wgpu/Cargo.toml +++ b/wgpu/Cargo.toml @@ -90,14 +90,14 @@ env_logger = "0.8" [dependencies.naga] git = "https://github.com/gfx-rs/naga" -rev = "d4bedaf" +rev = "e226cf3" #version = "0.6" optional = true # used to test all the example shaders [dev-dependencies.naga] git = "https://github.com/gfx-rs/naga" -rev = "d4bedaf" +rev = "e226cf3" #version = "0.6" features = ["wgsl-in"]