Merge branch 'development' into redcode/crythread-2nd-pass

Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>

Code/Framework/AzFramework/Platform/Mac/AzFramework/Windowing/NativeWindow_Mac.mm

@@ -34,7 +34,7 @@ namespace AzFramework
         bool GetFullScreenState() const override;
         void SetFullScreenState(bool fullScreenState) override;
         bool CanToggleFullScreenState() const override { return true; }
-        uint32_t GetMainDisplayRefreshRate() const override;
+        uint32_t GetMainDisplayRefreshRate() const;
 
     private:
         static NSWindowStyleMask ConvertToNSWindowStyleMask(const WindowStyleMasks& styleMasks);

Code/Framework/AzFramework/Platform/iOS/AzFramework/Windowing/NativeWindow_ios.mm

@@ -27,7 +27,7 @@ namespace AzFramework
                         const WindowGeometry& geometry,
                         const WindowStyleMasks& styleMasks) override;
         NativeWindowHandle GetWindowHandle() const override;
-        uint32_t GetMainDisplayRefreshRate() const override;
+        uint32_t GetMainDisplayRefreshRate() const;
         
     private:
         UIWindow* m_nativeWindow;

Code/LauncherUnified/Platform/Mac/Launcher_Mac.mm

@@ -10,6 +10,7 @@
 #include <O3DEApplication_Mac.h>
 #include <../Common/Apple/Launcher_Apple.h>
 #include <../Common/UnixLike/Launcher_UnixLike.h>
+#include <AzCore/Math/Vector2.h>
 
 #include <AzCore/Math/Vector2.h>
 

Code/Legacy/CryCommon/AppleSpecific.h

@@ -226,6 +226,21 @@ typedef uint64 __uint64;
 
 #define _PTRDIFF_T_DEFINED 1
 
+typedef union _LARGE_INTEGER
+{
+    struct
+    {
+        DWORD LowPart;
+        LONG HighPart;
+    };
+    struct
+    {
+        DWORD LowPart;
+        LONG HighPart;
+    } u;
+    long long QuadPart;
+} LARGE_INTEGER;
+
 #define _A_RDONLY       (0x01)    /* Read only file */
 #define _A_HIDDEN (0x02)    /* Hidden file */
 #define _A_SUBDIR       (0x10)    /* Subdirectory */

Code/Legacy/CryCommon/MacSpecific.h

@@ -26,4 +26,6 @@
 
 typedef uint64_t threadID;
 
+#define VK_CONTROL  0
+
 #endif // CRYINCLUDE_CRYCOMMON_MACSPECIFIC_H

Code/Tools/TestImpactFramework/Runtime/Code/Source/Process/Scheduler/TestImpactProcessScheduler.cpp

@@ -230,7 +230,7 @@ namespace TestImpact
             processInFlight.m_process = LaunchProcess(AZStd::move(processInfo));
             processInFlight.m_startTime = createTime;
         }
-        catch (ProcessException& e)
+        catch ([[maybe_unused]] ProcessException& e)
         {
             AZ_Warning("ProcessScheduler", false, e.what());
             createResult = LaunchResult::Failure;

Code/Tools/TestImpactFramework/Runtime/Code/Source/TestEngine/Enumeration/TestImpactTestEnumerator.cpp

@@ -169,7 +169,7 @@ namespace TestImpact
                             WriteFileContents<TestEngineException>(SerializeTestEnumeration(enumeration.value()), jobInfo->GetCache()->m_file);
                         }
                     }
-                    catch (const Exception& e)
+                    catch ([[maybe_unused]] const Exception& e)
                     {
                         AZ_Warning("Enumerate", false, e.what());
                         enumerations[jobId] = AZStd::nullopt;

Gems/Atom/RHI/Metal/Code/Source/RHI/SwapChain.cpp

@@ -8,6 +8,7 @@
 
 #include <AzCore/std/string/conversions.h>
 #include <AzCore/std/string/string.h>
+#include <AzFramework/Windowing/WindowBus.h>
 #include <Atom/RHI/CpuProfiler.h>
 #include <RHI/Device.h>
 #include <RHI/Image.h>