Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Naga b209d911 (2022-9-1). #3008

Merged
merged 1 commit into from
Sep 2, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,11 @@ the same every time it is rendered, we now warn if it is missing.
- Add the missing `msg_send![view, retain]` call within `from_view` by @jinleili in [#2976](https://github.com/gfx-rs/wgpu/pull/2976)

#### Vulkan

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

### Changes

Expand Down
3 changes: 1 addition & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions wgpu-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ smallvec = "1"
thiserror = "1"

[dependencies.naga]
#git = "https://github.com/gfx-rs/naga"
#rev = "27d38aae"
git = "https://github.com/gfx-rs/naga"
rev = "b209d911"
version = "0.9"
jimblandy marked this conversation as resolved.
Show resolved Hide resolved
features = ["span", "validate", "wgsl-in"]

Expand Down
9 changes: 4 additions & 5 deletions wgpu-hal/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -95,16 +95,15 @@ js-sys = { version = "0.3" }
android_system_properties = "0.1.1"

[dependencies.naga]
#git = "https://github.com/gfx-rs/naga"
#rev = "27d38aae"
git = "https://github.com/gfx-rs/naga"
rev = "b209d911"
version = "0.9"

# DEV dependencies

[dev-dependencies.naga]
#git = "https://github.com/gfx-rs/naga"
#rev = "27d38aae"
version = "0.9"
git = "https://github.com/gfx-rs/naga"
rev = "b209d911"
features = ["wgsl-in"]

[dev-dependencies]
Expand Down
1 change: 1 addition & 0 deletions wgpu-hal/src/dx12/device.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1061,6 +1061,7 @@ impl crate::Device<super::Api> for super::Device {
binding_map,
fake_missing_bindings: false,
special_constants_binding,
push_constants_target: None,
},
})
}
Expand Down
12 changes: 6 additions & 6 deletions wgpu/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -139,21 +139,21 @@ pollster = "0.2"
env_logger = "0.9"

[dependencies.naga]
#git = "https://github.com/gfx-rs/naga"
#rev = "27d38aae"
git = "https://github.com/gfx-rs/naga"
rev = "b209d911"
version = "0.9"
optional = true

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

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

Expand Down
18 changes: 2 additions & 16 deletions wgpu/tests/shader_primitive_index/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,7 @@ fn draw() {
initialize_test(
TestParameters::default()
.test_features_limits()
.features(wgpu::Features::SHADER_PRIMITIVE_INDEX)
// https://github.com/gfx-rs/wgpu/issues/2751
.specific_failure(
jimblandy marked this conversation as resolved.
Show resolved Hide resolved
Some(wgt::Backends::VULKAN),
Some(0x1002), // AMD
Some("AMD RADV"),
false,
),
.features(wgpu::Features::SHADER_PRIMITIVE_INDEX),
|ctx| {
pulling_common(ctx, &expected, |rpass| {
rpass.draw(0..6, 0..1);
Expand All @@ -82,14 +75,7 @@ fn draw_indexed() {
initialize_test(
TestParameters::default()
.test_features_limits()
.features(wgpu::Features::SHADER_PRIMITIVE_INDEX)
// https://github.com/gfx-rs/wgpu/issues/2751
.specific_failure(
Some(wgt::Backends::VULKAN),
Some(0x1002), // AMD
Some("AMD RADV"),
false,
),
.features(wgpu::Features::SHADER_PRIMITIVE_INDEX),
|ctx| {
pulling_common(ctx, &expected, |rpass| {
rpass.draw_indexed(0..6, 0, 0..1);
Expand Down