From d5a496751ce06593e5704b15320e521ec84b4bc7 Mon Sep 17 00:00:00 2001 From: Jacob Hilliard Date: Tue, 13 Jul 2021 10:21:56 -0700 Subject: [PATCH] Visualizer: Implement region search + highlight Signed-off-by: Jacob Hilliard --- .../Utils/Code/Include/Atom/Utils/ImGuiCpuProfiler.h | 8 +++++--- .../Utils/Code/Include/Atom/Utils/ImGuiCpuProfiler.inl | 10 ++++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiCpuProfiler.h b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiCpuProfiler.h index 66be0b9137..4d22458b56 100644 --- a/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiCpuProfiler.h +++ b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiCpuProfiler.h @@ -165,9 +165,11 @@ namespace AZ AZStd::vector m_frameEndTicks = { INT64_MIN }; // Main data structure for storing function statistics to be shown in the popup windows. - // For now we default allocate for all regions on the first render frame and then use RegionStatistics.m_draw to determine - // if we should draw the window or not. FIXME(ATOM-15948) this should be changed once RegionStatistics gets heavier. - AZStd::unordered_map m_regionStatisticsMap; + // Uses the group name + region name as a key - just the region name does not suffice since there are collisions (ex. GarbageCollect) + AZStd::unordered_map m_regionStatisticsMap; + + // Filter for highlighting regions on the visualizer + ImGuiTextFilter m_regionHighlightFilter; }; } // namespace Render } // namespace AZ diff --git a/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiCpuProfiler.inl b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiCpuProfiler.inl index 735dace1c7..81fa440159 100644 --- a/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiCpuProfiler.inl +++ b/Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiCpuProfiler.inl @@ -279,8 +279,8 @@ namespace AZ if (ImGui::BeginChild("Options and Statistics", { 0, 0 }, true)) { ImGui::Columns(3, "Options", true); - ImGui::Text("Frames To Collect:"); - ImGui::SliderInt("", &m_framesToCollect, 10, 10000, "%d", ImGuiSliderFlags_AlwaysClamp | ImGuiSliderFlags_Logarithmic); + ImGui::SliderInt("Saved Frames", &m_framesToCollect, 10, 10000, "%d", ImGuiSliderFlags_AlwaysClamp | ImGuiSliderFlags_Logarithmic); + m_regionHighlightFilter.Draw("Find Region"); ImGui::NextColumn(); @@ -522,6 +522,12 @@ namespace AZ inline void ImGuiCpuProfiler::DrawBlock(const TimeRegion& block, u64 targetRow) { + // Don't draw anything if the user is searching for regions and this block doesn't pass the filter + if (!m_regionHighlightFilter.PassFilter(block.m_groupRegionName->m_regionName)) + { + return; + } + float wy = ImGui::GetWindowPos().y - ImGui::GetScrollY(); ImDrawList* drawList = ImGui::GetWindowDrawList();