mirror of
https://github.com/gfx-rs/wgpu.git
synced 2024-11-25 08:13:27 +00:00
Update naga
to 0.12.0@git:76003dc0035d53a474d366dcdf49d2e4d12e921f (#3866)
This commit is contained in:
parent
d8b2c3866e
commit
dcad7dfba9
7
Cargo.lock
generated
7
Cargo.lock
generated
@ -185,6 +185,9 @@ name = "bitflags"
|
|||||||
version = "2.3.2"
|
version = "2.3.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "6dbe3c979c178231552ecba20214a8272df4e09f232a87aef4320cf06539aded"
|
checksum = "6dbe3c979c178231552ecba20214a8272df4e09f232a87aef4320cf06539aded"
|
||||||
|
dependencies = [
|
||||||
|
"serde",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "block"
|
name = "block"
|
||||||
@ -1521,10 +1524,10 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "naga"
|
name = "naga"
|
||||||
version = "0.12.0"
|
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 = [
|
dependencies = [
|
||||||
"bit-set",
|
"bit-set",
|
||||||
"bitflags 1.3.2",
|
"bitflags 2.3.2",
|
||||||
"codespan-reporting",
|
"codespan-reporting",
|
||||||
"hexf-parse",
|
"hexf-parse",
|
||||||
"indexmap",
|
"indexmap",
|
||||||
|
@ -51,7 +51,7 @@ version = "0.16"
|
|||||||
|
|
||||||
[workspace.dependencies.naga]
|
[workspace.dependencies.naga]
|
||||||
git = "https://github.com/gfx-rs/naga"
|
git = "https://github.com/gfx-rs/naga"
|
||||||
rev = "b99d58ea435090e561377949f428bce2c18451bb"
|
rev = "76003dc0035d53a474d366dcdf49d2e4d12e921f"
|
||||||
version = "0.12.0"
|
version = "0.12.0"
|
||||||
|
|
||||||
[workspace.dependencies]
|
[workspace.dependencies]
|
||||||
|
@ -67,7 +67,7 @@ thiserror = "1"
|
|||||||
|
|
||||||
[dependencies.naga]
|
[dependencies.naga]
|
||||||
git = "https://github.com/gfx-rs/naga"
|
git = "https://github.com/gfx-rs/naga"
|
||||||
rev = "b99d58ea435090e561377949f428bce2c18451bb"
|
rev = "76003dc0035d53a474d366dcdf49d2e4d12e921f"
|
||||||
version = "0.12.0"
|
version = "0.12.0"
|
||||||
features = ["clone", "span", "validate"]
|
features = ["clone", "span", "validate"]
|
||||||
|
|
||||||
|
@ -915,7 +915,7 @@ impl Interface {
|
|||||||
size: wgt::BufferSize::new(stride as u64).unwrap(),
|
size: wgt::BufferSize::new(stride as u64).unwrap(),
|
||||||
},
|
},
|
||||||
ref other => ResourceType::Buffer {
|
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(
|
let handle = resources.append(
|
||||||
|
@ -118,14 +118,14 @@ android_system_properties = "0.1.1"
|
|||||||
|
|
||||||
[dependencies.naga]
|
[dependencies.naga]
|
||||||
git = "https://github.com/gfx-rs/naga"
|
git = "https://github.com/gfx-rs/naga"
|
||||||
rev = "b99d58ea435090e561377949f428bce2c18451bb"
|
rev = "76003dc0035d53a474d366dcdf49d2e4d12e921f"
|
||||||
version = "0.12.0"
|
version = "0.12.0"
|
||||||
features = ["clone"]
|
features = ["clone"]
|
||||||
|
|
||||||
# DEV dependencies
|
# DEV dependencies
|
||||||
[dev-dependencies.naga]
|
[dev-dependencies.naga]
|
||||||
git = "https://github.com/gfx-rs/naga"
|
git = "https://github.com/gfx-rs/naga"
|
||||||
rev = "b99d58ea435090e561377949f428bce2c18451bb"
|
rev = "76003dc0035d53a474d366dcdf49d2e4d12e921f"
|
||||||
version = "0.12.0"
|
version = "0.12.0"
|
||||||
features = ["wgsl-in"]
|
features = ["wgsl-in"]
|
||||||
|
|
||||||
|
@ -175,7 +175,7 @@ impl super::Device {
|
|||||||
match var.space {
|
match var.space {
|
||||||
naga::AddressSpace::WorkGroup => {
|
naga::AddressSpace::WorkGroup => {
|
||||||
if !ep_info[var_handle].is_empty() {
|
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);
|
wg_memory_sizes.push(size);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user