diff --git a/Cargo.lock b/Cargo.lock index 96327702b..797d1f16e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -964,7 +964,7 @@ dependencies = [ [[package]] name = "naga" version = "0.5.0" -source = "git+https://github.com/gfx-rs/naga?rev=300039e#300039e24703bc823cc932985947dfda66616e1e" +source = "git+https://github.com/gfx-rs/naga?rev=1907a92#1907a92928933f312da10daad85bdc6de7d5f9a9" dependencies = [ "bit-set", "bitflags", @@ -1447,18 +1447,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "serde" -version = "1.0.126" +version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03" +checksum = "f03b9878abf6d14e6779d3f24f07b2cfa90352cfec4acc5aab8f1ac7f146fae8" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.126" +version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43" +checksum = "a024926d3432516606328597e0f224a51355a493b49fdd67e9209187cbe55ecc" dependencies = [ "proc-macro2", "quote", diff --git a/player/tests/data/clear-buffer-image.ron b/player/tests/data/clear-buffer-image.ron index 9cd31b837..f7ac513be 100644 --- a/player/tests/data/clear-buffer-image.ron +++ b/player/tests/data/clear-buffer-image.ron @@ -1,5 +1,5 @@ ( - features: (bits: 0x0000_0004_0000_0000), + features: (bits: 0x0000_0008_0000_0000), expectations: [ ( name: "Quad", diff --git a/wgpu-core/Cargo.toml b/wgpu-core/Cargo.toml index 36c23b6eb..a3aa17971 100644 --- a/wgpu-core/Cargo.toml +++ b/wgpu-core/Cargo.toml @@ -36,7 +36,7 @@ thiserror = "1" [dependencies.naga] git = "https://github.com/gfx-rs/naga" -rev = "300039e" +rev = "1907a92" features = ["wgsl-in"] [dependencies.wgt] diff --git a/wgpu-core/src/validation.rs b/wgpu-core/src/validation.rs index 6c5e72e8b..fb772489b 100644 --- a/wgpu-core/src/validation.rs +++ b/wgpu-core/src/validation.rs @@ -853,12 +853,15 @@ impl Interface { continue; } }; - let handle = resources.append(Resource { - name: var.name.clone(), - bind, - ty, - class: var.class, - }); + let handle = resources.append( + Resource { + name: var.name.clone(), + bind, + ty, + class: var.class, + }, + Default::default(), + ); resource_mapping.insert(var_handle, handle); } diff --git a/wgpu-hal/Cargo.toml b/wgpu-hal/Cargo.toml index 858395a7f..d4978df21 100644 --- a/wgpu-hal/Cargo.toml +++ b/wgpu-hal/Cargo.toml @@ -65,11 +65,11 @@ core-graphics-types = "0.1" [dependencies.naga] git = "https://github.com/gfx-rs/naga" -rev = "300039e" +rev = "1907a92" [dev-dependencies.naga] git = "https://github.com/gfx-rs/naga" -rev = "300039e" +rev = "1907a92" features = ["wgsl-in"] [dev-dependencies] diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml index b9669c299..c905276f2 100644 --- a/wgpu/Cargo.toml +++ b/wgpu/Cargo.toml @@ -75,13 +75,13 @@ env_logger = "0.8" [dependencies.naga] git = "https://github.com/gfx-rs/naga" -rev = "300039e" +rev = "1907a92" optional = true # used to test all the example shaders [dev-dependencies.naga] git = "https://github.com/gfx-rs/naga" -rev = "300039e" +rev = "1907a92" features = ["wgsl-in"] [[example]]