From 859cbeceb4cecf3a0b5dbf595247877f56bd1841 Mon Sep 17 00:00:00 2001 From: Jet Spark Date: Wed, 26 Oct 2022 18:39:13 +0800 Subject: [PATCH 1/3] Fix textureGather compatibility on macOS 10.13 --- src/back/msl/writer.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/back/msl/writer.rs b/src/back/msl/writer.rs index a832c348ab..c1e21efb70 100644 --- a/src/back/msl/writer.rs +++ b/src/back/msl/writer.rs @@ -1440,7 +1440,7 @@ impl Writer { // Offset always comes before the gather, except // in cube maps where it's not applicable if offset.is_none() && !is_cube_map { - write!(self.out, ", int2(0)")?; + write!(self.out, ", metal::int2(0)")?; } let letter = ['x', 'y', 'z', 'w'][component as usize]; write!(self.out, ", {}::component::{}", NAMESPACE, letter)?; From db24abf1f4916f0c4efc886163704828b075f7e2 Mon Sep 17 00:00:00 2001 From: Jet Spark Date: Wed, 26 Oct 2022 19:39:17 +0800 Subject: [PATCH 2/3] Fix tests --- tests/out/msl/image.msl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/out/msl/image.msl b/tests/out/msl/image.msl index 16839dfbe7..df247be4f1 100644 --- a/tests/out/msl/image.msl +++ b/tests/out/msl/image.msl @@ -144,7 +144,7 @@ fragment gatherOutput gather( , metal::depth2d image_2d_depth [[user(fake0)]] ) { metal::float2 tc_2 = metal::float2(0.5); - metal::float4 s2d_1 = image_2d.gather(sampler_reg, tc_2, int2(0), metal::component::y); + metal::float4 s2d_1 = image_2d.gather(sampler_reg, tc_2, metal::int2(0), metal::component::y); metal::float4 s2d_offset_1 = image_2d.gather(sampler_reg, tc_2, const_type_9_, metal::component::w); metal::float4 s2d_depth_1 = image_2d_depth.gather_compare(sampler_cmp, tc_2, 0.5); metal::float4 s2d_depth_offset = image_2d_depth.gather_compare(sampler_cmp, tc_2, 0.5, const_type_9_); From a3c8b5be9cc9e585fb46e1a2db3ed297803ef492 Mon Sep 17 00:00:00 2001 From: Xiaopeng Li Date: Thu, 27 Oct 2022 12:06:02 +0800 Subject: [PATCH 3/3] Update src/back/msl/writer.rs Co-authored-by: Teodor Tanasoaia <28601907+teoxoy@users.noreply.github.com> --- src/back/msl/writer.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/back/msl/writer.rs b/src/back/msl/writer.rs index c1e21efb70..9147fbe398 100644 --- a/src/back/msl/writer.rs +++ b/src/back/msl/writer.rs @@ -1440,7 +1440,7 @@ impl Writer { // Offset always comes before the gather, except // in cube maps where it's not applicable if offset.is_none() && !is_cube_map { - write!(self.out, ", metal::int2(0)")?; + write!(self.out, ", {}::int2(0)", NAMESPACE)?; } let letter = ['x', 'y', 'z', 'w'][component as usize]; write!(self.out, ", {}::component::{}", NAMESPACE, letter)?;