From 9a5ac0a35a94a83c31f24822fb227bf4b3422280 Mon Sep 17 00:00:00 2001
From: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
Date: Thu, 14 Oct 2021 14:14:42 -0700
Subject: [PATCH] [atom_cpu_profiler_gem_promotion] removed unnecessary
 GatherCpuTimingStatistics flag from Atom

Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
---
 .../Include/Atom/RHI.Reflect/FrameSchedulerEnums.h    |  3 ---
 Gems/Atom/RHI/Code/Source/RHI/FrameScheduler.cpp      | 11 ++++-------
 .../Source/Viewport/PerformanceMonitorComponent.cpp   |  4 ----
 3 files changed, 4 insertions(+), 14 deletions(-)

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<AZ::Statistics::StatisticalProfilerProxy>::Get(); statsProfiler)
             {
-                if (auto statsProfiler = AZ::Interface<AZ::Statistics::StatisticalProfilerProxy>::Get(); statsProfiler)
-                {
-                    auto& rhiMetrics = statsProfiler->GetProfiler(rhiMetricsId);
-                    const auto* frameTimeStat = rhiMetrics.GetStatistic(frameTimeMetricId);
-                    return (frameTimeStat->GetMostRecentSample() * 1000) / aznumeric_cast<double>(AZStd::GetTimeTicksPerSecond());
-                }
+                auto& rhiMetrics = statsProfiler->GetProfiler(rhiMetricsId);
+                const auto* frameTimeStat = rhiMetrics.GetStatistic(frameTimeMetricId);
+                return (frameTimeStat->GetMostRecentSample() * 1000) / aznumeric_cast<double>(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();