diff --git a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/FrameSchedulerEnums.h b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/FrameSchedulerEnums.h index b0c99248f1..a47e186e3b 100644 --- a/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/FrameSchedulerEnums.h +++ b/Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/FrameSchedulerEnums.h @@ -66,9 +66,6 @@ namespace AZ { None = 0, - //! Enables gathering of cpu timing statistics. - GatherCpuTimingStatistics = AZ_BIT(0), - //! Enables gathering of transient attachment statistics. GatherTransientAttachmentStatistics = AZ_BIT(2), diff --git a/Gems/Atom/RHI/Code/Source/RHI/FrameScheduler.cpp b/Gems/Atom/RHI/Code/Source/RHI/FrameScheduler.cpp index a15db9e24b..027847c35e 100644 --- a/Gems/Atom/RHI/Code/Source/RHI/FrameScheduler.cpp +++ b/Gems/Atom/RHI/Code/Source/RHI/FrameScheduler.cpp @@ -602,14 +602,11 @@ namespace AZ double FrameScheduler::GetCpuFrameTime() const { - if (CheckBitsAny(m_compileRequest.m_statisticsFlags, FrameSchedulerStatisticsFlags::GatherCpuTimingStatistics)) + if (auto statsProfiler = AZ::Interface::Get(); statsProfiler) { - if (auto statsProfiler = AZ::Interface::Get(); statsProfiler) - { - auto& rhiMetrics = statsProfiler->GetProfiler(rhiMetricsId); - const auto* frameTimeStat = rhiMetrics.GetStatistic(frameTimeMetricId); - return (frameTimeStat->GetMostRecentSample() * 1000) / aznumeric_cast(AZStd::GetTimeTicksPerSecond()); - } + auto& rhiMetrics = statsProfiler->GetProfiler(rhiMetricsId); + const auto* frameTimeStat = rhiMetrics.GetStatistic(frameTimeMetricId); + return (frameTimeStat->GetMostRecentSample() * 1000) / aznumeric_cast(AZStd::GetTimeTicksPerSecond()); } return 0; } diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/PerformanceMonitorComponent.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/PerformanceMonitorComponent.cpp index 8a82207e8d..563b2754df 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/PerformanceMonitorComponent.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/PerformanceMonitorComponent.cpp @@ -65,10 +65,6 @@ namespace MaterialEditor AZ_Error("PerformanceMonitorComponent", false, "Failed to find root pass."); } - AZ::RHI::RHISystemInterface::Get()->ModifyFrameSchedulerStatisticsFlags( - AZ::RHI::FrameSchedulerStatisticsFlags::GatherCpuTimingStatistics, - enabled); - if (enabled) { ResetStats();