diff --git a/crates/shaders/Cargo.toml b/crates/shaders/Cargo.toml index 37f439c6..b41e9c45 100644 --- a/crates/shaders/Cargo.toml +++ b/crates/shaders/Cargo.toml @@ -34,10 +34,10 @@ msl = [] workspace = true [dependencies] -naga = { version = "0.13", features = ["wgsl-in", "msl-out", "validate"], optional = true } +naga = { version = "0.19", features = ["wgsl-in", "msl-out",], optional = true } thiserror = { version = "1.0.57", optional = true } [build-dependencies] -naga = { version = "0.13", features = ["wgsl-in", "msl-out", "validate"] } +naga = { version = "0.19", features = ["wgsl-in", "msl-out",] } thiserror = "1.0.57" diff --git a/crates/shaders/src/compile/mod.rs b/crates/shaders/src/compile/mod.rs index 8cf0f06a..08792043 100644 --- a/crates/shaders/src/compile/mod.rs +++ b/crates/shaders/src/compile/mod.rs @@ -78,10 +78,10 @@ impl ShaderInfo { .. } => u32::from(*size) * stride, naga::TypeInner::Struct { span, .. } => *span, - naga::TypeInner::Scalar { width, .. } => *width as u32, - naga::TypeInner::Vector { width, .. } => *width as u32, - naga::TypeInner::Matrix { width, .. } => *width as u32, - naga::TypeInner::Atomic { width, .. } => *width as u32, + naga::TypeInner::Scalar(scalar) => scalar.width as u32, + naga::TypeInner::Vector { scalar, .. } => scalar.width as u32, + naga::TypeInner::Matrix { scalar, .. } => scalar.width as u32, + naga::TypeInner::Atomic(scalar) => scalar.width as u32, _ => { // Not a valid workgroup variable type. At least not one that is used // in our shaders.