support msl-out with no-std

brody4hire · Jan 20, 2025 · db87671 · db87671
1 parent 3a62d43
commit db87671
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -307,7 +307,7 @@ jobs:
           # Check wgpu-types with all features except "std".
           cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p wgpu-types --no-default-features --features strict_asserts,fragile-send-sync-non-atomic-wasm,serde,counters
           # Check naga with all features possible for no-std.
-          cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p naga --no-default-features --features dot-out,glsl-out
+          cargo clippy --target ${{ matrix.target }} ${{ matrix.extra-flags }} -p naga --no-default-features --features dot-out,glsl-out,msl-out
 
       # Building for native platforms with standard tests.
       - name: check native

diff --git a/naga/src/back/msl/mod.rs b/naga/src/back/msl/mod.rs
@@ -31,7 +31,11 @@ holding the result.
 
 */
 
+#[cfg(not(feature = "std"))]
+use crate::aliases::*;
+
 use crate::{arena::Handle, proc::index, valid::ModuleInfo};
+
 use std::fmt::{Error as FmtError, Write};
 
 mod keywords;

diff --git a/naga/src/back/msl/sampler.rs b/naga/src/back/msl/sampler.rs
@@ -1,7 +1,11 @@
+#[cfg(not(feature = "std"))]
+use crate::aliases::*;
+
 #[cfg(feature = "deserialize")]
 use serde::Deserialize;
 #[cfg(feature = "serialize")]
 use serde::Serialize;
+
 use std::{num::NonZeroU32, ops::Range};
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]

diff --git a/naga/src/back/msl/writer.rs b/naga/src/back/msl/writer.rs
@@ -1,11 +1,21 @@
 use super::{sampler as sm, Error, LocationMode, Options, PipelineOptions, TranslationInfo};
+
+#[cfg(not(feature = "std"))]
+use crate::aliases::*;
+
+// XXX TBD ??? ??? - IGNORING unused_imports warning HERE - XXX TBD COMBINE WITH ALIASES ???
+#[allow(unused_imports)]
+#[cfg(not(feature = "std"))]
+use num_traits::real::*;
+
 use crate::{
     arena::{Handle, HandleSet},
     back::{self, Baked},
     proc::index,
     proc::{self, NameKey, TypeResolution},
     valid, FastHashMap, FastHashSet,
 };
+
 #[cfg(test)]
 use std::ptr;
 use std::{