From 3be4e50b78245f2dd59f94d14e5f23d2c72c550f Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Mon, 27 Feb 2023 22:57:42 +0100 Subject: [PATCH] Amr64 on mac impl progress --- Source/Engine/Platform/Mac/MacDefines.h | 1 - Source/Engine/Platform/Mac/MacPlatform.h | 8 ++------ Source/Tools/Flax.Build/Build/GameTarget.cs | 1 + 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Source/Engine/Platform/Mac/MacDefines.h b/Source/Engine/Platform/Mac/MacDefines.h index a10dda524..615e7065e 100644 --- a/Source/Engine/Platform/Mac/MacDefines.h +++ b/Source/Engine/Platform/Mac/MacDefines.h @@ -13,7 +13,6 @@ #define PLATFORM_ARCH_ARM64 1 #define PLATFORM_ARCH ArchitectureType::ARM64 #else -sss; #define PLATFORM_64BITS 1 #define PLATFORM_ARCH_X64 1 #define PLATFORM_ARCH ArchitectureType::x64 diff --git a/Source/Engine/Platform/Mac/MacPlatform.h b/Source/Engine/Platform/Mac/MacPlatform.h index 47e8f17f3..6a195a489 100644 --- a/Source/Engine/Platform/Mac/MacPlatform.h +++ b/Source/Engine/Platform/Mac/MacPlatform.h @@ -44,15 +44,11 @@ public: } FORCE_INLINE static int32 AtomicRead(int32 volatile* dst) { - int32 result; - __atomic_load(dst, &result, __ATOMIC_SEQ_CST); - return result; + return __atomic_load_n(dst, __ATOMIC_SEQ_CST); } FORCE_INLINE static int64 AtomicRead(int64 volatile* dst) { - int64 result; - __atomic_load(dst, &result, __ATOMIC_SEQ_CST); - return result; + return __atomic_load_n(dst, __ATOMIC_SEQ_CST); } FORCE_INLINE static void AtomicStore(int32 volatile* dst, int32 value) { diff --git a/Source/Tools/Flax.Build/Build/GameTarget.cs b/Source/Tools/Flax.Build/Build/GameTarget.cs index 6edc1576c..a9f044e20 100644 --- a/Source/Tools/Flax.Build/Build/GameTarget.cs +++ b/Source/Tools/Flax.Build/Build/GameTarget.cs @@ -47,6 +47,7 @@ namespace Flax.Build Architectures = new[] { TargetArchitecture.x64, + TargetArchitecture.ARM64, }; ConfigurationName = "Editor"; GlobalDefinitions.Add("USE_EDITOR");