encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix MSL invariant translation. 

When `invariant` is enabled on MSL was was incorrectly setting
`@invariant` instead of `[[invariant]]`. We test with metal1.2 which
does not have invariant, so this only showed up when using metal2.1 or
higher.

Bug: chromium:1439273
Change-Id: Iab866608195e697b0370d465f350b25277d904a3
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/128880
Commit-Queue: Ben Clayton <bclayton@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
This commit is contained in:
dan sinclair 2023-04-24 19:41:41 +00:00 committed by Dawn LUCI CQ
parent c5c2fce3ed
commit bdc2d24900
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tint/writer/msl/generator_impl.cc
View File

@ -347,7 +347,7 @@ bool GeneratorImpl::Generate() {
// WGSL can ignore the invariant attribute on pre MSL 2.1 devices. // WGSL can ignore the invariant attribute on pre MSL 2.1 devices.
// See: https://github.com/gpuweb/gpuweb/issues/893#issuecomment-745537465 // See: https://github.com/gpuweb/gpuweb/issues/893#issuecomment-745537465
line(&helpers_) << "#if __METAL_VERSION__ >= 210"; line(&helpers_) << "#if __METAL_VERSION__ >= 210";
line(&helpers_) << "#define " << invariant_define_name_ << " @invariant"; line(&helpers_) << "#define " << invariant_define_name_ << " [[invariant]]";
line(&helpers_) << "#else"; line(&helpers_) << "#else";
line(&helpers_) << "#define " << invariant_define_name_; line(&helpers_) << "#define " << invariant_define_name_;
line(&helpers_) << "#endif"; line(&helpers_) << "#endif";

2
src/tint/writer/msl/generator_impl_test.cc
View File

@ -119,7 +119,7 @@ TEST_F(MslGeneratorImplTest, HasInvariantAttribute_True) {
using namespace metal; using namespace metal;
#if __METAL_VERSION__ >= 210 #if __METAL_VERSION__ >= 210
#define TINT_INVARIANT @invariant #define TINT_INVARIANT [[invariant]]
#else #else
#define TINT_INVARIANT #define TINT_INVARIANT
#endif #endif

2
test/tint/shader_io/invariant.wgsl.expected.msl
View File

@ -3,7 +3,7 @@
using namespace metal; using namespace metal;
#if __METAL_VERSION__ >= 210 #if __METAL_VERSION__ >= 210
#define TINT_INVARIANT @invariant #define TINT_INVARIANT [[invariant]]
#else #else
#define TINT_INVARIANT #define TINT_INVARIANT
#endif #endif

2
test/tint/shader_io/invariant_struct_member.wgsl.expected.msl
View File

@ -3,7 +3,7 @@
using namespace metal; using namespace metal;
#if __METAL_VERSION__ >= 210 #if __METAL_VERSION__ >= 210
#define TINT_INVARIANT @invariant #define TINT_INVARIANT [[invariant]]
#else #else
#define TINT_INVARIANT #define TINT_INVARIANT
#endif #endif