Update naga to 0e3fbc8

gfx-rs · Oct 7, 2021 · dfa4948 · dfa4948
1 parent 5092fb7
commit dfa4948
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/wgpu-core/Cargo.toml b/wgpu-core/Cargo.toml
@@ -36,9 +36,9 @@ thiserror = "1"
 
 [dependencies.naga]
 git = "https://github.com/gfx-rs/naga"
-rev = "52d74e9"
+rev = "0e3fbc8"
 #version = "0.6"
-features = ["wgsl-in"]
+features = ["validate", "wgsl-in"]
 
 [dependencies.wgt]
 path = "../wgpu-types"

diff --git a/wgpu-core/src/validation.rs b/wgpu-core/src/validation.rs
@@ -793,7 +793,7 @@ impl Interface {
         list: &mut Vec<Varying>,
         binding: Option<&naga::Binding>,
         ty: naga::Handle<naga::Type>,
-        arena: &naga::Arena<naga::Type>,
+        arena: &naga::UniqueArena<naga::Type>,
     ) {
         let numeric_ty = match arena[ty].inner {
             naga::TypeInner::Scalar { kind, width } => NumericType {

diff --git a/wgpu-hal/Cargo.toml b/wgpu-hal/Cargo.toml
@@ -70,12 +70,12 @@ core-graphics-types = "0.1"
 
 [dependencies.naga]
 git = "https://github.com/gfx-rs/naga"
-rev = "52d74e9"
+rev = "0e3fbc8"
 #version = "0.6"
 
 [dev-dependencies.naga]
 git = "https://github.com/gfx-rs/naga"
-rev = "52d74e9"
+rev = "0e3fbc8"
 #version = "0.6"
 features = ["wgsl-in"]
 

diff --git a/wgpu-hal/src/vulkan/mod.rs b/wgpu-hal/src/vulkan/mod.rs
@@ -448,6 +448,7 @@ pub struct CommandBuffer {
 }
 
 #[derive(Debug)]
+#[allow(clippy::large_enum_variant)]
 pub enum ShaderModule {
     Raw(vk::ShaderModule),
     Intermediate {

diff --git 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 = "52d74e9"
+rev = "0e3fbc8"
 #version = "0.6"
 optional = true
 
 # used to test all the example shaders
 [dev-dependencies.naga]
 git = "https://github.com/gfx-rs/naga"
-rev = "52d74e9"
+rev = "0e3fbc8"
 #version = "0.6"
 features = ["wgsl-in"]