Skip to content

Commit

Permalink
set the new naga Capabilities::CUBE_ARRAY_TEXTURES
Browse files Browse the repository at this point in the history
  • Loading branch information
teoxoy committed Oct 18, 2023
1 parent 3e307a8 commit ecb8961
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ version = "0.17"

[workspace.dependencies.naga]
git = "https://github.com/gfx-rs/naga"
rev = "6854b0ab4f105131bfb87704927abec3fe366ef9"
rev = "e25280df9316434ef7752970016d01a3aede3f17"
version = "0.13.0"

[workspace.dependencies]
Expand Down
2 changes: 1 addition & 1 deletion wgpu-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ thiserror = "1"

[dependencies.naga]
git = "https://github.com/gfx-rs/naga"
rev = "6854b0ab4f105131bfb87704927abec3fe366ef9"
rev = "e25280df9316434ef7752970016d01a3aede3f17"
version = "0.13.0"
features = ["clone", "span", "validate"]

Expand Down
6 changes: 6 additions & 0 deletions wgpu-core/src/device/resource.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1301,6 +1301,12 @@ impl<A: HalApi> Device<A> {
Caps::DUAL_SOURCE_BLENDING,
self.features.contains(wgt::Features::DUAL_SOURCE_BLENDING),
);
caps.set(
Caps::CUBE_ARRAY_TEXTURES,
self.downlevel
.flags
.contains(wgt::DownlevelFlags::CUBE_ARRAY_TEXTURES),
);

let info = naga::valid::Validator::new(naga::valid::ValidationFlags::all(), caps)
.validate(&module)
Expand Down
4 changes: 2 additions & 2 deletions wgpu-hal/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -120,14 +120,14 @@ android_system_properties = "0.1.1"

[dependencies.naga]
git = "https://github.com/gfx-rs/naga"
rev = "6854b0ab4f105131bfb87704927abec3fe366ef9"
rev = "e25280df9316434ef7752970016d01a3aede3f17"
version = "0.13.0"
features = ["clone"]

# DEV dependencies
[dev-dependencies.naga]
git = "https://github.com/gfx-rs/naga"
rev = "6854b0ab4f105131bfb87704927abec3fe366ef9"
rev = "e25280df9316434ef7752970016d01a3aede3f17"
version = "0.13.0"
features = ["wgsl-in"]

Expand Down

0 comments on commit ecb8961

Please sign in to comment.