From 640bfb1f269f43eac7d899376137d422bd8cda0e Mon Sep 17 00:00:00 2001 From: Ashley Date: Sun, 11 Apr 2021 20:21:47 +0200 Subject: [PATCH] [Metal] Make constant composites non-`constexpr` (#707) * Make constant composites non-constexpr * Update shadow test --- src/back/msl/writer.rs | 2 +- tests/out/shadow.msl.snap | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/back/msl/writer.rs b/src/back/msl/writer.rs index 1ad74a0feb..a2648165ed 100644 --- a/src/back/msl/writer.rs +++ b/src/back/msl/writer.rs @@ -1531,7 +1531,7 @@ impl Writer { access: crate::StorageAccess::empty(), first_time: false, }; - write!(self.out, "constexpr constant {} {} = {{", ty_name, name,)?; + write!(self.out, "constant {} {} = {{", ty_name, name,)?; for (i, &sub_handle) in components.iter().enumerate() { let separator = if i != 0 { ", " } else { "" }; let coco = ConstantContext { diff --git a/tests/out/shadow.msl.snap b/tests/out/shadow.msl.snap index 9d4e2b3af6..92cd9e83da 100644 --- a/tests/out/shadow.msl.snap +++ b/tests/out/shadow.msl.snap @@ -18,7 +18,7 @@ typedef Light type3[1]; struct Lights { type3 data; }; -constexpr constant metal::float3 c_ambient = {0.05, 0.05, 0.05}; +constant metal::float3 c_ambient = {0.05, 0.05, 0.05}; float fetch_shadow( metal::uint light_id,