diff --git a/Cargo.lock b/Cargo.lock index 071c180aa..84537a7f1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -966,9 +966,9 @@ dependencies = [ [[package]] name = "naga" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b136bf483e309f330c74880370fa6f0553d9249399ac1dfa8e92c96a1612add" +checksum = "8c5859e55c51da10b98e7a73068e0a0c5da7bbcae4fc38f86043d0c6d1b917cf" dependencies = [ "bit-set", "bitflags", diff --git a/wgpu-hal/Cargo.toml b/wgpu-hal/Cargo.toml index 32859dddc..53c3fe02a 100644 --- a/wgpu-hal/Cargo.toml +++ b/wgpu-hal/Cargo.toml @@ -70,7 +70,7 @@ core-graphics-types = "0.1" [dependencies.naga] #git = "https://github.com/gfx-rs/naga" #rev = "4e181d6" -version = "0.6" +version = "0.6.3" [dev-dependencies.naga] #git = "https://github.com/gfx-rs/naga" diff --git a/wgpu-hal/src/auxil/mod.rs b/wgpu-hal/src/auxil/mod.rs index 5e45e0078..56a2ba351 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 e9bcf31d0..a0cd28e1c 100644 --- a/wgpu-hal/src/vulkan/adapter.rs +++ b/wgpu-hal/src/vulkan/adapter.rs @@ -838,6 +838,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,