Skip to content

Commit 58bc205

Browse files
committed
Update to Naga b209d91 (2022-9-1).
This removes an expected failure on AMD RADV. I guess #2751 was our bug all along.
1 parent 7d138e2 commit 58bc205

File tree

7 files changed

+20
-32
lines changed

7 files changed

+20
-32
lines changed

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,11 @@ the same every time it is rendered, we now warn if it is missing.
7373
- Add the missing `msg_send![view, retain]` call within `from_view` by @jinleili in [#2976](https://github.com/gfx-rs/wgpu/pull/2976)
7474

7575
#### Vulkan
76-
7776
- Fix `astc_hdr` formats support by @jinleili in [#2971]](https://github.com/gfx-rs/wgpu/pull/2971)
77+
- Update to Naga b209d911 (2022-9-1) to avoid generating SPIR-V that
78+
violates Vulkan valid usage rules `VUID-StandaloneSpirv-Flat-06202`
79+
and `VUID-StandaloneSpirv-Flat-04744`. By @jimblandy in
80+
[#3008](https://github.com/gfx-rs/wgpu/pull/3008)
7881

7982
### Changes
8083

Cargo.lock

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wgpu-core/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ smallvec = "1"
4444
thiserror = "1"
4545

4646
[dependencies.naga]
47-
#git = "https://github.com/gfx-rs/naga"
48-
#rev = "27d38aae"
47+
git = "https://github.com/gfx-rs/naga"
48+
rev = "b209d911"
4949
version = "0.9"
5050
features = ["span", "validate", "wgsl-in"]
5151

wgpu-hal/Cargo.toml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,16 +95,15 @@ js-sys = { version = "0.3" }
9595
android_system_properties = "0.1.1"
9696

9797
[dependencies.naga]
98-
#git = "https://github.com/gfx-rs/naga"
99-
#rev = "27d38aae"
98+
git = "https://github.com/gfx-rs/naga"
99+
rev = "b209d911"
100100
version = "0.9"
101101

102102
# DEV dependencies
103103

104104
[dev-dependencies.naga]
105-
#git = "https://github.com/gfx-rs/naga"
106-
#rev = "27d38aae"
107-
version = "0.9"
105+
git = "https://github.com/gfx-rs/naga"
106+
rev = "b209d911"
108107
features = ["wgsl-in"]
109108

110109
[dev-dependencies]

wgpu-hal/src/dx12/device.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1061,6 +1061,7 @@ impl crate::Device<super::Api> for super::Device {
10611061
binding_map,
10621062
fake_missing_bindings: false,
10631063
special_constants_binding,
1064+
push_constants_target: None,
10641065
},
10651066
})
10661067
}

wgpu/Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,21 +139,21 @@ pollster = "0.2"
139139
env_logger = "0.9"
140140

141141
[dependencies.naga]
142-
#git = "https://github.com/gfx-rs/naga"
143-
#rev = "27d38aae"
142+
git = "https://github.com/gfx-rs/naga"
143+
rev = "b209d911"
144144
version = "0.9"
145145
optional = true
146146

147147
# used to test all the example shaders
148148
[dev-dependencies.naga]
149-
#git = "https://github.com/gfx-rs/naga"
150-
#rev = "27d38aae"
149+
git = "https://github.com/gfx-rs/naga"
150+
rev = "b209d911"
151151
version = "0.9"
152152
features = ["wgsl-in"]
153153

154154
[target.'cfg(target_arch = "wasm32")'.dependencies.naga]
155-
#git = "https://github.com/gfx-rs/naga"
156-
#rev = "27d38aae"
155+
git = "https://github.com/gfx-rs/naga"
156+
rev = "b209d911"
157157
version = "0.9"
158158
features = ["wgsl-out"]
159159

wgpu/tests/shader_primitive_index/mod.rs

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,7 @@ fn draw() {
5151
initialize_test(
5252
TestParameters::default()
5353
.test_features_limits()
54-
.features(wgpu::Features::SHADER_PRIMITIVE_INDEX)
55-
// https://github.com/gfx-rs/wgpu/issues/2751
56-
.specific_failure(
57-
Some(wgt::Backends::VULKAN),
58-
Some(0x1002), // AMD
59-
Some("AMD RADV"),
60-
false,
61-
),
54+
.features(wgpu::Features::SHADER_PRIMITIVE_INDEX),
6255
|ctx| {
6356
pulling_common(ctx, &expected, |rpass| {
6457
rpass.draw(0..6, 0..1);
@@ -82,14 +75,7 @@ fn draw_indexed() {
8275
initialize_test(
8376
TestParameters::default()
8477
.test_features_limits()
85-
.features(wgpu::Features::SHADER_PRIMITIVE_INDEX)
86-
// https://github.com/gfx-rs/wgpu/issues/2751
87-
.specific_failure(
88-
Some(wgt::Backends::VULKAN),
89-
Some(0x1002), // AMD
90-
Some("AMD RADV"),
91-
false,
92-
),
78+
.features(wgpu::Features::SHADER_PRIMITIVE_INDEX),
9379
|ctx| {
9480
pulling_common(ctx, &expected, |rpass| {
9581
rpass.draw_indexed(0..6, 0, 0..1);

0 commit comments

Comments
 (0)