Skip to content

Commit

Permalink
Update naga to latest master 0.20
Browse files Browse the repository at this point in the history
  • Loading branch information
kvark committed Jul 9, 2024
1 parent 37a6ca9 commit 9283d80
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ glam = { version = "0.27", features = ["mint"] }
gltf = { version = "1.1", default-features = false }
log = "0.4"
mint = "0.5"
naga = { version = "0.14", features = ["wgsl-in", "span", "validate"] }
naga = { git = "https://github.com/gfx-rs/wgpu", features = ["wgsl-in"], rev = "425526828f738c95ec50b016c6a761bc00d2fb25" }
profiling = "1"
slab = "0.4"
strum = { version = "0.25", features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion blade-graphics/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ codespan-reporting = "0.11"
hidden-trait = "0.1"
log = { workspace = true }
mint = { workspace = true }
naga = { workspace = true, features = ["clone"] }
naga = { workspace = true }
raw-window-handle = "0.6"

[target.'cfg(any(target_os = "ios", target_os = "macos"))'.dependencies]
Expand Down
2 changes: 2 additions & 0 deletions blade-graphics/src/metal/pipeline.rs
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,8 @@ impl super::Context {

let pipeline_options = msl::PipelineOptions {
allow_and_force_point_size: flags.contains(ShaderFlags::ALLOW_POINT_SIZE),
vertex_pulling_transform: false,
vertex_buffer_mappings: Vec::new(),
};
let (source, info) =
msl::write_string(&module, &sf.shader.info, &naga_options, &pipeline_options).unwrap();
Expand Down
2 changes: 1 addition & 1 deletion blade-render/code/blur.wgsl
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ fn atrous3x3(@builtin(global_invocation_id) global_id: vec3<u32>) {

for (var yy=-1; yy<=1; yy+=1) {
for (var xx=-1; xx<=1; xx+=1) {
let p = center + vec2<i32>(xx, yy) * (1 << params.iteration);
let p = center + vec2<i32>(xx, yy) * (1i << params.iteration);
if (all(p == center) || any(p < vec2<i32>(0)) || any(p >= params.extent)) {
continue;
}
Expand Down

0 comments on commit 9283d80

Please sign in to comment.