diff --git a/Cargo.toml b/Cargo.toml index 909d6b11..15118fb3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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"] } diff --git a/blade-graphics/Cargo.toml b/blade-graphics/Cargo.toml index 989c1119..d4457a6e 100644 --- a/blade-graphics/Cargo.toml +++ b/blade-graphics/Cargo.toml @@ -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] diff --git a/blade-graphics/src/metal/pipeline.rs b/blade-graphics/src/metal/pipeline.rs index 4fbc12c5..39f4dc8d 100644 --- a/blade-graphics/src/metal/pipeline.rs +++ b/blade-graphics/src/metal/pipeline.rs @@ -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(); diff --git a/blade-render/code/blur.wgsl b/blade-render/code/blur.wgsl index 6f01c59e..3207ef60 100644 --- a/blade-render/code/blur.wgsl +++ b/blade-render/code/blur.wgsl @@ -138,7 +138,7 @@ fn atrous3x3(@builtin(global_invocation_id) global_id: vec3) { for (var yy=-1; yy<=1; yy+=1) { for (var xx=-1; xx<=1; xx+=1) { - let p = center + vec2(xx, yy) * (1 << params.iteration); + let p = center + vec2(xx, yy) * (1i << params.iteration); if (all(p == center) || any(p < vec2(0)) || any(p >= params.extent)) { continue; }