Skip to content

Commit

Permalink
Update naga to 0.11.0@git:4b796b157cb2b67b0ab166a2238fe4e9473bfd52 (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
nical authored Feb 3, 2023
1 parent 42b48ec commit 6399dd4
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 14 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.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ version = "0.15"

[workspace.dependencies.naga]
git = "https://github.com/gfx-rs/naga"
rev = "f0edae8"
version = "0.11"
rev = "4b796b157cb2b67b0ab166a2238fe4e9473bfd52"
version = "0.11.0"

[workspace.dependencies]
arrayvec = "0.7"
Expand Down
4 changes: 2 additions & 2 deletions wgpu-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ thiserror = "1"

[dependencies.naga]
git = "https://github.com/gfx-rs/naga"
rev = "f0edae8"
version = "0.11"
rev = "4b796b157cb2b67b0ab166a2238fe4e9473bfd52"
version = "0.11.0"
features = ["clone", "span", "validate"]

[dependencies.wgt]
Expand Down
8 changes: 4 additions & 4 deletions wgpu-hal/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -114,15 +114,15 @@ android_system_properties = "0.1.1"

[dependencies.naga]
git = "https://github.com/gfx-rs/naga"
rev = "f0edae8"
version = "0.11"
rev = "4b796b157cb2b67b0ab166a2238fe4e9473bfd52"
version = "0.11.0"
features = ["clone"]

# DEV dependencies
[dev-dependencies.naga]
git = "https://github.com/gfx-rs/naga"
rev = "f0edae8"
version = "0.11"
rev = "4b796b157cb2b67b0ab166a2238fe4e9473bfd52"
version = "0.11.0"
features = ["wgsl-in"]

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion wgpu-hal/examples/halmark/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ impl<A: hal::Api> Example<A> {
.join("halmark")
.join("shader.wgsl");
let source = std::fs::read_to_string(shader_file).unwrap();
let module = naga::front::wgsl::Parser::new().parse(&source).unwrap();
let module = naga::front::wgsl::Frontend::new().parse(&source).unwrap();
let info = naga::valid::Validator::new(
naga::valid::ValidationFlags::all(),
naga::valid::Capabilities::empty(),
Expand Down
4 changes: 2 additions & 2 deletions wgpu/src/backend/direct.rs
Original file line number Diff line number Diff line change
Expand Up @@ -869,7 +869,7 @@ impl crate::Context for Context {
strict_capabilities: true,
block_ctx_dump_prefix: None,
};
let parser = naga::front::spv::Parser::new(spv.iter().cloned(), &options);
let parser = naga::front::spv::Frontend::new(spv.iter().cloned(), &options);
let module = parser.parse().unwrap();
wgc::pipeline::ShaderModuleSource::Naga(Owned(module))
}
Expand All @@ -884,7 +884,7 @@ impl crate::Context for Context {
stage,
defines: defines.clone(),
};
let mut parser = naga::front::glsl::Parser::default();
let mut parser = naga::front::glsl::Frontend::default();
let module = parser.parse(&options, shader).unwrap();

wgc::pipeline::ShaderModuleSource::Naga(Owned(module))
Expand Down
4 changes: 2 additions & 2 deletions wgpu/src/backend/web.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1175,7 +1175,7 @@ impl crate::context::Context for Context {
strict_capabilities: true,
block_ctx_dump_prefix: None,
};
let spv_parser = front::spv::Parser::new(spv.iter().cloned(), &options);
let spv_parser = front::spv::Frontend::new(spv.iter().cloned(), &options);
let spv_module = spv_parser.parse().unwrap();

let mut validator = valid::Validator::new(
Expand All @@ -1202,7 +1202,7 @@ impl crate::context::Context for Context {
stage,
defines: defines.clone(),
};
let mut parser = front::glsl::Parser::default();
let mut parser = front::glsl::Frontend::default();
let glsl_module = parser.parse(&options, shader).unwrap();

let mut validator = valid::Validator::new(
Expand Down

0 comments on commit 6399dd4

Please sign in to comment.