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

Merge branch 'development' into o3de_sdk/installer_configs

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-09-23 17:58:25 -07:00
parent 3106e88155 1050f95601
commit 87db7b011b
64 changed files with 86 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzCore/AzCore/Math/Transform.cpp
+1
View File
@@ -353,6 +353,7 @@ namespace AZ
Method("CreateFromMatrix3x3AndTranslation", &Transform::CreateFromMatrix3x3AndTranslation)->
Method("CreateUniformScale", &Transform::CreateUniformScale)->
Method("CreateTranslation", &Transform::CreateTranslation)->
Method("CreateLookAt", &Transform::CreateLookAt)->
Method("ConstructFromValuesNumeric", &Internal::ConstructTransformFromValues);
}
}
Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabFocusHandler.cpp
+6
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;
Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderBuilderUtility.cpp
+8 -2
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);
Gems/Atom/Asset/Shader/Code/Source/Platform/Android/ShaderBuilder_Traits_Android.h
+1
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
Gems/Atom/Asset/Shader/Code/Source/Platform/Linux/ShaderBuilder_Traits_Linux.h
+1 -1
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
Gems/Atom/Asset/Shader/Code/Source/Platform/Mac/ShaderBuilder_Traits_Mac.h
+1
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
Gems/Atom/Asset/Shader/Code/Source/Platform/Windows/ShaderBuilder_Traits_Windows.h
+1
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
Gems/Atom/Asset/Shader/Code/Source/Platform/iOS/ShaderBuilder_Traits_iOS.h
+1
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
Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawQueue.cpp
-2
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>
Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomFeatureProcessor.cpp
-1
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>
Gems/Atom/Feature/Common/Code/Source/AuxGeom/DynamicPrimitiveProcessor.cpp
+2 -1
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
Gems/Atom/Feature/Common/Code/Source/AuxGeom/FixedShapeProcessor.cpp
-1
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>
Gems/Atom/Feature/Common/Code/Source/CoreLights/CapsuleLightFeatureProcessor.cpp
-1
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>
Gems/Atom/Feature/Common/Code/Source/CoreLights/DirectionalLightFeatureProcessor.cpp
-1
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>
Gems/Atom/Feature/Common/Code/Source/CoreLights/DiskLightFeatureProcessor.cpp
-1
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>
Gems/Atom/Feature/Common/Code/Source/CoreLights/PointLightFeatureProcessor.cpp
-1
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>
Gems/Atom/Feature/Common/Code/Source/CoreLights/PolygonLightFeatureProcessor.cpp
-1
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>
Gems/Atom/Feature/Common/Code/Source/CoreLights/QuadLightFeatureProcessor.cpp
-1
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>
Gems/Atom/Feature/Common/Code/Source/CoreLights/SimplePointLightFeatureProcessor.cpp
-1
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>
Gems/Atom/Feature/Common/Code/Source/CoreLights/SimpleSpotLightFeatureProcessor.cpp
-1
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>
Gems/Atom/Feature/Common/Code/Source/Decals/DecalFeatureProcessor.cpp
-1
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>
Gems/Atom/Feature/Common/Code/Source/ImGui/ImGuiPass.cpp
-1
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>
Gems/Atom/Feature/Common/Code/Source/ImageBasedLights/ImageBasedLightFeatureProcessor.cpp
-2
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
Gems/Atom/Feature/Common/Code/Source/Mesh/MeshFeatureProcessor.cpp
-1
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>
Gems/Atom/Feature/Common/Code/Source/PostProcess/PostProcessFeatureProcessor.cpp
-2
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>
Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAAFeatureProcessor.cpp
-2
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>
Gems/Atom/Feature/Common/Code/Source/ProfilingCaptureSystemComponent.cpp
-1
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>
Gems/Atom/Feature/Common/Code/Source/ProfilingCaptureSystemComponent.h
-1
View File
@@ -12,7 +12,6 @@
#include <AzCore/Component/TickBus.h>
#include <Atom/Feature/Utils/ProfilingCaptureBus.h>
#include <Atom/RHI/CpuProfiler.h>
namespace AZ
{
Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingFeatureProcessor.cpp
+29 -16
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>
@@ -105,14 +104,31 @@ namespace AZ
m_meshes[objectIndex].m_subMeshes = subMeshes;
}
Mesh& mesh = m_meshes[objectIndex];
// search for an existing BLAS instance entry for this mesh using the assetId
BlasInstanceMap::iterator itMeshBlasInstance = m_blasInstanceMap.find(assetId);
if (itMeshBlasInstance == m_blasInstanceMap.end())
{
// make a new BLAS map entry for this mesh
MeshBlasInstance meshBlasInstance;
meshBlasInstance.m_count = 1;
meshBlasInstance.m_subMeshes.reserve(mesh.m_subMeshes.size());
itMeshBlasInstance = m_blasInstanceMap.insert({ assetId, meshBlasInstance }).first;
}
else
{
itMeshBlasInstance->second.m_count++;
}
// create the BLAS buffers for each sub-mesh, or re-use existing BLAS objects if they were already created.
// Note: all sub-meshes must either create new BLAS objects or re-use existing ones, otherwise it's an error (it's the same model in both cases)
// Note: the buffer is just reserved here, the BLAS is built in the RayTracingAccelerationStructurePass
Mesh& mesh = m_meshes[objectIndex];
bool blasInstanceFound = false;
for (auto& subMesh : mesh.m_subMeshes)
for (uint32_t subMeshIndex = 0; subMeshIndex < mesh.m_subMeshes.size(); ++subMeshIndex)
{
SubMesh& subMesh = mesh.m_subMeshes[subMeshIndex];
RHI::RayTracingBlasDescriptor blasDescriptor;
blasDescriptor.Build()
->Geometry()
@@ -121,13 +137,11 @@ namespace AZ
->IndexBuffer(subMesh.m_indexBufferView)
;
// search for an existing BLAS object for this model
RayTracingBlasMap::iterator itBlas = m_blasMap.find(assetId);
if (itBlas != m_blasMap.end())
// determine if we have an existing BLAS object for this subMesh
if (itMeshBlasInstance->second.m_subMeshes.size() >= subMeshIndex + 1)
{
// re-use existing BLAS
subMesh.m_blas = itBlas->second.m_blas;
itBlas->second.m_count++;
subMesh.m_blas = itMeshBlasInstance->second.m_subMeshes[subMeshIndex].m_blas;
// keep track of the fact that we re-used a BLAS
blasInstanceFound = true;
@@ -143,8 +157,7 @@ namespace AZ
subMesh.m_blas->CreateBuffers(*device, &blasDescriptor, *m_bufferPools);
// store the BLAS in the side list
RayTracingBlasInstance blasInstance = { subMesh.m_blas, 1 };
m_blasMap.insert({ assetId, blasInstance });
itMeshBlasInstance->second.m_subMeshes.push_back({ subMesh.m_blas });
}
}
@@ -182,16 +195,16 @@ namespace AZ
m_meshes.erase(itMesh);
m_revision++;
// decrement the count from the BLAS instance, and check to see if we can remove it
RayTracingBlasMap::iterator itBlas = m_blasMap.find(itMesh->second.m_assetId);
if (itBlas != m_blasMap.end())
// decrement the count from the BLAS instances, and check to see if we can remove them
BlasInstanceMap::iterator itBlas = m_blasInstanceMap.find(itMesh->second.m_assetId);
if (itBlas != m_blasInstanceMap.end())
{
itBlas->second.m_count--;
if (itBlas->second.m_count == 0)
{
m_blasMap.erase(itBlas);
m_blasInstanceMap.erase(itBlas);
}
}
}
}
m_meshInfoBufferNeedsUpdate = true;
Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingFeatureProcessor.h
+9 -4
View File
@@ -268,14 +268,19 @@ namespace AZ
bool m_materialInfoBufferNeedsUpdate = false;
// side list for looking up existing BLAS objects so they can be re-used when the same mesh is added multiple times
struct RayTracingBlasInstance
struct SubMeshBlasInstance
{
RHI::Ptr<RHI::RayTracingBlas> m_blas;
uint32_t m_count = 0;
};
using RayTracingBlasMap = AZStd::unordered_map<AZ::Data::AssetId, RayTracingBlasInstance>;
RayTracingBlasMap m_blasMap;
struct MeshBlasInstance
{
uint32_t m_count = 0;
AZStd::vector<SubMeshBlasInstance> m_subMeshes;
};
using BlasInstanceMap = AZStd::unordered_map<AZ::Data::AssetId, MeshBlasInstance>;
BlasInstanceMap m_blasInstanceMap;
};
}
}
Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbeFeatureProcessor.cpp
-1
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>
Gems/Atom/Feature/Common/Code/Source/Shadows/ProjectedShadowFeatureProcessor.cpp
-1
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>
Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshFeatureProcessor.cpp
-1
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>
Gems/Atom/Feature/Common/Code/Source/SkyBox/SkyBoxFeatureProcessor.cpp
-1
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>
Gems/Atom/Feature/Common/Code/Source/TransformService/TransformServiceFeatureProcessor.cpp
-1
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>
Gems/Atom/RHI/Code/Include/Atom/RHI/MemorySubAllocator.h
-1
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>
Gems/Atom/RHI/Code/Include/Atom/RHI/ObjectCollector.h
+2 -1
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>
Gems/Atom/RHI/Code/Source/RHI/BufferPool.cpp
-1
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>
Gems/Atom/RHI/Code/Source/RHI/CommandQueue.cpp
+2 -1
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
Gems/Atom/RHI/Code/Source/RHI/Device.cpp
-1
View File
@@ -6,7 +6,6 @@
*
*/
#include <Atom/RHI/CpuProfiler.h>
#include <Atom/RHI/Device.h>
#include <Atom/RHI/MemoryStatisticsBus.h>
Gems/Atom/RHI/Code/Source/RHI/Fence.cpp
+2
View File
@@ -8,6 +8,8 @@
#include <Atom/RHI/Fence.h>
#include <AzCore/Debug/Profiler.h>
namespace AZ
{
namespace RHI
Gems/Atom/RHI/Code/Source/RHI/FrameGraph.cpp
-1
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>
Gems/Atom/RHI/Code/Source/RHI/FrameGraphCompiler.cpp
-1
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>
Gems/Atom/RHI/Code/Source/RHI/FrameGraphExecuter.cpp
-1
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>
Gems/Atom/RHI/Code/Source/RHI/FrameScheduler.cpp
-1
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>
Gems/Atom/RHI/Code/Source/RHI/PipelineStateCache.cpp
+2 -1
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>
Gems/Atom/RHI/Code/Source/RHI/RHISystem.cpp
+1 -1
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>
Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListPool.cpp
-1
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
Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueueContext.cpp
+1 -1
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>
Gems/Atom/RHI/DX12/Code/Source/RHI/DescriptorContext.cpp
-1
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
Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphCompiler.cpp
-1
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>
Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueueContext.cpp
-1
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>
Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphCompiler.cpp
+1 -1
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>
Gems/Atom/RHI/Metal/Code/Source/RHI/Scope.cpp
+1 -1
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>
Gems/Atom/RHI/Metal/Code/Source/RHI/SwapChain.cpp
+1 -1
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>
Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandQueueContext.cpp
-1
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>
Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphCompiler.cpp
-1
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>
Gems/Atom/RPI/Code/Source/RPI.Public/Culling.cpp
-2
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>
Gems/Atom/RPI/Code/Source/RPI.Public/GpuQuery/GpuQuerySystem.cpp
-1
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>
Gems/Atom/RPI/Code/Source/RPI.Public/Image/ImageSystem.cpp
-1
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>
Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassSystem.cpp
-1
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>
Gems/Atom/RPI/Code/Source/RPI.Public/Scene.cpp
-2
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>
Gems/Multiplayer/Code/Tests/ClientHierarchyTests.cpp
+1 -1
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
{
Gems/Multiplayer/Code/Tests/ServerHierarchyTests.cpp
+12 -12
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
{