nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2024-11-25 16:24:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: bump naga to a1840be (#2401)

Browse Source 
* chore: bump naga to a1840be

So tip no longer indirectly pins indexmap, etc...

* feedback

* TODO push_constant_binding
This commit is contained in:
Aaron O'Mullan 2022-01-18 01:17:31 +01:00 committed by GitHub
parent 0183e7d1e8
commit 5877117529
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -1039,7 +1039,7 @@ dependencies = [
[[package]]
name = "naga"
version = "0.8.0"
source = "git+https://github.com/gfx-rs/naga?rev=c0b7ac7#c0b7ac7f542cc42ccac6f2ec3fc1fb01309cf4d7"
source = "git+https://github.com/gfx-rs/naga?rev=a1840be#a1840beb1a96c9a49980fe3efa8e2f3dcd88abe6"
dependencies = [
"bit-set",
"bitflags",

2
wgpu-core/Cargo.toml
View File

@ -38,7 +38,7 @@ thiserror = "1"
[dependencies.naga]
git = "https://github.com/gfx-rs/naga"
rev = "c0b7ac7"
rev = "a1840be"
#version = "0.8"
features = ["span", "validate", "wgsl-in"]

4
wgpu-hal/Cargo.toml
View File

@ -82,14 +82,14 @@ js-sys = { version = "0.3" }
[dependencies.naga]
git = "https://github.com/gfx-rs/naga"
rev = "c0b7ac7"
rev = "a1840be"
#version = "0.8"
# DEV dependencies
[dev-dependencies.naga]
git = "https://github.com/gfx-rs/naga"
rev = "c0b7ac7"
rev = "a1840be"
#version = "0.8"
features = ["wgsl-in"]

1
wgpu-hal/src/gles/device.rs
View File

@ -858,6 +858,7 @@ impl crate::Device<super::Api> for super::Device {
version: self.shared.shading_language_version,
writer_flags,
binding_map,
push_constant_binding: 0, //TODO?
},
})
}

2
wgpu-hal/src/metal/device.rs
View File

@ -117,7 +117,7 @@ impl super::Device {
let mut immutable_buffer_mask = 0;
for (var_handle, var) in module.global_variables.iter() {
if var.class == naga::StorageClass::WorkGroup {
let size = module.types[var.ty].inner.span(&module.constants);
let size = module.types[var.ty].inner.size(&module.constants);
wg_memory_sizes.push(size);
}

6
wgpu/Cargo.toml
View File

@ -136,20 +136,20 @@ env_logger = "0.8"
[dependencies.naga]
git = "https://github.com/gfx-rs/naga"
rev = "c0b7ac7"
rev = "a1840be"
#version = "0.8"
optional = true
# used to test all the example shaders
[dev-dependencies.naga]
git = "https://github.com/gfx-rs/naga"
rev = "c0b7ac7"
rev = "a1840be"
#version = "0.8"
features = ["wgsl-in"]
[target.'cfg(target_arch = "wasm32")'.dependencies.naga]
git = "https://github.com/gfx-rs/naga"
rev = "c0b7ac7"
rev = "a1840be"
#version = "0.8"
features = ["wgsl-out"]