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

Merge branch 'development' of https://github.com/o3de/o3de into daimini/FocusMode/selection

Browse Source
monroegm-disable-blank-issue-2
Danilo Aimini 4 years ago
parent 3fdf1f052a 8a80b73918
commit 23357b4c93
64 changed files with 52 additions and 75 deletions
Show Stats Download Patch File Download Diff File

6
Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.cpp
Unescape Escape View File

@ -83,6 +83,12 @@ namespace AzToolsFramework::Prefab
bool PrefabFocusHandler::IsOwningPrefabBeingFocused(AZ::EntityId entityId)
{
if (!m_focusedInstance.has_value())
{
// PrefabFocusHandler has not been initialized yet.
return false;
}
if (entityId == AZ::EntityId())
{
return false;

10
Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderBuilderUtility.cpp
Unescape Escape View File

@ -37,6 +37,7 @@
#include <AzslCompiler.h>
#include "ShaderPlatformInterfaceRequest.h"
#include "ShaderBuilder_Traits_Platform.h"
#include "AtomShaderConfig.h"
#include "SrgLayoutUtility.h"
@ -456,8 +457,9 @@ namespace AZ
const uint32_t rhiUniqueIndex, const AZStd::string& platformIdentifier, const AZStd::string& shaderJsonPath,
const uint32_t supervariantIndex, RPI::ShaderAssetSubId shaderAssetSubId)
{
// platform id from identifier
AzFramework::PlatformId platformId = AzFramework::PlatformId::PC;
// Define a fallback platform ID based on the current host platform
AzFramework::PlatformId platformId = AZ_TRAIT_ATOM_FALLBACK_ASSET_HOST_PLATFORM;
if (platformIdentifier == "pc")
{
platformId = AzFramework::PlatformId::PC;
@ -478,6 +480,10 @@ namespace AZ
{
platformId = AzFramework::PlatformId::IOS;
}
else if (platformIdentifier == "server")
{
platformId = AzFramework::PlatformId::SERVER;
}
uint32_t assetSubId = RPI::ShaderAsset::MakeProductAssetSubId(rhiUniqueIndex, supervariantIndex, aznumeric_cast<uint32_t>(shaderAssetSubId));
auto assetIdOutcome = RPI::AssetUtils::MakeAssetId(shaderJsonPath, assetSubId);

1
Gems/Atom/Asset/Shader/Code/Source/Platform/Android/ShaderBuilder_Traits_Android.h
Unescape Escape View File

@ -8,3 +8,4 @@
#pragma once
#define AZ_TRAIT_ATOM_SHADERBUILDER_AZSLC UNUSED_TRAIT
#define AZ_TRAIT_ATOM_FALLBACK_ASSET_HOST_PLATFORM UNUSED_TRAIT

2
Gems/Atom/Asset/Shader/Code/Source/Platform/Linux/ShaderBuilder_Traits_Linux.h
Unescape Escape View File

@ -8,4 +8,4 @@
#pragma once
#define AZ_TRAIT_ATOM_SHADERBUILDER_AZSLC "azslc"
#define AZ_TRAIT_ATOM_FALLBACK_ASSET_HOST_PLATFORM AzFramework::PlatformId::LINUX_ID

1
Gems/Atom/Asset/Shader/Code/Source/Platform/Mac/ShaderBuilder_Traits_Mac.h
Unescape Escape View File

@ -8,3 +8,4 @@
#pragma once
#define AZ_TRAIT_ATOM_SHADERBUILDER_AZSLC "azslc"
#define AZ_TRAIT_ATOM_FALLBACK_ASSET_HOST_PLATFORM AzFramework::PlatformId::MAC_ID

1
Gems/Atom/Asset/Shader/Code/Source/Platform/Windows/ShaderBuilder_Traits_Windows.h
Unescape Escape View File

@ -8,3 +8,4 @@
#pragma once
#define AZ_TRAIT_ATOM_SHADERBUILDER_AZSLC "azslc.exe"
#define AZ_TRAIT_ATOM_FALLBACK_ASSET_HOST_PLATFORM AzFramework::PlatformId::PC

1
Gems/Atom/Asset/Shader/Code/Source/Platform/iOS/ShaderBuilder_Traits_iOS.h
Unescape Escape View File

@ -8,3 +8,4 @@
#pragma once
#define AZ_TRAIT_ATOM_SHADERBUILDER_AZSLC UNUSED_TRAIT
#define AZ_TRAIT_ATOM_FALLBACK_ASSET_HOST_PLATFORM UNUSED_TRAIT

2
Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawQueue.cpp
Unescape Escape View File

@ -9,8 +9,6 @@
#include "AuxGeomDrawQueue.h"
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RPI.Public/Scene.h>
#include <AzCore/Debug/EventTrace.h>

1
Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomFeatureProcessor.cpp
Unescape Escape View File

@ -12,7 +12,6 @@
#include "DynamicPrimitiveProcessor.h"
#include "FixedShapeProcessor.h"
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RHI/RHISystemInterface.h>
#include <Atom/RPI.Public/View.h>

3
Gems/Atom/Feature/Common/Code/Source/AuxGeom/DynamicPrimitiveProcessor.cpp
Unescape Escape View File

@ -9,7 +9,6 @@
#include "DynamicPrimitiveProcessor.h"
#include "AuxGeomDrawProcessorShared.h"
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RHI/DrawPacketBuilder.h>
#include <Atom/RHI/Factory.h>
#include <Atom/RHI.Reflect/InputStreamLayoutBuilder.h>
@ -21,6 +20,8 @@
#include <Atom/RPI.Public/Shader/Shader.h>
#include <Atom/RPI.Public/View.h>
#include <AzCore/Debug/Profiler.h>
namespace AZ
{
namespace Render

1
Gems/Atom/Feature/Common/Code/Source/AuxGeom/FixedShapeProcessor.cpp
Unescape Escape View File

@ -12,7 +12,6 @@
#include <AzCore/Debug/EventTrace.h>
#include <AzCore/std/containers/array.h>
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RHI/Factory.h>
#include <Atom/RHI/DrawPacketBuilder.h>

1
Gems/Atom/Feature/Common/Code/Source/CoreLights/CapsuleLightFeatureProcessor.cpp
Unescape Escape View File

@ -16,7 +16,6 @@
#include <Atom/Feature/CoreLights/CoreLightsConstants.h>
#include <Atom/RHI/Factory.h>
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RPI.Public/ColorManagement/TransformColor.h>
#include <Atom/RPI.Public/RPISystemInterface.h>

1
Gems/Atom/Feature/Common/Code/Source/CoreLights/DirectionalLightFeatureProcessor.cpp
Unescape Escape View File

@ -12,7 +12,6 @@
#include <CoreLights/Shadow.h>
#include <Math/GaussianMathFilter.h>
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RPI.Public/AuxGeom/AuxGeomDraw.h>
#include <Atom/RPI.Public/ColorManagement/TransformColor.h>
#include <Atom/RPI.Public/Pass/PassSystemInterface.h>

1
Gems/Atom/Feature/Common/Code/Source/CoreLights/DiskLightFeatureProcessor.cpp
Unescape Escape View File

@ -16,7 +16,6 @@
#include <Atom/Feature/CoreLights/CoreLightsConstants.h>
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RHI/Factory.h>
#include <Atom/RPI.Public/ColorManagement/TransformColor.h>

1
Gems/Atom/Feature/Common/Code/Source/CoreLights/PointLightFeatureProcessor.cpp
Unescape Escape View File

@ -16,7 +16,6 @@
#include <Atom/Feature/CoreLights/CoreLightsConstants.h>
#include <Atom/RHI/Factory.h>
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RPI.Public/ColorManagement/TransformColor.h>
#include <Atom/RPI.Public/RPISystemInterface.h>

1
Gems/Atom/Feature/Common/Code/Source/CoreLights/PolygonLightFeatureProcessor.cpp
Unescape Escape View File

@ -16,7 +16,6 @@
#include <Atom/Feature/CoreLights/CoreLightsConstants.h>
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RHI/Factory.h>
#include <Atom/RPI.Public/ColorManagement/TransformColor.h>

1
Gems/Atom/Feature/Common/Code/Source/CoreLights/QuadLightFeatureProcessor.cpp
Unescape Escape View File

@ -16,7 +16,6 @@
#include <Atom/Feature/CoreLights/CoreLightsConstants.h>
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RHI/Factory.h>
#include <Atom/RPI.Public/ColorManagement/TransformColor.h>

1
Gems/Atom/Feature/Common/Code/Source/CoreLights/SimplePointLightFeatureProcessor.cpp
Unescape Escape View File

@ -16,7 +16,6 @@
#include <Atom/Feature/CoreLights/CoreLightsConstants.h>
#include <Atom/RHI/Factory.h>
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RPI.Public/ColorManagement/TransformColor.h>
#include <Atom/RPI.Public/RPISystemInterface.h>

1
Gems/Atom/Feature/Common/Code/Source/CoreLights/SimpleSpotLightFeatureProcessor.cpp
Unescape Escape View File

@ -16,7 +16,6 @@
#include <Atom/Feature/CoreLights/CoreLightsConstants.h>
#include <Atom/RHI/Factory.h>
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RPI.Public/ColorManagement/TransformColor.h>
#include <Atom/RPI.Public/RPISystemInterface.h>

1
Gems/Atom/Feature/Common/Code/Source/Decals/DecalFeatureProcessor.cpp
Unescape Escape View File

@ -10,7 +10,6 @@
#include <AzCore/Debug/EventTrace.h>
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RHI/Factory.h>
#include <Atom/RPI.Public/Image/ImageSystemInterface.h>

1
Gems/Atom/Feature/Common/Code/Source/ImGui/ImGuiPass.cpp
Unescape Escape View File

@ -15,7 +15,6 @@
#include <AtomCore/Instance/InstanceDatabase.h>
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RHI/CommandList.h>
#include <Atom/RHI.Reflect/InputStreamLayoutBuilder.h>

2
Gems/Atom/Feature/Common/Code/Source/ImageBasedLights/ImageBasedLightFeatureProcessor.cpp
Unescape Escape View File

@ -11,8 +11,6 @@
#include <Atom/RPI.Public/Scene.h>
#include <Atom/RPI.Public/Image/StreamingImage.h>
#include <Atom/RHI/CpuProfiler.h>
#include <AzCore/Debug/EventTrace.h>
namespace AZ

1
Gems/Atom/Feature/Common/Code/Source/Mesh/MeshFeatureProcessor.cpp
Unescape Escape View File

@ -8,7 +8,6 @@
#include <RenderCommon.h>
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RHI/RHIUtils.h>
#include <Atom/RHI.Reflect/InputStreamLayoutBuilder.h>
#include <Atom/Feature/Mesh/MeshFeatureProcessor.h>

2
Gems/Atom/Feature/Common/Code/Source/PostProcess/PostProcessFeatureProcessor.cpp
Unescape Escape View File

@ -8,8 +8,6 @@
#include <PostProcess/PostProcessFeatureProcessor.h>
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RPI.Public/Shader/ShaderResourceGroup.h>
#include <Atom/RPI.Public/Scene.h>
#include <Atom/RPI.Public/View.h>

2
Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAAFeatureProcessor.cpp
Unescape Escape View File

@ -16,8 +16,6 @@
#include <Atom/RHI/Factory.h>
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RPI.Public/Pass/PassSystemInterface.h>
#include <Atom/RPI.Public/RPISystemInterface.h>
#include <Atom/RPI.Public/Scene.h>

1
Gems/Atom/Feature/Common/Code/Source/ProfilingCaptureSystemComponent.cpp
Unescape Escape View File

@ -8,7 +8,6 @@
#include "ProfilingCaptureSystemComponent.h"
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RHI/CpuProfilerImpl.h>
#include <Atom/RHI/RHIUtils.h>
#include <Atom/RHI/RHISystemInterface.h>

1
Gems/Atom/Feature/Common/Code/Source/ProfilingCaptureSystemComponent.h
Unescape Escape View File

@ -12,7 +12,6 @@
#include <AzCore/Component/TickBus.h>
#include <Atom/Feature/Utils/ProfilingCaptureBus.h>
#include <Atom/RHI/CpuProfiler.h>
namespace AZ
{

1
Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingFeatureProcessor.cpp
Unescape Escape View File

@ -9,7 +9,6 @@
#include <RayTracing/RayTracingFeatureProcessor.h>
#include <AzCore/Debug/EventTrace.h>
#include <Atom/Feature/TransformService/TransformServiceFeatureProcessor.h>
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RHI/Factory.h>
#include <Atom/RHI/RHISystemInterface.h>
#include <Atom/RPI.Public/Scene.h>

1
Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbeFeatureProcessor.cpp
Unescape Escape View File

@ -13,7 +13,6 @@
#include <Atom/RPI.Reflect/Asset/AssetUtils.h>
#include <Atom/Feature/ReflectionProbe/ReflectionProbeFeatureProcessor.h>
#include <Atom/Feature/Mesh/MeshFeatureProcessor.h>
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RHI/Factory.h>
#include <Atom/RHI/RHISystemInterface.h>
#include <Atom/RHI/PipelineState.h>

1
Gems/Atom/Feature/Common/Code/Source/Shadows/ProjectedShadowFeatureProcessor.cpp
Unescape Escape View File

@ -11,7 +11,6 @@
#include <AzCore/Debug/EventTrace.h>
#include <AzCore/Math/MatrixUtils.h>
#include <Math/GaussianMathFilter.h>
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RPI.Public/RenderPipeline.h>
#include <Atom/RPI.Public/RPISystemInterface.h>
#include <Atom/RPI.Public/Scene.h>

1
Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshFeatureProcessor.cpp
Unescape Escape View File

@ -22,7 +22,6 @@
#include <Atom/RPI.Public/Shader/Shader.h>
#include <Atom/RPI.Public/RenderPipeline.h>
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RHI/CommandList.h>
#include <AzCore/Debug/EventTrace.h>

1
Gems/Atom/Feature/Common/Code/Source/SkyBox/SkyBoxFeatureProcessor.cpp
Unescape Escape View File

@ -12,7 +12,6 @@
#include <AzFramework/Asset/AssetSystemBus.h>
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RHI/Factory.h>
#include <Atom/RHI/DrawPacketBuilder.h>
#include <Atom/RHI/RHISystemInterface.h>

1
Gems/Atom/Feature/Common/Code/Source/TransformService/TransformServiceFeatureProcessor.cpp
Unescape Escape View File

@ -8,7 +8,6 @@
#include <Atom/Feature/TransformService/TransformServiceFeatureProcessor.h>
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RHI/Factory.h>
#include <Atom/RHI/RHISystemInterface.h>

1
Gems/Atom/RHI/Code/Include/Atom/RHI/MemorySubAllocator.h
Unescape Escape View File

@ -7,7 +7,6 @@
*/
#pragma once
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RHI/FreeListAllocator.h>
#include <Atom/RHI/PoolAllocator.h>
#include <Atom/RHI/MemoryAllocation.h>

3
Gems/Atom/RHI/Code/Include/Atom/RHI/ObjectCollector.h
Unescape Escape View File

@ -7,8 +7,9 @@
*/
#pragma once
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RHI/Object.h>
#include <AzCore/Debug/Profiler.h>
#include <AzCore/std/parallel/mutex.h>
#include <AzCore/std/containers/vector.h>
#include <AzCore/std/functional.h>

1
Gems/Atom/RHI/Code/Source/RHI/BufferPool.cpp
Unescape Escape View File

@ -7,7 +7,6 @@
*/
#include <Atom/RHI/BufferPool.h>
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RHI/MemoryStatisticsBuilder.h>
#include <AzCore/Debug/EventTrace.h>

3
Gems/Atom/RHI/Code/Source/RHI/CommandQueue.cpp
Unescape Escape View File

@ -7,9 +7,10 @@
*/
#include <Atom/RHI/CommandQueue.h>
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RHI/Device.h>
#include <AzCore/Debug/Profiler.h>
namespace AZ
{
namespace RHI

1
Gems/Atom/RHI/Code/Source/RHI/Device.cpp
Unescape Escape View File

@ -6,7 +6,6 @@
*
*/
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RHI/Device.h>
#include <Atom/RHI/MemoryStatisticsBus.h>

2
Gems/Atom/RHI/Code/Source/RHI/Fence.cpp
Unescape Escape View File

@ -8,6 +8,8 @@
#include <Atom/RHI/Fence.h>
#include <AzCore/Debug/Profiler.h>
namespace AZ
{
namespace RHI

1
Gems/Atom/RHI/Code/Source/RHI/FrameGraph.cpp
Unescape Escape View File

@ -8,7 +8,6 @@
#include <Atom/RHI/BufferFrameAttachment.h>
#include <Atom/RHI/BufferPoolBase.h>
#include <Atom/RHI/BufferScopeAttachment.h>
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RHI/FrameGraph.h>
#include <Atom/RHI/ImageFrameAttachment.h>
#include <Atom/RHI/ImagePoolBase.h>

1
Gems/Atom/RHI/Code/Source/RHI/FrameGraphCompiler.cpp
Unescape Escape View File

@ -6,7 +6,6 @@
*
*/
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RHI/FrameGraphCompiler.h>
#include <Atom/RHI/BufferFrameAttachment.h>
#include <Atom/RHI/BufferScopeAttachment.h>

1
Gems/Atom/RHI/Code/Source/RHI/FrameGraphExecuter.cpp
Unescape Escape View File

@ -6,7 +6,6 @@
*
*/
#include <Atom/RHI/Buffer.h>
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RHI/FrameGraphExecuteGroup.h>
#include <Atom/RHI/FrameGraphExecuter.h>
#include <Atom/RHI/FrameGraph.h>

1
Gems/Atom/RHI/Code/Source/RHI/FrameScheduler.cpp
Unescape Escape View File

@ -6,7 +6,6 @@
*
*/
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RHI/FrameScheduler.h>
#include <Atom/RHI/Factory.h>
#include <Atom/RHI/FrameEventBus.h>

3
Gems/Atom/RHI/Code/Source/RHI/PipelineStateCache.cpp
Unescape Escape View File

@ -6,9 +6,10 @@
*
*/
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RHI/PipelineStateCache.h>
#include <Atom/RHI/Factory.h>
#include <AzCore/Debug/Profiler.h>
#include <AzCore/std/sort.h>
#include <AzCore/std/parallel/exponential_backoff.h>

2
Gems/Atom/RHI/Code/Source/RHI/RHISystem.cpp
Unescape Escape View File

@ -6,12 +6,12 @@
*
*/
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RHI/Device.h>
#include <Atom/RHI/Factory.h>
#include <Atom/RHI/RHISystem.h>
#include <Atom/RHI/RHIUtils.h>
#include <AzCore/Debug/Profiler.h>
#include <AzCore/Interface/Interface.h>
#include <AzFramework/API/ApplicationAPI.h>

1
Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListPool.cpp
Unescape Escape View File

@ -9,7 +9,6 @@
#include <RHI/CommandList.h>
#include <RHI/Conversions.h>
#include <RHI/DescriptorContext.h>
#include <Atom/RHI/CpuProfiler.h>
#include <AzCore/Debug/EventTrace.h>
namespace AZ

2
Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueueContext.cpp
Unescape Escape View File

@ -5,7 +5,7 @@
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
*/
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RHI/Device.h>
#include <Atom/RHI.Reflect/CpuTimingStatistics.h>
#include <AzCore/Debug/EventTraceDrillerBus.h>

1
Gems/Atom/RHI/DX12/Code/Source/RHI/DescriptorContext.cpp
Unescape Escape View File

@ -10,7 +10,6 @@
#include <RHI/Conversions.h>
#include <RHI/Device.h>
#include <RHI/Image.h>
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RHI.Reflect/DX12/PlatformLimitsDescriptor.h>
namespace AZ

1
Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphCompiler.cpp
Unescape Escape View File

@ -15,7 +15,6 @@
#include <RHI/Device.h>
#include <RHI/Image.h>
#include <RHI/Scope.h>
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RHI/FrameGraph.h>
#include <Atom/RHI/ImageScopeAttachment.h>
#include <Atom/RHI/ScopeAttachment.h>

1
Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueueContext.cpp
Unescape Escape View File

@ -7,7 +7,6 @@
*/
#include <AzCore/Debug/EventTrace.h>
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RHI/CommandQueue.h>
#include <Atom/RHI.Reflect/CpuTimingStatistics.h>
#include <RHI/Device.h>

2
Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphCompiler.cpp
Unescape Escape View File

@ -5,7 +5,7 @@
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
*/
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RHI/FrameGraph.h>
#include <AzCore/Debug/EventTrace.h>
#include <RHI/Device.h>

2
Gems/Atom/RHI/Metal/Code/Source/RHI/Scope.cpp
Unescape Escape View File

@ -5,7 +5,7 @@
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
*/
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RHI/ImageScopeAttachment.h>
#include <Atom/RHI/ResolveScopeAttachment.h>
#include <AzCore/Debug/EventTrace.h>

2
Gems/Atom/RHI/Metal/Code/Source/RHI/SwapChain.cpp
Unescape Escape View File

@ -6,10 +6,10 @@
*
*/
#include <AzCore/Debug/Profiler.h>
#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>
#include <RHI/SwapChain.h>

1
Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandQueueContext.cpp
Unescape Escape View File

@ -8,7 +8,6 @@
#include <AzCore/std/algorithm.h>
#include <AzCore/std/sort.h>
#include <AzCore/Debug/EventTrace.h>
#include <Atom/RHI/CpuProfiler.h>
#include <RHI/CommandQueueContext.h>
#include <RHI/Device.h>
#include <RHI/Semaphore.h>

1
Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphCompiler.cpp
Unescape Escape View File

@ -9,7 +9,6 @@
#include <Atom/RHI/BufferFrameAttachment.h>
#include <Atom/RHI/BufferScopeAttachment.h>
#include <Atom/RHI/BufferView.h>
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RHI/FrameGraphAttachmentDatabase.h>
#include <Atom/RHI/FrameGraph.h>
#include <Atom/RHI/ImageScopeAttachment.h>

2
Gems/Atom/RPI/Code/Source/RPI.Public/Culling.cpp
Unescape Escape View File

@ -14,8 +14,6 @@
#include <Atom/RPI.Public/Scene.h>
#include <Atom/RPI.Public/View.h>
#include <Atom/RHI/CpuProfiler.h>
#include <AzCore/Math/MatrixUtils.h>
#include <AzCore/Math/ShapeIntersection.h>
#include <AzCore/Casting/numeric_cast.h>

1
Gems/Atom/RPI/Code/Source/RPI.Public/GpuQuery/GpuQuerySystem.cpp
Unescape Escape View File

@ -7,7 +7,6 @@
*/
#include <Atom/RHI/CommandList.h>
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RHI/Factory.h>
#include <Atom/RHI/FrameGraphInterface.h>
#include <Atom/RHI/RHISystemInterface.h>

1
Gems/Atom/RPI/Code/Source/RPI.Public/Image/ImageSystem.cpp
Unescape Escape View File

@ -23,7 +23,6 @@
#include <Atom/RHI.Reflect/ImagePoolDescriptor.h>
#include <Atom/RHI/ImagePool.h>
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RHI/RHISystemInterface.h>
#include <AtomCore/Instance/InstanceDatabase.h>

1
Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassSystem.cpp
Unescape Escape View File

@ -19,7 +19,6 @@
#include <AzCore/Serialization/Json/JsonUtils.h>
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RHI/FrameGraphBuilder.h>
#include <Atom/RPI.Public/Pass/FullscreenTrianglePass.h>

2
Gems/Atom/RPI/Code/Source/RPI.Public/Scene.cpp
Unescape Escape View File

@ -6,8 +6,6 @@
*
*/
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RPI.Public/Culling.h>
#include <Atom/RPI.Public/DynamicDraw/DynamicDrawSystem.h>
#include <Atom/RPI.Public/FeatureProcessorFactory.h>

2
Gems/Multiplayer/Code/Tests/ClientHierarchyTests.cpp
Unescape Escape View File

@ -307,7 +307,7 @@ namespace Multiplayer
class ClientDeepHierarchyTests : public ClientSimpleHierarchyTests
{
public:
static const NetEntityId ChildOfChildNetEntityId = NetEntityId{ 3 };
const NetEntityId ChildOfChildNetEntityId = NetEntityId{ 3 };
void SetUp() override
{

24
Gems/Multiplayer/Code/Tests/ServerHierarchyTests.cpp
Unescape Escape View File

@ -414,12 +414,12 @@ namespace Multiplayer
class ServerBranchedHierarchyTests : public HierarchyTests
{
public:
static const NetEntityId RootNetEntityId = NetEntityId{ 1 };
static const NetEntityId ChildNetEntityId = NetEntityId{ 2 };
static const NetEntityId ChildOfChildNetEntityId = NetEntityId{ 3 };
static const NetEntityId Child2NetEntityId = NetEntityId{ 4 };
static const NetEntityId ChildOfChild2NetEntityId = NetEntityId{ 5 };
static const NetEntityId Child2OfChild2NetEntityId = NetEntityId{ 6 };
const NetEntityId RootNetEntityId = NetEntityId{ 1 };
const NetEntityId ChildNetEntityId = NetEntityId{ 2 };
const NetEntityId ChildOfChildNetEntityId = NetEntityId{ 3 };
const NetEntityId Child2NetEntityId = NetEntityId{ 4 };
const NetEntityId ChildOfChild2NetEntityId = NetEntityId{ 5 };
const NetEntityId Child2OfChild2NetEntityId = NetEntityId{ 6 };
void SetUp() override
{
@ -610,9 +610,9 @@ namespace Multiplayer
class ServerHierarchyOfHierarchyTests : public ServerDeepHierarchyTests
{
public:
static const NetEntityId Root2NetEntityId = NetEntityId{ 4 };
static const NetEntityId Child2NetEntityId = NetEntityId{ 5 };
static const NetEntityId ChildOfChild2NetEntityId = NetEntityId{ 6 };
const NetEntityId Root2NetEntityId = NetEntityId{ 4 };
const NetEntityId Child2NetEntityId = NetEntityId{ 5 };
const NetEntityId ChildOfChild2NetEntityId = NetEntityId{ 6 };
void SetUp() override
{
@ -1132,9 +1132,9 @@ namespace Multiplayer
class ServerHierarchyWithThreeRoots : public ServerHierarchyOfHierarchyTests
{
public:
static const NetEntityId Root3NetEntityId = NetEntityId{ 7 };
static const NetEntityId Child3NetEntityId = NetEntityId{ 8 };
static const NetEntityId ChildOfChild3NetEntityId = NetEntityId{ 9 };
const NetEntityId Root3NetEntityId = NetEntityId{ 7 };
const NetEntityId Child3NetEntityId = NetEntityId{ 8 };
const NetEntityId ChildOfChild3NetEntityId = NetEntityId{ 9 };
void SetUp() override
{

4
cmake/Platform/Mac/PAL_mac.cmake
Unescape Escape View File

@ -37,6 +37,10 @@ endif()
# Set the default asset type for deployment
set(LY_ASSET_DEPLOY_ASSET_TYPE "mac" CACHE STRING "Set the asset type for deployment.")
# Set the deployment target for MacOS
set(LY_MAC_DEPLOYMENT_TARGET "11.0" CACHE STRING "Mac Deployment Target")
set(CMAKE_OSX_DEPLOYMENT_TARGET ${LY_MAC_DEPLOYMENT_TARGET})
# Set the python cmd tool
ly_set(LY_PYTHON_CMD ${CMAKE_CURRENT_SOURCE_DIR}/python/python.sh)

2
cmake/Platform/iOS/Toolchain_ios.cmake
Unescape Escape View File

@ -13,7 +13,7 @@ set(CMAKE_OSX_ARCHITECTURES arm64)
set(LY_IOS_CODE_SIGNING_IDENTITY "iPhone Developer" CACHE STRING "iPhone Developer")
set(LY_IOS_DEPLOYMENT_TARGET "13.0" CACHE STRING "iOS Deployment Target")
set(LY_IOS_DEPLOYMENT_TARGET "14.0" CACHE STRING "iOS Deployment Target")
set(LY_IOS_DEVELOPMENT_TEAM "CF9TGN983S" CACHE STRING "The development team ID")

Write Preview
Loading…
Cancel
Save