From 0b9497cd45ea803ddc1cca44ffe250c223e0a5ce Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Thu, 2 Dec 2021 17:12:25 -0800 Subject: [PATCH] Changes call from AZ_TRACE to AZ_PROFILE. AZ_TRACE uses a driller bus that is going to be removed Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- .../AzFramework/Asset/AssetSystemComponent.cpp | 5 +++-- Code/Legacy/CrySystem/System.cpp | 7 ++++--- Code/Legacy/CrySystem/SystemEventDispatcher.cpp | 5 +++-- .../Attribution/AWSCoreAttributionManagerTest.cpp | 1 + .../ACES/AcesDisplayMapperFeatureProcessor.cpp | 3 +-- .../Common/Code/Source/AuxGeom/AuxGeomDrawQueue.cpp | 1 - .../Code/Source/AuxGeom/AuxGeomFeatureProcessor.cpp | 2 -- .../Code/Source/AuxGeom/FixedShapeProcessor.cpp | 1 - .../CoreLights/CapsuleLightFeatureProcessor.cpp | 2 -- .../CoreLights/DirectionalLightFeatureProcessor.cpp | 1 - .../Source/CoreLights/DiskLightFeatureProcessor.cpp | 2 -- .../Source/CoreLights/PointLightFeatureProcessor.cpp | 2 -- .../CoreLights/PolygonLightFeatureProcessor.cpp | 2 -- .../Source/CoreLights/QuadLightFeatureProcessor.cpp | 2 -- .../CoreLights/SimplePointLightFeatureProcessor.cpp | 2 -- .../CoreLights/SimpleSpotLightFeatureProcessor.cpp | 2 -- .../Code/Source/Decals/DecalFeatureProcessor.cpp | 2 -- .../Decals/DecalTextureArrayFeatureProcessor.cpp | 1 - .../Feature/Common/Code/Source/ImGui/ImGuiPass.cpp | 2 -- .../ImageBasedLightFeatureProcessor.cpp | 2 -- .../Common/Code/Source/Mesh/MeshFeatureProcessor.cpp | 1 - .../Code/Source/PostProcess/Bloom/BloomSettings.cpp | 1 - .../DepthOfField/DepthOfFieldSettings.cpp | 1 - .../ExposureControl/ExposureControlSettings.cpp | 1 - .../LookModification/LookModificationSettings.cpp | 1 - .../PostProcess/PostProcessFeatureProcessor.cpp | 2 -- .../Code/Source/PostProcess/Ssao/SsaoSettings.cpp | 1 - .../PostProcessing/ExposureControlRenderProxy.cpp | 1 - .../Source/PostProcessing/SMAAFeatureProcessor.cpp | 4 +--- .../Source/RayTracing/RayTracingFeatureProcessor.cpp | 1 - .../Code/Source/ReflectionProbe/ReflectionProbe.cpp | 1 - .../ReflectionProbeFeatureProcessor.cpp | 2 -- .../Code/Source/ScreenSpace/DeferredFogSettings.cpp | 1 - .../Shadows/ProjectedShadowFeatureProcessor.cpp | 1 - .../SkinnedMesh/SkinnedMeshFeatureProcessor.cpp | 1 - .../Source/SkinnedMesh/SkinnedMeshRenderProxy.cpp | 4 +--- .../Code/Source/SkyBox/SkyBoxFeatureProcessor.cpp | 4 +--- .../TransformServiceFeatureProcessor.cpp | 1 - .../RHI/Code/Include/Atom/RHI/MemorySubAllocator.h | 4 +--- Gems/Atom/RHI/Code/Source/RHI/AliasedHeap.cpp | 1 - Gems/Atom/RHI/Code/Source/RHI/BufferPool.cpp | 6 ++---- .../RHI/Code/Source/RHI/CommandListValidator.cpp | 6 ++---- Gems/Atom/RHI/Code/Source/RHI/Device.cpp | 3 +-- Gems/Atom/RHI/Code/Source/RHI/FrameGraph.cpp | 4 +--- .../Code/Source/RHI/FrameGraphAttachmentDatabase.cpp | 2 -- Gems/Atom/RHI/Code/Source/RHI/FrameGraphCompiler.cpp | 3 +-- Gems/Atom/RHI/Code/Source/RHI/FrameGraphExecuter.cpp | 2 -- Gems/Atom/RHI/Code/Source/RHI/FrameGraphLogger.cpp | 1 - Gems/Atom/RHI/Code/Source/RHI/FrameScheduler.cpp | 1 - Gems/Atom/RHI/Code/Source/RHI/ResourceView.cpp | 4 +--- Gems/Atom/RHI/Code/Source/RHI/Scope.cpp | 4 +--- .../RHI/ShaderResourceGroupInvalidateRegistry.cpp | 4 +--- .../RHI/Code/Source/RHI/ShaderResourceGroupPool.cpp | 4 +--- Gems/Atom/RHI/Code/Source/RHI/StreamingImagePool.cpp | 6 ++---- Gems/Atom/RHI/Code/Source/RHI/SwapChain.cpp | 4 +--- .../RHI/NsightAftermathGpuCrashTracker_Windows.cpp | 2 -- Gems/Atom/RHI/DX12/Code/Source/RHI/AliasedHeap.cpp | 1 - .../DX12/Code/Source/RHI/BufferMemoryAllocator.cpp | 5 ++--- Gems/Atom/RHI/DX12/Code/Source/RHI/BufferPool.cpp | 7 +++---- Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.cpp | 5 ++--- .../RHI/DX12/Code/Source/RHI/CommandListPool.cpp | 6 ++---- Gems/Atom/RHI/DX12/Code/Source/RHI/Device.cpp | 5 ++--- .../RHI/DX12/Code/Source/RHI/FrameGraphCompiler.cpp | 4 +--- .../RHI/DX12/Code/Source/RHI/FrameGraphExecuter.cpp | 2 -- Gems/Atom/RHI/DX12/Code/Source/RHI/ImagePool.cpp | 4 +--- .../RHI/DX12/Code/Source/RHI/MemoryPageAllocator.cpp | 4 +--- Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryView.cpp | 3 +-- Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineState.cpp | 2 -- .../Atom/RHI/DX12/Code/Source/RHI/RayTracingBlas.cpp | 1 - .../DX12/Code/Source/RHI/RayTracingPipelineState.cpp | 2 -- .../DX12/Code/Source/RHI/RayTracingShaderTable.cpp | 1 - .../Atom/RHI/DX12/Code/Source/RHI/RayTracingTlas.cpp | 1 - Gems/Atom/RHI/DX12/Code/Source/RHI/Scope.cpp | 6 ++---- .../DX12/Code/Source/RHI/ShaderResourceGroupPool.cpp | 2 -- .../DX12/Code/Source/RHI/StagingMemoryAllocator.cpp | 4 +--- .../RHI/DX12/Code/Source/RHI/StreamingImagePool.cpp | 12 ++++-------- .../RHI/DX12/Code/Source/RHI/SystemComponent.cpp | 1 - Gems/Atom/RHI/Metal/Code/Source/RHI/AliasedHeap.cpp | 1 - .../RHI/Metal/Code/Source/RHI/AsyncUploadQueue.cpp | 11 +++++------ .../Metal/Code/Source/RHI/BufferMemoryAllocator.cpp | 2 +- Gems/Atom/RHI/Metal/Code/Source/RHI/CommandList.cpp | 9 ++++----- .../RHI/Metal/Code/Source/RHI/CommandListBase.cpp | 1 - .../Code/Source/RHI/CommandQueueCommandBuffer.cpp | 1 - .../Metal/Code/Source/RHI/CommandQueueContext.cpp | 3 +-- Gems/Atom/RHI/Metal/Code/Source/RHI/Device.cpp | 1 - .../RHI/Metal/Code/Source/RHI/FrameGraphCompiler.cpp | 3 +-- .../RHI/Metal/Code/Source/RHI/FrameGraphExecuter.cpp | 1 - .../Metal/Code/Source/RHI/MemoryPageAllocator.cpp | 4 +--- .../Atom/RHI/Metal/Code/Source/RHI/PipelineState.cpp | 1 - Gems/Atom/RHI/Metal/Code/Source/RHI/Scope.cpp | 5 ++--- .../Code/Source/RHI/ShaderResourceGroupPool.cpp | 1 - .../RHI/Metal/Code/Source/RHI/StreamingImagePool.cpp | 5 ++--- .../Code/Source/RHI/StreamingImagePoolResolver.cpp | 3 +-- .../RHI/Metal/Code/Source/RHI/SystemComponent.cpp | 1 - .../RHI/Null/Code/Source/RHI/SystemComponent.cpp | 1 - Gems/Atom/RHI/Vulkan/Code/Source/RHI/AliasedHeap.cpp | 2 -- .../Code/Source/RHI/BufferMemoryPageAllocator.cpp | 4 +--- .../Vulkan/Code/Source/RHI/CommandQueueContext.cpp | 1 - .../Vulkan/Code/Source/RHI/FrameGraphCompiler.cpp | 1 - .../Vulkan/Code/Source/RHI/MemoryPageAllocator.cpp | 4 +--- .../RHI/Vulkan/Code/Source/RHI/MemoryTypeAllocator.h | 7 ++----- .../RHI/Vulkan/Code/Source/RHI/RayTracingBlas.cpp | 1 - .../Code/Source/RHI/RayTracingPipelineState.cpp | 2 -- .../Vulkan/Code/Source/RHI/RayTracingShaderTable.cpp | 1 - .../RHI/Vulkan/Code/Source/RHI/RayTracingTlas.cpp | 1 - .../RPI/Code/Source/RPI.Public/Buffer/Buffer.cpp | 6 ++---- .../Code/Source/RPI.Public/Buffer/BufferSystem.cpp | 1 - Gems/Atom/RPI/Code/Source/RPI.Public/Culling.cpp | 1 - .../RPI/Code/Source/RPI.Public/Image/ImageSystem.cpp | 1 - .../Code/Source/RPI.Public/Image/StreamingImage.cpp | 3 +-- .../RPI.Public/Image/StreamingImageController.cpp | 7 ++++--- .../Source/RPI.Public/Image/StreamingImagePool.cpp | 3 +-- .../RPI/Code/Source/RPI.Public/Material/Material.cpp | 5 ++--- Gems/Atom/RPI/Code/Source/RPI.Public/Model/Model.cpp | 1 - .../RPI/Code/Source/RPI.Public/Model/ModelLod.cpp | 5 ++--- .../RPI/Code/Source/RPI.Public/Pass/PassSystem.cpp | 1 - Gems/Atom/RPI/Code/Source/RPI.Public/RPISystem.cpp | 1 - Gems/Atom/RPI/Code/Source/RPI.Public/Scene.cpp | 1 - .../Source/RPI.Public/Shader/ShaderResourceGroup.cpp | 3 +-- .../RPI.Reflect/Material/LuaMaterialFunctor.cpp | 6 ++---- .../RPI/Code/Source/RPI.Reflect/Model/ModelAsset.cpp | 3 +-- .../RPI/Code/Tests.Builders/BuilderTestFixture.h | 1 + .../DiffuseProbeGridComponentController.cpp | 1 - .../Code/Source/Mesh/MeshComponentController.cpp | 1 - .../OcclusionCullingPlaneComponentController.cpp | 1 - .../ReflectionProbeComponentController.cpp | 1 - .../Code/Rendering/HairFeatureProcessor.cpp | 2 -- Gems/AtomTressFX/Code/Rendering/HairRenderObject.cpp | 4 +--- Gems/Profiler/Code/Source/CpuProfiler.h | 1 - 129 files changed, 92 insertions(+), 261 deletions(-) diff --git a/Code/Framework/AzFramework/AzFramework/Asset/AssetSystemComponent.cpp b/Code/Framework/AzFramework/AzFramework/Asset/AssetSystemComponent.cpp index 3db19c53ee..6c4d28eefc 100644 --- a/Code/Framework/AzFramework/AzFramework/Asset/AssetSystemComponent.cpp +++ b/Code/Framework/AzFramework/AzFramework/Asset/AssetSystemComponent.cpp @@ -17,7 +17,6 @@ #include #include #include -#include #include #include @@ -28,6 +27,8 @@ #include #include +AZ_DECLARE_BUDGET(AzFramework); + namespace AzFramework { namespace AssetBenchmark @@ -302,7 +303,7 @@ namespace AzFramework // SystemTickBus overrides void AssetSystemComponent::OnSystemTick() { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(AzFramework); LegacyAssetEventBus::ExecuteQueuedEvents(); } diff --git a/Code/Legacy/CrySystem/System.cpp b/Code/Legacy/CrySystem/System.cpp index 6b985a3f6f..a2f19f6d1c 100644 --- a/Code/Legacy/CrySystem/System.cpp +++ b/Code/Legacy/CrySystem/System.cpp @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -24,7 +25,6 @@ #include #include #include -#include #include #include #include @@ -34,6 +34,7 @@ #include #include +AZ_DEFINE_BUDGET(CrySystem); #if defined(AZ_RESTRICTED_PLATFORM) #undef AZ_RESTRICTED_SECTION @@ -525,7 +526,7 @@ void CSystem::SleepIfNeeded() int sleepMS = (int)(1000.0f * sleepTime + 0.5f); if (sleepMS > 0) { - AZ_PROFILE_FUNCTION(System); + AZ_PROFILE_FUNCTION(CrySystem); Sleep(sleepMS); } @@ -564,7 +565,7 @@ bool CSystem::UpdatePreTickBus(int updateFlags, int nPauseMode) _mm_setcsr(_mm_getcsr() & ~0x280 | (g_cvars.sys_float_exceptions > 0 ? 0 : 0x280)); #endif //WIN32 - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(CrySystem); #ifndef EXCLUDE_UPDATE_ON_CONSOLE if (m_pUserCallback) diff --git a/Code/Legacy/CrySystem/SystemEventDispatcher.cpp b/Code/Legacy/CrySystem/SystemEventDispatcher.cpp index 8e4e36b453..b29f5ab752 100644 --- a/Code/Legacy/CrySystem/SystemEventDispatcher.cpp +++ b/Code/Legacy/CrySystem/SystemEventDispatcher.cpp @@ -9,7 +9,8 @@ #include "CrySystem_precompiled.h" #include "SystemEventDispatcher.h" -#include + +AZ_DECLARE_BUDGET(CrySystem); CSystemEventDispatcher::CSystemEventDispatcher() : m_listeners(0) @@ -72,7 +73,7 @@ void CSystemEventDispatcher::OnSystemEvent(ESystemEvent event, UINT_PTR wparam, ////////////////////////////////////////////////////////////////////////// void CSystemEventDispatcher::Update() { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(CrySystem); assert(gEnv && gEnv->mMainThreadId == CryGetCurrentThreadId()); SEventParams params; diff --git a/Gems/AWSCore/Code/Tests/Editor/Attribution/AWSCoreAttributionManagerTest.cpp b/Gems/AWSCore/Code/Tests/Editor/Attribution/AWSCoreAttributionManagerTest.cpp index 37a8c0f6d4..e996e0b9c0 100644 --- a/Gems/AWSCore/Code/Tests/Editor/Attribution/AWSCoreAttributionManagerTest.cpp +++ b/Gems/AWSCore/Code/Tests/Editor/Attribution/AWSCoreAttributionManagerTest.cpp @@ -26,6 +26,7 @@ #include #include #include +#include #include #include diff --git a/Gems/Atom/Feature/Common/Code/Source/ACES/AcesDisplayMapperFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/ACES/AcesDisplayMapperFeatureProcessor.cpp index c6c41edb31..50fc8cafef 100644 --- a/Gems/Atom/Feature/Common/Code/Source/ACES/AcesDisplayMapperFeatureProcessor.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/ACES/AcesDisplayMapperFeatureProcessor.cpp @@ -16,7 +16,6 @@ #include #include -#include #include namespace @@ -81,7 +80,7 @@ namespace AZ::Render void AcesDisplayMapperFeatureProcessor::Simulate(const FeatureProcessor::SimulatePacket& packet) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(AzRender); AZ_UNUSED(packet); } diff --git a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawQueue.cpp b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawQueue.cpp index 5cc43e9013..81ce82b70d 100644 --- a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawQueue.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomDrawQueue.cpp @@ -11,7 +11,6 @@ #include -#include #include #include #include diff --git a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomFeatureProcessor.cpp index a4720ad131..8de0fdfea8 100644 --- a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomFeatureProcessor.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/AuxGeomFeatureProcessor.cpp @@ -16,8 +16,6 @@ #include -#include - namespace AZ { namespace Render diff --git a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/FixedShapeProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/FixedShapeProcessor.cpp index 2e7c0759db..076c2044b5 100644 --- a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/FixedShapeProcessor.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/FixedShapeProcessor.cpp @@ -9,7 +9,6 @@ #include "FixedShapeProcessor.h" #include "AuxGeomDrawProcessorShared.h" -#include #include #include diff --git a/Gems/Atom/Feature/Common/Code/Source/CoreLights/CapsuleLightFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/CoreLights/CapsuleLightFeatureProcessor.cpp index bbea462ac8..b279d7106f 100644 --- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/CapsuleLightFeatureProcessor.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/CapsuleLightFeatureProcessor.cpp @@ -8,8 +8,6 @@ #include -#include - #include #include diff --git a/Gems/Atom/Feature/Common/Code/Source/CoreLights/DirectionalLightFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/CoreLights/DirectionalLightFeatureProcessor.cpp index 8a1ff95f29..ee60ff412a 100644 --- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/DirectionalLightFeatureProcessor.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/DirectionalLightFeatureProcessor.cpp @@ -23,7 +23,6 @@ #include #include #include -#include #include namespace AZ diff --git a/Gems/Atom/Feature/Common/Code/Source/CoreLights/DiskLightFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/CoreLights/DiskLightFeatureProcessor.cpp index e362ee3afc..168a7ea00a 100644 --- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/DiskLightFeatureProcessor.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/DiskLightFeatureProcessor.cpp @@ -8,8 +8,6 @@ #include -#include - #include #include #include diff --git a/Gems/Atom/Feature/Common/Code/Source/CoreLights/PointLightFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/CoreLights/PointLightFeatureProcessor.cpp index c5d6c3bf78..9df176f82d 100644 --- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/PointLightFeatureProcessor.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/PointLightFeatureProcessor.cpp @@ -8,8 +8,6 @@ #include -#include - #include #include diff --git a/Gems/Atom/Feature/Common/Code/Source/CoreLights/PolygonLightFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/CoreLights/PolygonLightFeatureProcessor.cpp index f3c05eeeec..1fb22024af 100644 --- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/PolygonLightFeatureProcessor.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/PolygonLightFeatureProcessor.cpp @@ -9,8 +9,6 @@ #include #include -#include - #include #include diff --git a/Gems/Atom/Feature/Common/Code/Source/CoreLights/QuadLightFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/CoreLights/QuadLightFeatureProcessor.cpp index 787e150646..66e22c3106 100644 --- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/QuadLightFeatureProcessor.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/QuadLightFeatureProcessor.cpp @@ -9,8 +9,6 @@ #include #include -#include - #include #include diff --git a/Gems/Atom/Feature/Common/Code/Source/CoreLights/SimplePointLightFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/CoreLights/SimplePointLightFeatureProcessor.cpp index bc13d3d508..60cf3a0353 100644 --- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/SimplePointLightFeatureProcessor.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/SimplePointLightFeatureProcessor.cpp @@ -8,8 +8,6 @@ #include -#include - #include #include diff --git a/Gems/Atom/Feature/Common/Code/Source/CoreLights/SimpleSpotLightFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/CoreLights/SimpleSpotLightFeatureProcessor.cpp index 49b7f7d12c..c9826761d8 100644 --- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/SimpleSpotLightFeatureProcessor.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/SimpleSpotLightFeatureProcessor.cpp @@ -8,8 +8,6 @@ #include -#include - #include #include diff --git a/Gems/Atom/Feature/Common/Code/Source/Decals/DecalFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/Decals/DecalFeatureProcessor.cpp index f00c902a73..8e446435fa 100644 --- a/Gems/Atom/Feature/Common/Code/Source/Decals/DecalFeatureProcessor.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/Decals/DecalFeatureProcessor.cpp @@ -8,8 +8,6 @@ #include -#include - #include #include diff --git a/Gems/Atom/Feature/Common/Code/Source/Decals/DecalTextureArrayFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/Decals/DecalTextureArrayFeatureProcessor.cpp index e9bc1a1277..393104907a 100644 --- a/Gems/Atom/Feature/Common/Code/Source/Decals/DecalTextureArrayFeatureProcessor.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/Decals/DecalTextureArrayFeatureProcessor.cpp @@ -7,7 +7,6 @@ */ #include -#include #include #include #include diff --git a/Gems/Atom/Feature/Common/Code/Source/ImGui/ImGuiPass.cpp b/Gems/Atom/Feature/Common/Code/Source/ImGui/ImGuiPass.cpp index 7197b95917..ebc5e1724e 100644 --- a/Gems/Atom/Feature/Common/Code/Source/ImGui/ImGuiPass.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/ImGui/ImGuiPass.cpp @@ -29,8 +29,6 @@ #include -#include - namespace AZ { namespace Render diff --git a/Gems/Atom/Feature/Common/Code/Source/ImageBasedLights/ImageBasedLightFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/ImageBasedLights/ImageBasedLightFeatureProcessor.cpp index 6a2eda8f22..b8d6d323c3 100644 --- a/Gems/Atom/Feature/Common/Code/Source/ImageBasedLights/ImageBasedLightFeatureProcessor.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/ImageBasedLights/ImageBasedLightFeatureProcessor.cpp @@ -11,8 +11,6 @@ #include #include -#include - namespace AZ { namespace Render diff --git a/Gems/Atom/Feature/Common/Code/Source/Mesh/MeshFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/Mesh/MeshFeatureProcessor.cpp index 112eff64a8..2ac44e17da 100644 --- a/Gems/Atom/Feature/Common/Code/Source/Mesh/MeshFeatureProcessor.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/Mesh/MeshFeatureProcessor.cpp @@ -24,7 +24,6 @@ #include #include -#include #include #include #include diff --git a/Gems/Atom/Feature/Common/Code/Source/PostProcess/Bloom/BloomSettings.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcess/Bloom/BloomSettings.cpp index ecc1683bc4..d7314bc574 100644 --- a/Gems/Atom/Feature/Common/Code/Source/PostProcess/Bloom/BloomSettings.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/PostProcess/Bloom/BloomSettings.cpp @@ -7,7 +7,6 @@ */ -#include #include #include diff --git a/Gems/Atom/Feature/Common/Code/Source/PostProcess/DepthOfField/DepthOfFieldSettings.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcess/DepthOfField/DepthOfFieldSettings.cpp index 98b527868d..2869408080 100644 --- a/Gems/Atom/Feature/Common/Code/Source/PostProcess/DepthOfField/DepthOfFieldSettings.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/PostProcess/DepthOfField/DepthOfFieldSettings.cpp @@ -7,7 +7,6 @@ */ -#include #include #include diff --git a/Gems/Atom/Feature/Common/Code/Source/PostProcess/ExposureControl/ExposureControlSettings.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcess/ExposureControl/ExposureControlSettings.cpp index 26c2a61d54..5f52fb02a7 100644 --- a/Gems/Atom/Feature/Common/Code/Source/PostProcess/ExposureControl/ExposureControlSettings.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/PostProcess/ExposureControl/ExposureControlSettings.cpp @@ -6,7 +6,6 @@ * */ -#include #include #include diff --git a/Gems/Atom/Feature/Common/Code/Source/PostProcess/LookModification/LookModificationSettings.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcess/LookModification/LookModificationSettings.cpp index cbc357db61..fb56ce8c55 100644 --- a/Gems/Atom/Feature/Common/Code/Source/PostProcess/LookModification/LookModificationSettings.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/PostProcess/LookModification/LookModificationSettings.cpp @@ -6,7 +6,6 @@ * */ -#include #include #include diff --git a/Gems/Atom/Feature/Common/Code/Source/PostProcess/PostProcessFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcess/PostProcessFeatureProcessor.cpp index c8e683e1d1..1979e56180 100644 --- a/Gems/Atom/Feature/Common/Code/Source/PostProcess/PostProcessFeatureProcessor.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/PostProcess/PostProcessFeatureProcessor.cpp @@ -15,8 +15,6 @@ // Using ebus as a temporary workaround #include -#include - namespace AZ { namespace Render diff --git a/Gems/Atom/Feature/Common/Code/Source/PostProcess/Ssao/SsaoSettings.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcess/Ssao/SsaoSettings.cpp index 14b50d7c88..1975b3a73f 100644 --- a/Gems/Atom/Feature/Common/Code/Source/PostProcess/Ssao/SsaoSettings.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/PostProcess/Ssao/SsaoSettings.cpp @@ -7,7 +7,6 @@ */ -#include #include #include diff --git a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/ExposureControlRenderProxy.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/ExposureControlRenderProxy.cpp index 924af4ab98..49e2db810a 100644 --- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/ExposureControlRenderProxy.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/ExposureControlRenderProxy.cpp @@ -15,7 +15,6 @@ #include -#include #include #include diff --git a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAAFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAAFeatureProcessor.cpp index ad059fbec0..afe8aa0079 100644 --- a/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAAFeatureProcessor.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/PostProcessing/SMAAFeatureProcessor.cpp @@ -12,8 +12,6 @@ #include #include -#include - #include #include @@ -66,7 +64,7 @@ namespace AZ void SMAAFeatureProcessor::Simulate(const FeatureProcessor::SimulatePacket& packet) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(AzRender); AZ_UNUSED(packet); } diff --git a/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingFeatureProcessor.cpp index af53fc3ce1..b3bcd44d88 100644 --- a/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingFeatureProcessor.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/RayTracing/RayTracingFeatureProcessor.cpp @@ -7,7 +7,6 @@ */ #include -#include #include #include #include diff --git a/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.cpp b/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.cpp index 4ac5782b04..77031ca3af 100644 --- a/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.cpp @@ -7,7 +7,6 @@ */ #include -#include #include #include #include diff --git a/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbeFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbeFeatureProcessor.cpp index e9038858ad..0f9356428a 100644 --- a/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbeFeatureProcessor.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbeFeatureProcessor.cpp @@ -17,8 +17,6 @@ #include #include #include -#include - namespace AZ { namespace Render diff --git a/Gems/Atom/Feature/Common/Code/Source/ScreenSpace/DeferredFogSettings.cpp b/Gems/Atom/Feature/Common/Code/Source/ScreenSpace/DeferredFogSettings.cpp index 4cde65b9da..fff1c41150 100644 --- a/Gems/Atom/Feature/Common/Code/Source/ScreenSpace/DeferredFogSettings.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/ScreenSpace/DeferredFogSettings.cpp @@ -6,7 +6,6 @@ * */ -#include #include #include diff --git a/Gems/Atom/Feature/Common/Code/Source/Shadows/ProjectedShadowFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/Shadows/ProjectedShadowFeatureProcessor.cpp index c0cc93d7e0..17866cdd1c 100644 --- a/Gems/Atom/Feature/Common/Code/Source/Shadows/ProjectedShadowFeatureProcessor.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/Shadows/ProjectedShadowFeatureProcessor.cpp @@ -8,7 +8,6 @@ #include -#include #include #include #include diff --git a/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshFeatureProcessor.cpp index c135b017fa..37b18291dc 100644 --- a/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshFeatureProcessor.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshFeatureProcessor.cpp @@ -25,7 +25,6 @@ #include -#include #include #include #include diff --git a/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshRenderProxy.cpp b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshRenderProxy.cpp index c9bfebe25b..2f8ccc12ed 100644 --- a/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshRenderProxy.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshRenderProxy.cpp @@ -18,8 +18,6 @@ #include #include -#include - namespace AZ { namespace Render @@ -35,7 +33,7 @@ namespace AZ bool SkinnedMeshRenderProxy::Init(const RPI::Scene& scene, SkinnedMeshFeatureProcessor* featureProcessor) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(AzRender); if(!m_instance->m_model) { return false; diff --git a/Gems/Atom/Feature/Common/Code/Source/SkyBox/SkyBoxFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/SkyBox/SkyBoxFeatureProcessor.cpp index ca8775a073..3c85f16821 100644 --- a/Gems/Atom/Feature/Common/Code/Source/SkyBox/SkyBoxFeatureProcessor.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/SkyBox/SkyBoxFeatureProcessor.cpp @@ -8,8 +8,6 @@ #include -#include - #include #include @@ -190,7 +188,7 @@ namespace AZ void SkyBoxFeatureProcessor::Render(const FeatureProcessor::RenderPacket& packet) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(AzRender); AZ_UNUSED(packet); } diff --git a/Gems/Atom/Feature/Common/Code/Source/TransformService/TransformServiceFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/TransformService/TransformServiceFeatureProcessor.cpp index 141acbd744..54ad77d403 100644 --- a/Gems/Atom/Feature/Common/Code/Source/TransformService/TransformServiceFeatureProcessor.cpp +++ b/Gems/Atom/Feature/Common/Code/Source/TransformService/TransformServiceFeatureProcessor.cpp @@ -14,7 +14,6 @@ #include #include -#include #include namespace AZ diff --git a/Gems/Atom/RHI/Code/Include/Atom/RHI/MemorySubAllocator.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/MemorySubAllocator.h index 3e464a6974..23caed3031 100644 --- a/Gems/Atom/RHI/Code/Include/Atom/RHI/MemorySubAllocator.h +++ b/Gems/Atom/RHI/Code/Include/Atom/RHI/MemorySubAllocator.h @@ -12,8 +12,6 @@ #include #include -#include - namespace AZ { namespace RHI @@ -96,7 +94,7 @@ namespace AZ template typename MemorySubAllocator::memory_allocation MemorySubAllocator::Allocate(size_t sizeInBytes, size_t alignmentInBytes) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); if (RHI::AlignUp(sizeInBytes, alignmentInBytes) > m_descriptor.m_capacityInBytes) { return memory_allocation(); diff --git a/Gems/Atom/RHI/Code/Source/RHI/AliasedHeap.cpp b/Gems/Atom/RHI/Code/Source/RHI/AliasedHeap.cpp index 3e1c94b23d..f3afbabbe2 100644 --- a/Gems/Atom/RHI/Code/Source/RHI/AliasedHeap.cpp +++ b/Gems/Atom/RHI/Code/Source/RHI/AliasedHeap.cpp @@ -13,7 +13,6 @@ #include #include #include -#include #include namespace AZ diff --git a/Gems/Atom/RHI/Code/Source/RHI/BufferPool.cpp b/Gems/Atom/RHI/Code/Source/RHI/BufferPool.cpp index 94b0b57c37..e1863ba085 100644 --- a/Gems/Atom/RHI/Code/Source/RHI/BufferPool.cpp +++ b/Gems/Atom/RHI/Code/Source/RHI/BufferPool.cpp @@ -8,8 +8,6 @@ #include #include -#include - namespace AZ { namespace RHI @@ -119,7 +117,7 @@ namespace AZ ResultCode BufferPool::InitBuffer(const BufferInitRequest& initRequest) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); if (!ValidateInitRequest(initRequest)) { @@ -168,7 +166,7 @@ namespace AZ ResultCode BufferPool::MapBuffer(const BufferMapRequest& request, BufferMapResponse& response) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); if (!ValidateIsInitialized() || !ValidateNotProcessingFrame()) { diff --git a/Gems/Atom/RHI/Code/Source/RHI/CommandListValidator.cpp b/Gems/Atom/RHI/Code/Source/RHI/CommandListValidator.cpp index f885a86800..58c2136e2f 100644 --- a/Gems/Atom/RHI/Code/Source/RHI/CommandListValidator.cpp +++ b/Gems/Atom/RHI/Code/Source/RHI/CommandListValidator.cpp @@ -19,8 +19,6 @@ #include #include #include -#include - namespace AZ { namespace RHI @@ -31,7 +29,7 @@ namespace AZ { return; } - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); AZ_Assert(m_scope == nullptr, "BeginScope called twice."); m_scope = &scope; @@ -58,7 +56,7 @@ namespace AZ { return true; } - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); ValidateViewContext context; context.m_scopeName = m_scope->GetId().GetCStr(); context.m_srgName = shaderResourceGroup.GetName().GetCStr(); diff --git a/Gems/Atom/RHI/Code/Source/RHI/Device.cpp b/Gems/Atom/RHI/Code/Source/RHI/Device.cpp index c8497cf7b1..38abdd6968 100644 --- a/Gems/Atom/RHI/Code/Source/RHI/Device.cpp +++ b/Gems/Atom/RHI/Code/Source/RHI/Device.cpp @@ -9,7 +9,6 @@ #include #include -#include #include namespace AZ @@ -112,7 +111,7 @@ namespace AZ ResultCode Device::BeginFrame() { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); if (ValidateIsInitialized() && ValidateIsNotInFrame()) { diff --git a/Gems/Atom/RHI/Code/Source/RHI/FrameGraph.cpp b/Gems/Atom/RHI/Code/Source/RHI/FrameGraph.cpp index e4e1a887b0..25158b1b3d 100644 --- a/Gems/Atom/RHI/Code/Source/RHI/FrameGraph.cpp +++ b/Gems/Atom/RHI/Code/Source/RHI/FrameGraph.cpp @@ -17,8 +17,6 @@ #include #include #include -#include -#include namespace AZ { @@ -61,7 +59,7 @@ namespace AZ void FrameGraph::Begin() { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); AZ_Assert(m_isBuilding == false, "FrameGraph::Begin called, but End was never called on the previous build cycle!"); AZ_Assert(m_isCompiled == false, "FrameGraph::Clear must be called before reuse."); diff --git a/Gems/Atom/RHI/Code/Source/RHI/FrameGraphAttachmentDatabase.cpp b/Gems/Atom/RHI/Code/Source/RHI/FrameGraphAttachmentDatabase.cpp index 388277ff59..f33aebaee5 100644 --- a/Gems/Atom/RHI/Code/Source/RHI/FrameGraphAttachmentDatabase.cpp +++ b/Gems/Atom/RHI/Code/Source/RHI/FrameGraphAttachmentDatabase.cpp @@ -12,8 +12,6 @@ #include #include #include -#include - namespace AZ { namespace RHI diff --git a/Gems/Atom/RHI/Code/Source/RHI/FrameGraphCompiler.cpp b/Gems/Atom/RHI/Code/Source/RHI/FrameGraphCompiler.cpp index d06ec002e4..347d47d19a 100644 --- a/Gems/Atom/RHI/Code/Source/RHI/FrameGraphCompiler.cpp +++ b/Gems/Atom/RHI/Code/Source/RHI/FrameGraphCompiler.cpp @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include @@ -288,7 +287,7 @@ namespace AZ return; } - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); /** * Each attachment declares which queue classes it can be used on. We require that the first scope be on the most diff --git a/Gems/Atom/RHI/Code/Source/RHI/FrameGraphExecuter.cpp b/Gems/Atom/RHI/Code/Source/RHI/FrameGraphExecuter.cpp index 6888531b67..7599e9c8f6 100644 --- a/Gems/Atom/RHI/Code/Source/RHI/FrameGraphExecuter.cpp +++ b/Gems/Atom/RHI/Code/Source/RHI/FrameGraphExecuter.cpp @@ -10,8 +10,6 @@ #include #include #include -#include - namespace AZ { namespace RHI diff --git a/Gems/Atom/RHI/Code/Source/RHI/FrameGraphLogger.cpp b/Gems/Atom/RHI/Code/Source/RHI/FrameGraphLogger.cpp index 7b96352eca..57455e43f4 100644 --- a/Gems/Atom/RHI/Code/Source/RHI/FrameGraphLogger.cpp +++ b/Gems/Atom/RHI/Code/Source/RHI/FrameGraphLogger.cpp @@ -11,7 +11,6 @@ #include #include #include -#include #include namespace AZ diff --git a/Gems/Atom/RHI/Code/Source/RHI/FrameScheduler.cpp b/Gems/Atom/RHI/Code/Source/RHI/FrameScheduler.cpp index eb4fb46cc9..482834a2ed 100644 --- a/Gems/Atom/RHI/Code/Source/RHI/FrameScheduler.cpp +++ b/Gems/Atom/RHI/Code/Source/RHI/FrameScheduler.cpp @@ -24,7 +24,6 @@ #include #include -#include #include #include #include diff --git a/Gems/Atom/RHI/Code/Source/RHI/ResourceView.cpp b/Gems/Atom/RHI/Code/Source/RHI/ResourceView.cpp index 2b769a7e31..f64a29bb8c 100644 --- a/Gems/Atom/RHI/Code/Source/RHI/ResourceView.cpp +++ b/Gems/Atom/RHI/Code/Source/RHI/ResourceView.cpp @@ -8,8 +8,6 @@ #include #include -#include - namespace AZ { namespace RHI @@ -57,7 +55,7 @@ namespace AZ ResultCode ResourceView::OnResourceInvalidate() { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); ResultCode resultCode = InvalidateInternal(); if (resultCode == ResultCode::Success) { diff --git a/Gems/Atom/RHI/Code/Source/RHI/Scope.cpp b/Gems/Atom/RHI/Code/Source/RHI/Scope.cpp index 63bb44453a..472309929e 100644 --- a/Gems/Atom/RHI/Code/Source/RHI/Scope.cpp +++ b/Gems/Atom/RHI/Code/Source/RHI/Scope.cpp @@ -10,8 +10,6 @@ #include #include -#include - namespace AZ { namespace RHI @@ -90,7 +88,7 @@ namespace AZ void Scope::QueueResourcePoolResolves(ResourcePoolDatabase& resourcePoolDatabase) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); const auto queuePoolResolverFunction = [this](ResourcePoolResolver* poolResolver) { diff --git a/Gems/Atom/RHI/Code/Source/RHI/ShaderResourceGroupInvalidateRegistry.cpp b/Gems/Atom/RHI/Code/Source/RHI/ShaderResourceGroupInvalidateRegistry.cpp index a35f73df91..0791fdd34e 100644 --- a/Gems/Atom/RHI/Code/Source/RHI/ShaderResourceGroupInvalidateRegistry.cpp +++ b/Gems/Atom/RHI/Code/Source/RHI/ShaderResourceGroupInvalidateRegistry.cpp @@ -7,8 +7,6 @@ */ #include #include -#include - namespace AZ { namespace RHI @@ -60,7 +58,7 @@ namespace AZ ResultCode ShaderResourceGroupInvalidateRegistry::OnResourceInvalidate() { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); AZ_Assert(m_compileGroupFunction, "No compile function set"); const Resource* resource = *ResourceInvalidateBus::GetCurrentBusId(); diff --git a/Gems/Atom/RHI/Code/Source/RHI/ShaderResourceGroupPool.cpp b/Gems/Atom/RHI/Code/Source/RHI/ShaderResourceGroupPool.cpp index eb80b038eb..3209a30f1a 100644 --- a/Gems/Atom/RHI/Code/Source/RHI/ShaderResourceGroupPool.cpp +++ b/Gems/Atom/RHI/Code/Source/RHI/ShaderResourceGroupPool.cpp @@ -8,8 +8,6 @@ #include #include #include -#include - namespace AZ { namespace RHI @@ -250,7 +248,7 @@ namespace AZ void ShaderResourceGroupPool::CompileGroupsForInterval(Interval interval) { - AZ_TRACE_METHOD_NAME("CompileGroupsForInterval"); + AZ_PROFILE_SCOPE(RHI, "CompileGroupsForInterval"); AZ_Assert(m_isCompiling, "You must call CompileGroupsBegin() first!"); AZ_Assert( diff --git a/Gems/Atom/RHI/Code/Source/RHI/StreamingImagePool.cpp b/Gems/Atom/RHI/Code/Source/RHI/StreamingImagePool.cpp index 6d67fa7844..6db8da3b55 100644 --- a/Gems/Atom/RHI/Code/Source/RHI/StreamingImagePool.cpp +++ b/Gems/Atom/RHI/Code/Source/RHI/StreamingImagePool.cpp @@ -7,8 +7,6 @@ */ #include -#include - namespace AZ { namespace RHI @@ -74,7 +72,7 @@ namespace AZ ResultCode StreamingImagePool::Init(Device& device, const StreamingImagePoolDescriptor& descriptor) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); return ResourcePool::Init( device, descriptor, @@ -93,7 +91,7 @@ namespace AZ ResultCode StreamingImagePool::InitImage(const StreamingImageInitRequest& initRequest) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); if (!ValidateIsInitialized()) { diff --git a/Gems/Atom/RHI/Code/Source/RHI/SwapChain.cpp b/Gems/Atom/RHI/Code/Source/RHI/SwapChain.cpp index 074eedf1b6..6140bf545d 100644 --- a/Gems/Atom/RHI/Code/Source/RHI/SwapChain.cpp +++ b/Gems/Atom/RHI/Code/Source/RHI/SwapChain.cpp @@ -8,8 +8,6 @@ #include #include #include -#include - namespace AZ { namespace RHI @@ -185,7 +183,7 @@ namespace AZ void SwapChain::Present() { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); // Due to swapchain recreation, the images are refreshed. // There is no need to present swapchain for this frame. const uint32_t imageCount = aznumeric_cast(m_images.size()); diff --git a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermathGpuCrashTracker_Windows.cpp b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermathGpuCrashTracker_Windows.cpp index 368ad5f4d0..e94ddcd7c7 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermathGpuCrashTracker_Windows.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermathGpuCrashTracker_Windows.cpp @@ -12,8 +12,6 @@ #include #include #include -#include - #if defined(USE_NSIGHT_AFTERMATH) GpuCrashTracker::~GpuCrashTracker() { diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasedHeap.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasedHeap.cpp index d45c58e24c..c988c4e14e 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasedHeap.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasedHeap.cpp @@ -14,7 +14,6 @@ #include #include #include -#include #include namespace AZ diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferMemoryAllocator.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferMemoryAllocator.cpp index d0e7d5364e..f03c5f32a8 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferMemoryAllocator.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferMemoryAllocator.cpp @@ -10,7 +10,6 @@ #include #include -#include namespace AZ { @@ -82,7 +81,7 @@ namespace AZ BufferMemoryView BufferMemoryAllocator::Allocate(size_t sizeInBytes, size_t overrideSubAllocAlignment) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); BufferMemoryView bufferMemoryView; @@ -141,7 +140,7 @@ namespace AZ BufferMemoryView BufferMemoryAllocator::AllocateUnique(const RHI::BufferDescriptor& bufferDescriptor) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); const size_t alignedSize = RHI::AlignUp(bufferDescriptor.m_byteCount, Alignment::CommittedBuffer); diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferPool.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferPool.cpp index c7b78a3945..ce09556767 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferPool.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferPool.cpp @@ -14,7 +14,6 @@ #include #include #include -#include #include #include @@ -54,7 +53,7 @@ namespace AZ CpuVirtualAddress MapBuffer(const RHI::BufferMapRequest& request) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); MemoryView stagingMemory = m_device->AcquireStagingMemory(request.m_byteCount, Alignment::Buffer); @@ -247,7 +246,7 @@ namespace AZ RHI::ResultCode BufferPool::InitBufferInternal(RHI::Buffer& bufferBase, const RHI::BufferDescriptor& bufferDescriptor) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); // We need respect the buffer's alignment if the buffer is used for SRV or UAV bool useBufferAlignment = RHI::CheckBitsAny(bufferDescriptor.m_bindFlags, @@ -307,7 +306,7 @@ namespace AZ RHI::ResultCode BufferPool::MapBufferInternal(const RHI::BufferMapRequest& request, RHI::BufferMapResponse& response) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); const RHI::BufferPoolDescriptor& poolDescriptor = GetDescriptor(); Buffer& buffer = *static_cast(request.m_buffer); diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.cpp index 1ee35c513a..0d4cabc43f 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.cpp @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include @@ -563,7 +562,7 @@ namespace AZ return; } - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); D3D12_VIEWPORT dx12Viewports[D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE]; const auto& viewports = m_state.m_viewportState.m_states; @@ -588,7 +587,7 @@ namespace AZ return; } - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); D3D12_RECT dx12Scissors[D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE]; const auto& scissors = m_state.m_scissorState.m_states; diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListPool.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListPool.cpp index 20021e71ba..a84e34a811 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListPool.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListPool.cpp @@ -9,8 +9,6 @@ #include #include #include -#include - namespace AZ { namespace DX12 @@ -28,7 +26,7 @@ namespace AZ RHI::Ptr CommandAllocatorFactory::CreateObject() { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); Microsoft::WRL::ComPtr allocator; AssertSuccess(m_descriptor.m_dx12Device->CreateCommandAllocator( ConvertHardwareQueueClass(m_descriptor.m_hardwareQueueClass), @@ -39,7 +37,7 @@ namespace AZ void CommandAllocatorFactory::ResetObject(ID3D12CommandAllocator& allocator) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); allocator.Reset(); } diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/Device.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/Device.cpp index 3d44e56953..fc4ac81b41 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Device.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Device.cpp @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include @@ -191,7 +190,7 @@ namespace AZ void Device::EndFrameInternal() { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); m_commandQueueContext.End(); m_commandListAllocator.Collect(); @@ -359,7 +358,7 @@ namespace AZ D3D12_RESOURCE_STATES initialState, D3D12_HEAP_TYPE heapType) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); D3D12_RESOURCE_DESC resourceDesc; ConvertImageDescriptor(imageDescriptor, resourceDesc); diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphCompiler.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphCompiler.cpp index 4ff7d581a4..d2370ae4cb 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphCompiler.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphCompiler.cpp @@ -19,8 +19,6 @@ #include #include #include -#include - // #define AZ_DX12_FRAMESCHEDULER_LOG_TRANSITIONS namespace AZ @@ -695,7 +693,7 @@ namespace AZ { Device& device = static_cast(GetDevice()); - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); CommandQueueContext& context = device.GetCommandQueueContext(); for (RHI::Scope* scopeBase : frameGraph.GetScopes()) diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuter.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuter.cpp index 156dd6e38e..2484890fea 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuter.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuter.cpp @@ -12,8 +12,6 @@ #include #include #include -#include - namespace AZ { diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/ImagePool.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/ImagePool.cpp index bbbc1ac943..7947c84736 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/ImagePool.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/ImagePool.cpp @@ -11,8 +11,6 @@ #include #include #include -#include - namespace AZ { namespace DX12 @@ -33,7 +31,7 @@ namespace AZ RHI::ResultCode UpdateImage(const RHI::ImageUpdateRequest& request, size_t& bytesTransferred) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); AZStd::lock_guard lock(m_imagePacketMutex); diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryPageAllocator.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryPageAllocator.cpp index 2715b7063b..931e3e132f 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryPageAllocator.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryPageAllocator.cpp @@ -7,8 +7,6 @@ */ #include #include -#include - namespace AZ { namespace DX12 @@ -35,7 +33,7 @@ namespace AZ return nullptr; } - AZ_TRACE_METHOD_NAME("Create Buffer Page"); + AZ_PROFILE_SCOPE(RHI, "Create Buffer Page"); D3D12_RESOURCE_STATES initialResourceState = ConvertInitialResourceState(m_descriptor.m_heapMemoryLevel, m_descriptor.m_hostMemoryAccess); if (RHI::CheckBitsAny(m_descriptor.m_bindFlags, RHI::BufferBindFlags::RayTracingAccelerationStructure)) diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryView.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryView.cpp index 6389076408..4b8604fa51 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryView.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryView.cpp @@ -8,7 +8,6 @@ #include #include -#include #include #include @@ -55,7 +54,7 @@ namespace AZ CpuVirtualAddress MemoryView::Map(RHI::HostMemoryAccess hostAccess) const { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); CpuVirtualAddress cpuAddress = nullptr; D3D12_RANGE readRange = {}; diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineState.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineState.cpp index a2876398eb..85df5dde25 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineState.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineState.cpp @@ -10,8 +10,6 @@ #include #include #include -#include - namespace AZ { namespace DX12 diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingBlas.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingBlas.cpp index 0f651f9be3..b5b4850470 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingBlas.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingBlas.cpp @@ -5,7 +5,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingPipelineState.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingPipelineState.cpp index 37f4e6b49a..24c3cf3d16 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingPipelineState.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingPipelineState.cpp @@ -10,8 +10,6 @@ #include #include #include -#include - namespace AZ { namespace DX12 diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingShaderTable.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingShaderTable.cpp index 0a9ea63d2f..efd633b3b6 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingShaderTable.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingShaderTable.cpp @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingTlas.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingTlas.cpp index 52e4aa4881..84f8daba04 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingTlas.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingTlas.cpp @@ -5,7 +5,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/Scope.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/Scope.cpp index cea072954a..fe921e0443 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Scope.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Scope.cpp @@ -20,8 +20,6 @@ #include #include #include -#include - namespace AZ { namespace DX12 @@ -305,7 +303,7 @@ namespace AZ uint32_t commandListCount) const { AZ_UNUSED(commandListCount); - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); commandList.GetValidator().BeginScope(*this); @@ -387,7 +385,7 @@ namespace AZ uint32_t commandListIndex, uint32_t commandListCount) const { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); const bool isEpilogue = (commandListIndex + 1) == commandListCount; if (isEpilogue) diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroupPool.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroupPool.cpp index 087a36dc2f..1b50f09ea3 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroupPool.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroupPool.cpp @@ -14,8 +14,6 @@ #include #include #include -#include - namespace AZ { diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/StagingMemoryAllocator.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/StagingMemoryAllocator.cpp index 337b25a793..a7e48916ad 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/StagingMemoryAllocator.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/StagingMemoryAllocator.cpp @@ -9,8 +9,6 @@ #include #include -#include - namespace AZ { namespace DX12 @@ -124,7 +122,7 @@ namespace AZ MemoryView StagingMemoryAllocator::AllocateUnique(size_t sizeInBytes) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); RHI::BufferDescriptor descriptor; descriptor.m_byteCount = sizeInBytes; MemoryView memoryView = m_device->CreateBufferCommitted(descriptor, D3D12_RESOURCE_STATE_GENERIC_READ, D3D12_HEAP_TYPE_UPLOAD); diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/StreamingImagePool.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/StreamingImagePool.cpp index add7364056..6af229cc55 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/StreamingImagePool.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/StreamingImagePool.cpp @@ -12,8 +12,6 @@ #include #include #include -#include - // NOTE: Tiled resources are currently disabled, because RenderDoc does not support them. // #define AZ_RHI_USE_TILED_RESOURCES @@ -121,7 +119,7 @@ namespace AZ D3D12_RESOURCE_ALLOCATION_INFO StreamingImagePool::GetAllocationInfo(const RHI::ImageDescriptor& imageDescriptor, uint32_t residentMipLevel) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); uint32_t alignment = GetFormatDimensionAlignment(imageDescriptor.m_format); @@ -138,9 +136,7 @@ namespace AZ RHI::ResultCode StreamingImagePool::InitInternal([[maybe_unused]] RHI::Device& deviceBase, [[maybe_unused]] const RHI::StreamingImagePoolDescriptor& descriptor) { - AZ_TRACE_METHOD(); - - + AZ_PROFILE_FUNCTION(RHI); #ifdef AZ_RHI_USE_TILED_RESOURCES { @@ -232,7 +228,7 @@ namespace AZ void StreamingImagePool::AllocatePackedImageTiles(Image& image) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); AZ_Assert(image.IsTiled(), "This method is only valid for tiled resources."); AZ_Assert(image.GetDescriptor().m_arraySize == 1, "Not implemented for image arrays."); @@ -305,7 +301,7 @@ namespace AZ RHI::ResultCode StreamingImagePool::InitImageInternal(const RHI::StreamingImageInitRequest& request) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); Image& image = static_cast(*request.m_image); diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/SystemComponent.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/SystemComponent.cpp index 1f6cea1151..17993d7c1d 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/SystemComponent.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/SystemComponent.cpp @@ -38,7 +38,6 @@ #include #include #include -#include #include namespace AZ diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/AliasedHeap.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/AliasedHeap.cpp index 440615d77f..011dc7a353 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/AliasedHeap.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/AliasedHeap.cpp @@ -8,7 +8,6 @@ #include #include #include -#include #include #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/AsyncUploadQueue.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/AsyncUploadQueue.cpp index eadd571452..f731d9e9d9 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/AsyncUploadQueue.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/AsyncUploadQueue.cpp @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include @@ -120,21 +119,21 @@ namespace AZ m_copyQueue->QueueCommand([=](void* queue) { - AZ_TRACE_METHOD_NAME("Upload Buffer"); + AZ_PROFILE_SCOPE(RHI, "Upload Buffer"); size_t pendingByteOffset = 0; size_t pendingByteCount = byteCount; CommandQueue* commandQueue = static_cast(queue); while (pendingByteCount > 0) { - AZ_TRACE_METHOD_NAME("Upload Buffer Chunk"); + AZ_PROFILE_SCOPE(RHI, "Upload Buffer Chunk"); FramePacket* framePacket = BeginFramePacket(commandQueue); const size_t bytesToCopy = AZStd::min(pendingByteCount, m_descriptor.m_stagingSizeInBytes); { - AZ_TRACE_METHOD_NAME("Copy CPU buffer"); + AZ_PROFILE_SCOPE(RHI, "Copy CPU buffer"); memcpy(framePacket->m_stagingResourceData, sourceData + pendingByteOffset, bytesToCopy); Platform::SynchronizeBufferOnCPU(framePacket->m_stagingResource, 0, bytesToCopy); } @@ -379,7 +378,7 @@ namespace AZ { AZ_Assert(!m_recordingFrame, "The previous frame packet isn't ended"); - AZ_TRACE_METHOD_NAME("AsyncUploadQueue: Wait copy frame"); + AZ_PROFILE_SCOPE(RHI, "AsyncUploadQueue: Wait copy frame"); FramePacket& framePacket = m_framePackets[m_frameIndex]; framePacket.m_fence.WaitOnCpu(); // ensure any previous uploads using this frame have completed @@ -400,7 +399,7 @@ namespace AZ { AZ_Assert(m_recordingFrame, "The frame packet wasn't started. You need to call StartFramePacket first."); - AZ_TRACE_METHOD_NAME("AsyncUploadQueue: Execute command"); + AZ_PROFILE_SCOPE(RHI, "AsyncUploadQueue: Execute command"); FramePacket& framePacket = m_framePackets[m_frameIndex]; framePacket.m_fence.SignalFromGpu(framePacket.m_mtlCommandBuffer); // signal fence when this upload haas completed diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferMemoryAllocator.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferMemoryAllocator.cpp index 7676459154..63c6dd68e4 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferMemoryAllocator.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferMemoryAllocator.cpp @@ -116,7 +116,7 @@ namespace AZ BufferMemoryView BufferMemoryAllocator::AllocateUnique(const RHI::BufferDescriptor& bufferDescriptor) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); const size_t alignedSize = RHI::AlignUp(bufferDescriptor.m_byteCount, Alignment::Buffer); RHI::HeapMemoryUsage& heapMemoryUsage = *m_descriptor.m_getHeapMemoryUsageFunction(); diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandList.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandList.cpp index 3c45e69d8b..2b8be3d1ab 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandList.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandList.cpp @@ -7,7 +7,6 @@ */ #include -#include #include #include #include @@ -177,7 +176,7 @@ namespace AZ void CommandList::Submit(const RHI::DispatchItem& dispatchItem) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); CreateEncoder(CommandEncoderType::Compute); bool bindResourceSuccessfull = CommitShaderResources(dispatchItem); @@ -479,7 +478,7 @@ namespace AZ void CommandList::Submit(const RHI::DrawItem& drawItem) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); CreateEncoder(CommandEncoderType::Render); @@ -582,7 +581,7 @@ namespace AZ { if (m_state.m_pipelineState != pipelineState) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); m_state.m_pipelineState = pipelineState; switch (pipelineState->GetType()) @@ -732,7 +731,7 @@ namespace AZ return; } - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); const auto& viewports = m_state.m_viewportState.m_states; MTLViewport metalViewports[viewports.size()]; diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandListBase.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandListBase.cpp index e386c25515..063622354b 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandListBase.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandListBase.cpp @@ -7,7 +7,6 @@ */ #include -#include #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueueCommandBuffer.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueueCommandBuffer.cpp index e2a456c81c..0cdccef01e 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueueCommandBuffer.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueueCommandBuffer.cpp @@ -7,7 +7,6 @@ */ #include -#include #include namespace AZ diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueueContext.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueueContext.cpp index 37f8a8bab8..9fa0640f64 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueueContext.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueueContext.cpp @@ -6,7 +6,6 @@ * */ -#include #include #include #include @@ -60,7 +59,7 @@ namespace AZ void CommandQueueContext::WaitForIdle() { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); for (uint32_t hardwareQueueIdx = 0; hardwareQueueIdx < RHI::HardwareQueueClassCount; ++hardwareQueueIdx) { m_commandQueues[hardwareQueueIdx]->WaitForIdle(); diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/Device.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/Device.cpp index 76af1ecab1..91d8287e8d 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Device.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Device.cpp @@ -8,7 +8,6 @@ #include #include #include -#include #include #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphCompiler.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphCompiler.cpp index 9ee000e166..568d990e6f 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphCompiler.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphCompiler.cpp @@ -7,7 +7,6 @@ */ #include -#include #include #include #include @@ -47,7 +46,7 @@ namespace AZ { Device& device = static_cast(GetDevice()); - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); CommandQueueContext& context = device.GetCommandQueueContext(); for (RHI::Scope* scopeBase : frameGraph.GetScopes()) diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuter.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuter.cpp index 73bdcde9a0..41824ced9e 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuter.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuter.cpp @@ -7,7 +7,6 @@ */ #include -#include #include #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/MemoryPageAllocator.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/MemoryPageAllocator.cpp index 619a6e5b8a..2787eef9af 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/MemoryPageAllocator.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/MemoryPageAllocator.cpp @@ -9,8 +9,6 @@ #include #include #include -#include - namespace AZ { namespace Metal @@ -29,7 +27,7 @@ namespace AZ return nullptr; } - AZ_TRACE_METHOD_NAME("Create Buffer Page"); + AZ_PROFILE_SCOPE(RHI, "Create Buffer Page"); RHI::BufferDescriptor bufferDescriptor; bufferDescriptor.m_byteCount = m_descriptor.m_pageSizeInBytes; diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineState.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineState.cpp index 8d6ab8fee3..f7cc417224 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineState.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineState.cpp @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/Scope.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/Scope.cpp index c680684efd..4a1dc8765d 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Scope.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Scope.cpp @@ -8,7 +8,6 @@ #include #include -#include #include #include #include @@ -273,7 +272,7 @@ namespace AZ AZ::u32 commandListIndex, AZ::u32 commandListCount) const { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); if(m_isWritingToSwapChainScope) { @@ -331,7 +330,7 @@ namespace AZ AZ::u32 commandListIndex, AZ::u32 commandListCount) const { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); const bool isEpilogue = (commandListIndex + 1) == commandListCount; commandList.FlushEncoder(); diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroupPool.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroupPool.cpp index 0a9c001868..654fe9e4f6 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroupPool.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroupPool.cpp @@ -6,7 +6,6 @@ * */ -#include #include #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePool.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePool.cpp index 3d90b595e4..2ae7feddb8 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePool.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePool.cpp @@ -8,7 +8,6 @@ #include #include -#include #include #include #include @@ -36,7 +35,7 @@ namespace AZ RHI::ResultCode StreamingImagePool::InitInternal(RHI::Device& deviceBase, const RHI::StreamingImagePoolDescriptor& descriptor) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); Device& device = static_cast(deviceBase); SetResolver(AZStd::make_unique(device, this)); @@ -89,7 +88,7 @@ namespace AZ RHI::ResultCode StreamingImagePool::ExpandImageInternal(const RHI::StreamingImageExpandRequest& request) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); auto& image = static_cast(*request.m_image); auto& device = static_cast(GetDevice()); diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePoolResolver.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePoolResolver.cpp index 0a9aaf60d6..3ef2dc915a 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePoolResolver.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePoolResolver.cpp @@ -6,7 +6,6 @@ * */ -#include #include #include @@ -16,7 +15,7 @@ namespace AZ { RHI::ResultCode StreamingImagePoolResolver::UpdateImage(const RHI::StreamingImageExpandRequest& request) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); Image* image = static_cast(request.m_image); const RHI::ImageDescriptor& imageDescriptor = image->GetDescriptor(); diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/SystemComponent.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/SystemComponent.cpp index 840bef2b1b..3d1583fe1b 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/SystemComponent.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/SystemComponent.cpp @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include diff --git a/Gems/Atom/RHI/Null/Code/Source/RHI/SystemComponent.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/SystemComponent.cpp index 091084b097..e329d69ddc 100644 --- a/Gems/Atom/RHI/Null/Code/Source/RHI/SystemComponent.cpp +++ b/Gems/Atom/RHI/Null/Code/Source/RHI/SystemComponent.cpp @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AliasedHeap.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AliasedHeap.cpp index c0166e95b5..8b4d179574 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AliasedHeap.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AliasedHeap.cpp @@ -16,8 +16,6 @@ #include #include #include -#include - namespace AZ { namespace Vulkan diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemoryPageAllocator.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemoryPageAllocator.cpp index a1025e5501..00b1d4211c 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemoryPageAllocator.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemoryPageAllocator.cpp @@ -8,8 +8,6 @@ #include #include #include -#include - namespace AZ { namespace Vulkan @@ -50,7 +48,7 @@ namespace AZ return nullptr; } - AZ_TRACE_METHOD_NAME("Create BufferMemory Page"); + AZ_PROFILE_SCOPE(RHI, "Create BufferMemory Page"); RHI::Ptr bufferMemory; diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandQueueContext.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandQueueContext.cpp index 9cf6dce77b..c556e85979 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandQueueContext.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandQueueContext.cpp @@ -7,7 +7,6 @@ */ #include #include -#include #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphCompiler.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphCompiler.cpp index e153ad6645..9a27d2898d 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphCompiler.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphCompiler.cpp @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryPageAllocator.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryPageAllocator.cpp index 7535b19106..c7c372ad0a 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryPageAllocator.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryPageAllocator.cpp @@ -8,8 +8,6 @@ #include #include #include -#include - namespace AZ { namespace Vulkan @@ -35,7 +33,7 @@ namespace AZ return nullptr; } - AZ_TRACE_METHOD_NAME("Create Memory Page"); + AZ_PROFILE_SCOPE(RHI, "Create Memory Page"); const VkMemoryPropertyFlags flags = ConvertHeapMemoryLevel(m_descriptor.m_heapMemoryLevel) | m_descriptor.m_additionalMemoryPropertyFlags; RHI::Ptr memory = GetDevice().AllocateMemory(sizeInBytes, m_descriptor.m_memoryTypeBits, flags); diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryTypeAllocator.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryTypeAllocator.h index 8fd083d4b9..5504e6e791 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryTypeAllocator.h +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryTypeAllocator.h @@ -10,8 +10,6 @@ #include #include #include -#include - namespace AZ { namespace Vulkan @@ -108,8 +106,7 @@ namespace AZ template View MemoryTypeAllocator::Allocate(size_t sizeInBytes, size_t alignmentInBytes, bool forceUnique /*=false*/) { - AZ_TRACE_METHOD(); - + AZ_PROFILE_FUNCTION(RHI); View memoryView; @@ -155,7 +152,7 @@ namespace AZ template View MemoryTypeAllocator::AllocateUnique(const uint64_t sizeInBytes) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RHI); auto memory = const_cast(m_pageAllocator.GetFactory()).CreateObject(sizeInBytes); if (!memory) { diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingBlas.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingBlas.cpp index 55e804aac9..333f88f8eb 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingBlas.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingBlas.cpp @@ -6,7 +6,6 @@ * */ -#include #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipelineState.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipelineState.cpp index 33623f93e4..65281d923f 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipelineState.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipelineState.cpp @@ -10,8 +10,6 @@ #include #include #include -#include - namespace AZ { namespace Vulkan diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingShaderTable.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingShaderTable.cpp index 0c5cda7008..d5ef121875 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingShaderTable.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingShaderTable.cpp @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingTlas.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingTlas.cpp index e36afd0b7a..ff6312b059 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingTlas.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingTlas.cpp @@ -6,7 +6,6 @@ * */ -#include #include #include #include diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/Buffer/Buffer.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Buffer/Buffer.cpp index 2d812c602f..96259d35c7 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Public/Buffer/Buffer.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Buffer/Buffer.cpp @@ -17,8 +17,6 @@ #include #include #include -#include - namespace AZ { namespace RPI @@ -90,7 +88,7 @@ namespace AZ RHI::ResultCode Buffer::Init(BufferAsset& bufferAsset) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RPI); RHI::ResultCode resultCode = RHI::ResultCode::Fail; @@ -140,7 +138,7 @@ namespace AZ if (bufferAsset.GetBuffer().size() > 0 && !initWithData) { - AZ_TRACE_METHOD_NAME("Stream Upload"); + AZ_PROFILE_SCOPE(RPI, "Stream Upload"); m_streamFence = RHI::Factory::Get().CreateFence(); if (m_streamFence) { diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/Buffer/BufferSystem.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Buffer/BufferSystem.cpp index 77e32cd040..cff9161c7c 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Public/Buffer/BufferSystem.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Buffer/BufferSystem.cpp @@ -16,7 +16,6 @@ #include #include -#include #include #include diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/Culling.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Culling.cpp index 9dd4cf99b1..d8525a8811 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Public/Culling.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Culling.cpp @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/Image/ImageSystem.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Image/ImageSystem.cpp index f201e8414c..2c85f85424 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Public/Image/ImageSystem.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Image/ImageSystem.cpp @@ -27,7 +27,6 @@ #include -#include #include #include #include diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/Image/StreamingImage.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Image/StreamingImage.cpp index 8629588ea2..d84cbca4e1 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Public/Image/StreamingImage.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Image/StreamingImage.cpp @@ -16,7 +16,6 @@ #include -#include #include // Enable this define to debug output streaming image initialization and expanding process. @@ -111,7 +110,7 @@ namespace AZ RHI::ResultCode StreamingImage::Init(StreamingImageAsset& imageAsset) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RPI); Data::Instance pool; if (imageAsset.GetPoolAssetId().IsValid()) diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/Image/StreamingImageController.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Image/StreamingImageController.cpp index a84d8ca9b7..bb7fff03cb 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Public/Image/StreamingImageController.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Image/StreamingImageController.cpp @@ -12,9 +12,10 @@ #include -#include #include +AZ_DECLARE_BUDGET(RPI); + namespace AZ { namespace RPI @@ -34,7 +35,7 @@ namespace AZ void StreamingImageController::AttachImage(StreamingImage* image) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RPI); AZ_Assert(image, "Image must not be null"); @@ -69,7 +70,7 @@ namespace AZ void StreamingImageController::Update() { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RPI); AZStd::lock_guard lock(m_mutex); UpdateInternal(m_timestamp, m_contexts); diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/Image/StreamingImagePool.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Image/StreamingImagePool.cpp index 5c05422dad..23ff1abb42 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Public/Image/StreamingImagePool.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Image/StreamingImagePool.cpp @@ -14,7 +14,6 @@ #include -#include #include namespace AZ @@ -43,7 +42,7 @@ namespace AZ RHI::ResultCode StreamingImagePool::Init(RHI::Device& device, StreamingImagePoolAsset& poolAsset) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RPI); if (Validation::IsEnabled()) { diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/Material/Material.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Material/Material.cpp index 63e55d379d..1f739c24f1 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Public/Material/Material.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Material/Material.cpp @@ -18,7 +18,6 @@ #include #include -#include #include #include @@ -57,7 +56,7 @@ namespace AZ RHI::ResultCode Material::Init(MaterialAsset& materialAsset) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RPI); ScopedValue isInitializing(&m_isInitializing, true, false); @@ -320,7 +319,7 @@ namespace AZ bool Material::Compile() { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RPI); if (NeedsCompile() && CanCompile()) { diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/Model/Model.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Model/Model.cpp index 6549255d7e..4f3cf52dad 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Public/Model/Model.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Model/Model.cpp @@ -11,7 +11,6 @@ #include -#include #include #include #include diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/Model/ModelLod.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Model/ModelLod.cpp index 7850aa6da2..a928aec12f 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Public/Model/ModelLod.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Model/ModelLod.cpp @@ -12,7 +12,6 @@ #include #include -#include #include namespace AZ @@ -52,7 +51,7 @@ namespace AZ RHI::ResultCode ModelLod::Init(const Data::Asset& lodAsset, const Data::Asset& modelAsset) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RPI); for (const ModelLodAsset::Mesh& mesh : lodAsset->GetMeshes()) { @@ -389,7 +388,7 @@ namespace AZ const ModelLodAsset::Mesh::StreamBufferInfo& streamBufferInfo, Mesh& meshInstance) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RPI); const Data::Asset& streamBufferAsset = streamBufferInfo.m_bufferAssetView.GetBufferAsset(); const Data::Instance& streamBuffer = Buffer::FindOrCreate(streamBufferAsset); diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassSystem.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassSystem.cpp index 39d0e879e1..da75ded4d6 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassSystem.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Pass/PassSystem.cpp @@ -9,7 +9,6 @@ #include #include #include -#include #include #include #include diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/RPISystem.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/RPISystem.cpp index 4465b8594f..3416b2895d 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Public/RPISystem.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Public/RPISystem.cpp @@ -31,7 +31,6 @@ #include #include -#include #include #include diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/Scene.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Scene.cpp index 3e501c3d93..efece58e0d 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Public/Scene.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Scene.cpp @@ -18,7 +18,6 @@ #include #include -#include #include #include #include diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/ShaderResourceGroup.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/ShaderResourceGroup.cpp index df16b5cd08..7e43fba7a3 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/ShaderResourceGroup.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Public/Shader/ShaderResourceGroup.cpp @@ -10,7 +10,6 @@ #include -#include #include namespace AZ @@ -75,7 +74,7 @@ namespace AZ RHI::ResultCode ShaderResourceGroup::Init(ShaderAsset& shaderAsset, const SupervariantIndex& supervariantIndex, const AZ::Name& srgName) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RPI); const auto& lay = shaderAsset.FindShaderResourceGroupLayout(srgName, supervariantIndex); m_layout = lay.get(); diff --git a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/LuaMaterialFunctor.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/LuaMaterialFunctor.cpp index c33409f687..4212583e60 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/LuaMaterialFunctor.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/LuaMaterialFunctor.cpp @@ -18,8 +18,6 @@ #include #include #include -#include - namespace AZ { namespace RPI @@ -123,7 +121,7 @@ namespace AZ void LuaMaterialFunctor::Process(RuntimeContext& context) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RPI); InitScriptContext(); @@ -141,7 +139,7 @@ namespace AZ void LuaMaterialFunctor::Process(EditorContext& context) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RPI); InitScriptContext(); diff --git a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelAsset.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelAsset.cpp index e362229d2d..0574803591 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelAsset.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelAsset.cpp @@ -9,7 +9,6 @@ #include #include #include -#include #include #include #include @@ -137,7 +136,7 @@ namespace AZ // For runtime approach is to do this during asset processing and serialized spatial information alongside with mesh model assets const auto jobLambda = [&]() -> void { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(RPI); AZStd::unique_ptr tree = AZStd::make_unique(); tree->Build(this); diff --git a/Gems/Atom/RPI/Code/Tests.Builders/BuilderTestFixture.h b/Gems/Atom/RPI/Code/Tests.Builders/BuilderTestFixture.h index 02e69e732c..4502d33e0b 100644 --- a/Gems/Atom/RPI/Code/Tests.Builders/BuilderTestFixture.h +++ b/Gems/Atom/RPI/Code/Tests.Builders/BuilderTestFixture.h @@ -10,6 +10,7 @@ #include #include +#include #include #include #include diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponentController.cpp index 8b864613c4..382001afd4 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponentController.cpp +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/DiffuseGlobalIllumination/DiffuseProbeGridComponentController.cpp @@ -16,7 +16,6 @@ #include #include #include -#include #include #include diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshComponentController.cpp index 12b14d8162..517ba90f89 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshComponentController.cpp +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Mesh/MeshComponentController.cpp @@ -18,7 +18,6 @@ #include #include #include -#include #include #include diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneComponentController.cpp index 4addbde3ef..a5cf1c0180 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneComponentController.cpp +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneComponentController.cpp @@ -15,7 +15,6 @@ #include #include -#include #include #include diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/ReflectionProbeComponentController.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/ReflectionProbeComponentController.cpp index 017f6c9cdf..5d33561d8a 100644 --- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/ReflectionProbeComponentController.cpp +++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/ReflectionProbe/ReflectionProbeComponentController.cpp @@ -16,7 +16,6 @@ #include #include #include -#include #include #include diff --git a/Gems/AtomTressFX/Code/Rendering/HairFeatureProcessor.cpp b/Gems/AtomTressFX/Code/Rendering/HairFeatureProcessor.cpp index 74ba99c26c..f35bce391e 100644 --- a/Gems/AtomTressFX/Code/Rendering/HairFeatureProcessor.cpp +++ b/Gems/AtomTressFX/Code/Rendering/HairFeatureProcessor.cpp @@ -9,8 +9,6 @@ #include #include #include -#include - #include #include #include diff --git a/Gems/AtomTressFX/Code/Rendering/HairRenderObject.cpp b/Gems/AtomTressFX/Code/Rendering/HairRenderObject.cpp index 4d615e31ae..fe167cae8b 100644 --- a/Gems/AtomTressFX/Code/Rendering/HairRenderObject.cpp +++ b/Gems/AtomTressFX/Code/Rendering/HairRenderObject.cpp @@ -5,8 +5,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include - #include #include @@ -958,7 +956,7 @@ namespace AZ const char* assetName, AMD::TressFXAsset* asset, AMD::TressFXSimulationSettings* simSettings, AMD::TressFXRenderingSettings* renderSettings) { - AZ_TRACE_METHOD(); + AZ_PROFILE_FUNCTION(AzRender); ++s_objectCounter; diff --git a/Gems/Profiler/Code/Source/CpuProfiler.h b/Gems/Profiler/Code/Source/CpuProfiler.h index 23130efa63..9235ac7da9 100644 --- a/Gems/Profiler/Code/Source/CpuProfiler.h +++ b/Gems/Profiler/Code/Source/CpuProfiler.h @@ -8,7 +8,6 @@ #pragma once -#include #include #include #include