From fe72235a7ebca5189cf0dd515a4ac895efaaecc3 Mon Sep 17 00:00:00 2001 From: Brad Werth Date: Mon, 17 Jun 2024 11:06:06 -0700 Subject: [PATCH] Add missing closing parentheses to some msl unpack functions. --- naga/CHANGELOG.md | 1 + naga/src/back/msl/writer.rs | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/naga/CHANGELOG.md b/naga/CHANGELOG.md index d2e0515ebd..2a00f01f86 100644 --- a/naga/CHANGELOG.md +++ b/naga/CHANGELOG.md @@ -80,6 +80,7 @@ For changelogs after v0.14, see [the wgpu changelog](../CHANGELOG.md). - Add and fix minimum Metal version checks for optional functionality. ([#2486](https://github.com/gfx-rs/naga/pull/2486)) **@teoxoy** - Make varyings' struct members unique. ([#2521](https://github.com/gfx-rs/naga/pull/2521)) **@evahop** - Add experimental vertex pulling transform flag. ([#5254](https://github.com/gfx-rs/wgpu/pull/5254)) **@bradwerth** +- Fixup some generated MSL for vertex buffer unpack functions. ([#5829](https://github.com/gfx-rs/wgpu/pull/5829)) **@bradwerth** #### GLSL-OUT diff --git a/naga/src/back/msl/writer.rs b/naga/src/back/msl/writer.rs index 009b57701f..ca5dfbd3c8 100644 --- a/naga/src/back/msl/writer.rs +++ b/naga/src/back/msl/writer.rs @@ -4389,7 +4389,7 @@ impl Writer { writeln!( self.out, "{}return metal::int2(as_type(b3 << 24 | b2 << 16 | b1 << 8 | b0), \ - as_type(b7 << 24 | b6 << 16 | b5 << 8 | b4);", + as_type(b7 << 24 | b6 << 16 | b5 << 8 | b4));", back::INDENT )?; writeln!(self.out, "}}")?; @@ -4416,7 +4416,7 @@ impl Writer { self.out, "{}return metal::int3(as_type(b3 << 24 | b2 << 16 | b1 << 8 | b0), \ as_type(b7 << 24 | b6 << 16 | b5 << 8 | b4), \ - as_type(b11 << 24 | b10 << 16 | b9 << 8 | b8);", + as_type(b11 << 24 | b10 << 16 | b9 << 8 | b8));", back::INDENT )?; writeln!(self.out, "}}")?; @@ -4448,7 +4448,7 @@ impl Writer { "{}return metal::int4(as_type(b3 << 24 | b2 << 16 | b1 << 8 | b0), \ as_type(b7 << 24 | b6 << 16 | b5 << 8 | b4), \ as_type(b11 << 24 | b10 << 16 | b9 << 8 | b8), \ - as_type(b15 << 24 | b14 << 16 | b13 << 8 | b12);", + as_type(b15 << 24 | b14 << 16 | b13 << 8 | b12));", back::INDENT )?; writeln!(self.out, "}}")?;