birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix reference to temporary (#2312)

Browse Source 
* 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>
This commit is contained in:
Esteban Papp
2021-07-21 11:00:45 -07:00
committed by GitHub
parent b198d653c1
commit de54731282
3 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Tools/AssetProcessor/native/InternalBuilders/SettingsRegistryBuilder.cpp
+1 -1
View File
@@ -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++),
Gems/Atom/RHI/Metal/Code/Source/RHI/Conversions.cpp
+20 -19
View File
@@ -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;
Gems/Atom/RHI/Metal/Code/Source/RHI/Metal.h
+1
View File
@@ -9,6 +9,7 @@
#include <stdint.h>
#include <Metal_Traits_Platform.h>
#include <Metal/Metal.h>
namespace AZ
{