From c2b5963b2bc720eceb89c51d10f7825cb2b93af2 Mon Sep 17 00:00:00 2001 From: Ashley Ruglys Date: Fri, 20 May 2022 21:07:30 +0200 Subject: [PATCH 1/3] Add MultiView to SUPPORTED_CAPABILITIES --- src/front/spv/mod.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/front/spv/mod.rs b/src/front/spv/mod.rs index cf4f50d1d7..7e560cfc4a 100644 --- a/src/front/spv/mod.rs +++ b/src/front/spv/mod.rs @@ -71,6 +71,7 @@ pub const SUPPORTED_CAPABILITIES: &[spirv::Capability] = &[ spirv::Capability::Float16, spirv::Capability::Float64, spirv::Capability::Geometry, + spirv::Capability::MultiView, // tricky ones spirv::Capability::UniformBufferArrayDynamicIndexing, spirv::Capability::StorageBufferArrayDynamicIndexing, From 0aaf5ee633162a4db019ba45d102a248c1a4ac20 Mon Sep 17 00:00:00 2001 From: Ashley Ruglys Date: Fri, 20 May 2022 21:11:39 +0200 Subject: [PATCH 2/3] Run cargo fmt --- src/front/wgsl/mod.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/front/wgsl/mod.rs b/src/front/wgsl/mod.rs index 7379b51fd6..94c3510d7f 100644 --- a/src/front/wgsl/mod.rs +++ b/src/front/wgsl/mod.rs @@ -1193,8 +1193,8 @@ impl Composition { #[derive(Default)] struct TypeAttributes { // Although WGSL nas no type attributes at the moment, it had them in the past -// (`[[stride]]`) and may as well acquire some again in the future. -// Therefore, we are leaving the plumbing in for now. + // (`[[stride]]`) and may as well acquire some again in the future. + // Therefore, we are leaving the plumbing in for now. } #[derive(Clone, Debug, PartialEq)] From 00ec360f5cd2519952302119426aff4a0939dad9 Mon Sep 17 00:00:00 2001 From: Ashley Ruglys Date: Fri, 20 May 2022 21:26:34 +0200 Subject: [PATCH 3/3] Fix a broken clippy lint --- src/back/msl/writer.rs | 2 ++ src/back/wgsl/writer.rs | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/back/msl/writer.rs b/src/back/msl/writer.rs index 8294626a80..1d63a07535 100644 --- a/src/back/msl/writer.rs +++ b/src/back/msl/writer.rs @@ -647,6 +647,8 @@ impl Writer { } /// Finishes writing and returns the output. + // See https://github.com/rust-lang/rust-clippy/issues/4979. + #[allow(clippy::missing_const_for_fn)] pub fn finish(self) -> W { self.out } diff --git a/src/back/wgsl/writer.rs b/src/back/wgsl/writer.rs index 487ea40d8a..77ab496cba 100644 --- a/src/back/wgsl/writer.rs +++ b/src/back/wgsl/writer.rs @@ -1859,6 +1859,8 @@ impl Writer { Ok(()) } + // See https://github.com/rust-lang/rust-clippy/issues/4979. + #[allow(clippy::missing_const_for_fn)] pub fn finish(self) -> W { self.out }