diff --git a/Cargo.lock b/Cargo.lock index 0081b3eae8..0127285e34 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -185,6 +185,9 @@ name = "bitflags" version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6dbe3c979c178231552ecba20214a8272df4e09f232a87aef4320cf06539aded" +dependencies = [ + "serde", +] [[package]] name = "block" @@ -1521,10 +1524,10 @@ dependencies = [ [[package]] name = "naga" version = "0.12.0" -source = "git+https://github.com/gfx-rs/naga?rev=b99d58ea435090e561377949f428bce2c18451bb#b99d58ea435090e561377949f428bce2c18451bb" +source = "git+https://github.com/gfx-rs/naga?rev=76003dc0035d53a474d366dcdf49d2e4d12e921f#76003dc0035d53a474d366dcdf49d2e4d12e921f" dependencies = [ "bit-set", - "bitflags 1.3.2", + "bitflags 2.3.2", "codespan-reporting", "hexf-parse", "indexmap", diff --git a/Cargo.toml b/Cargo.toml index 24dad22759..79aaa25c55 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -51,7 +51,7 @@ version = "0.16" [workspace.dependencies.naga] git = "https://github.com/gfx-rs/naga" -rev = "b99d58ea435090e561377949f428bce2c18451bb" +rev = "76003dc0035d53a474d366dcdf49d2e4d12e921f" version = "0.12.0" [workspace.dependencies] diff --git a/wgpu-core/Cargo.toml b/wgpu-core/Cargo.toml index dc44dbe59f..a2654d2a9f 100644 --- a/wgpu-core/Cargo.toml +++ b/wgpu-core/Cargo.toml @@ -67,7 +67,7 @@ thiserror = "1" [dependencies.naga] git = "https://github.com/gfx-rs/naga" -rev = "b99d58ea435090e561377949f428bce2c18451bb" +rev = "76003dc0035d53a474d366dcdf49d2e4d12e921f" version = "0.12.0" features = ["clone", "span", "validate"] diff --git a/wgpu-core/src/validation.rs b/wgpu-core/src/validation.rs index eadc0005d0..83cb90530a 100644 --- a/wgpu-core/src/validation.rs +++ b/wgpu-core/src/validation.rs @@ -915,7 +915,7 @@ impl Interface { size: wgt::BufferSize::new(stride as u64).unwrap(), }, ref other => ResourceType::Buffer { - size: wgt::BufferSize::new(other.size(&module.constants) as u64).unwrap(), + size: wgt::BufferSize::new(other.size(module.to_ctx()) as u64).unwrap(), }, }; let handle = resources.append( diff --git a/wgpu-hal/Cargo.toml b/wgpu-hal/Cargo.toml index 4c8f85ab0b..6baa39ce9a 100644 --- a/wgpu-hal/Cargo.toml +++ b/wgpu-hal/Cargo.toml @@ -118,14 +118,14 @@ android_system_properties = "0.1.1" [dependencies.naga] git = "https://github.com/gfx-rs/naga" -rev = "b99d58ea435090e561377949f428bce2c18451bb" +rev = "76003dc0035d53a474d366dcdf49d2e4d12e921f" version = "0.12.0" features = ["clone"] # DEV dependencies [dev-dependencies.naga] git = "https://github.com/gfx-rs/naga" -rev = "b99d58ea435090e561377949f428bce2c18451bb" +rev = "76003dc0035d53a474d366dcdf49d2e4d12e921f" version = "0.12.0" features = ["wgsl-in"] diff --git a/wgpu-hal/src/metal/device.rs b/wgpu-hal/src/metal/device.rs index a39bc82ab7..e5771a4bc7 100644 --- a/wgpu-hal/src/metal/device.rs +++ b/wgpu-hal/src/metal/device.rs @@ -175,7 +175,7 @@ impl super::Device { match var.space { naga::AddressSpace::WorkGroup => { if !ep_info[var_handle].is_empty() { - let size = module.types[var.ty].inner.size(&module.constants); + let size = module.types[var.ty].inner.size(module.to_ctx()); wg_memory_sizes.push(size); } }