From e7fc8e64f2f23397b149217ecce6e123c5aa5092 Mon Sep 17 00:00:00 2001 From: Xiaopeng Li Date: Thu, 27 Oct 2022 15:28:46 +0800 Subject: [PATCH] Fix textureGather compatibility on macOS 10.13 (#2104) * Fix textureGather compatibility on macOS 10.13 * Fix tests * Update src/back/msl/writer.rs Co-authored-by: Teodor Tanasoaia <28601907+teoxoy@users.noreply.github.com> Co-authored-by: Jet Spark Co-authored-by: Teodor Tanasoaia <28601907+teoxoy@users.noreply.github.com> --- src/back/msl/writer.rs | 2 +- tests/out/msl/image.msl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/back/msl/writer.rs b/src/back/msl/writer.rs index a832c348ab..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, ", int2(0)")?; + write!(self.out, ", {}::int2(0)", NAMESPACE)?; } let letter = ['x', 'y', 'z', 'w'][component as usize]; write!(self.out, ", {}::component::{}", NAMESPACE, letter)?; 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_);