diff --git a/naga/src/back/msl/writer.rs b/naga/src/back/msl/writer.rs index de6db2d0f..78a7e0ab7 100644 --- a/naga/src/back/msl/writer.rs +++ b/naga/src/back/msl/writer.rs @@ -4957,6 +4957,7 @@ template &mut self, level: back::Level, sampler: &sm::InlineSampler, + options: &Options, ) -> BackendResult { for (&letter, address) in ['s', 't', 'r'].iter().zip(sampler.address.iter()) { writeln!( @@ -5001,17 +5002,26 @@ template sampler.border_color.as_str(), )?; } - //TODO: I'm not able to feed this in a way that MSL likes: - //>error: use of undeclared identifier 'lod_clamp' - //>error: no member named 'max_anisotropy' in namespace 'metal' - if false { + + if options.lang_version >= (1, 2) { if let Some(ref lod) = sampler.lod_clamp { - writeln!(self.out, "{}lod_clamp({},{}),", level, lod.start, lod.end,)?; + writeln!( + self.out, + "{}{}::lod_clamp({},{}),", + level, NAMESPACE, lod.start, lod.end, + )?; } if let Some(aniso) = sampler.max_anisotropy { - writeln!(self.out, "{}max_anisotropy({}),", level, aniso.get(),)?; + writeln!( + self.out, + "{}{}::max_anisotropy({}),", + level, + NAMESPACE, + aniso.get(), + )?; } } + if sampler.compare_func != sm::CompareFunc::Never { writeln!( self.out, @@ -8119,7 +8129,7 @@ template NAMESPACE, name )?; - self.put_inline_sampler_properties(back::Level(2), sampler)?; + self.put_inline_sampler_properties(back::Level(2), sampler, options)?; writeln!(self.out, "{});", back::INDENT)?; } else if let crate::TypeInner::Image { class: crate::ImageClass::External, diff --git a/naga/tests/out/msl/wgsl-skybox.metal b/naga/tests/out/msl/wgsl-skybox.metal index d0dbe5e07..88ffea890 100644 --- a/naga/tests/out/msl/wgsl-skybox.metal +++ b/naga/tests/out/msl/wgsl-skybox.metal @@ -62,6 +62,8 @@ fragment fs_mainOutput fs_main( metal::r_address::clamp_to_edge, metal::mag_filter::linear, metal::min_filter::linear, + metal::lod_clamp(0.5,10), + metal::max_anisotropy(8), metal::coord::normalized ); const VertexOutput in = { position, varyings_1.uv };