From de547312820dc4d1e91134768a0c073369181edc Mon Sep 17 00:00:00 2001
From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
Date: Wed, 21 Jul 2021 11:00:45 -0700
Subject: [PATCH] fix reference to temporary (#2312)

* fix reference to temporary

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Non-unity fixes for mac

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
---
 .../SettingsRegistryBuilder.cpp               |  2 +-
 .../RHI/Metal/Code/Source/RHI/Conversions.cpp | 39 ++++++++++---------
 Gems/Atom/RHI/Metal/Code/Source/RHI/Metal.h   |  1 +
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/Code/Tools/AssetProcessor/native/InternalBuilders/SettingsRegistryBuilder.cpp b/Code/Tools/AssetProcessor/native/InternalBuilders/SettingsRegistryBuilder.cpp
index f808850ad7..9781c200fd 100644
--- a/Code/Tools/AssetProcessor/native/InternalBuilders/SettingsRegistryBuilder.cpp
+++ b/Code/Tools/AssetProcessor/native/InternalBuilders/SettingsRegistryBuilder.cpp
@@ -315,7 +315,7 @@ namespace AssetProcessor
                             }
                         }
 
-                        for (const AZ::IO::Path& sourcePath : sourcePaths)
+                        for (const AZ::IO::PathView& sourcePath : sourcePaths)
                         {
                             // Use JSON Pointer to append elements to the SourcePaths array
                             registry.Set(FixedValueString::format("%s/SourcePaths/%zu", PlaceholderGemKey.c_str(), pathIndex++),
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/Conversions.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/Conversions.cpp
index e18b94bfba..fce4db364f 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Conversions.cpp
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Conversions.cpp
@@ -780,7 +780,25 @@ namespace AZ
             };
             return table[static_cast<uint32_t>(func)];
         }
-        
+
+#if AZ_TRAIT_ATOM_METAL_SAMPLER_BORDERCOLOR_SUPPORT
+    MTLSamplerBorderColor ConvertBorderColor(RHI::BorderColor color)
+    {
+        switch (color)
+        {
+            case RHI::BorderColor::OpaqueBlack:
+                return MTLSamplerBorderColorOpaqueBlack;
+            case RHI::BorderColor::TransparentBlack:
+                return MTLSamplerBorderColorTransparentBlack;
+            case RHI::BorderColor::OpaqueWhite:
+                return MTLSamplerBorderColorOpaqueWhite;
+            default:
+                AZ_Assert(false, "Unsupported Border Color");
+        }
+        return MTLSamplerBorderColorOpaqueBlack;
+    }
+#endif
+
         void ConvertSamplerState(const RHI::SamplerState& state, MTLSamplerDescriptor* samplerDesc)
         {
             samplerDesc.sAddressMode = ConvertAddressMode(state.m_addressU);
@@ -948,24 +966,7 @@ namespace AZ
                     return false;
             }
         }
-    
-#if AZ_TRAIT_ATOM_METAL_SAMPLER_BORDERCOLOR_SUPPORT
-        MTLSamplerBorderColor ConvertBorderColor(RHI::BorderColor color)
-        {
-            switch (color)
-            {
-                case RHI::BorderColor::OpaqueBlack:
-                    return MTLSamplerBorderColorOpaqueBlack;
-                case RHI::BorderColor::TransparentBlack:
-                    return MTLSamplerBorderColorTransparentBlack;
-                case RHI::BorderColor::OpaqueWhite:
-                    return MTLSamplerBorderColorOpaqueWhite;
-                default:
-                    AZ_Assert(false, "Unsupported Border Color");
-            }
-            return MTLSamplerBorderColorOpaqueBlack;            
-        }
-#endif
+
         void ConvertImageArgumentDescriptor(MTLArgumentDescriptor* imgArgDescriptor, const RHI::ShaderInputImageDescriptor& shaderInputImage)
         {
             imgArgDescriptor.dataType = MTLDataTypeTexture;
diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/Metal.h b/Gems/Atom/RHI/Metal/Code/Source/RHI/Metal.h
index 85fb9bb00a..ff3cd62bde 100644
--- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Metal.h
+++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Metal.h
@@ -9,6 +9,7 @@
 
 #include <stdint.h>
 #include <Metal_Traits_Platform.h>
+#include <Metal/Metal.h>
 
 namespace AZ
 {