From d694ee1f03aff493e451b99e6847706606842f68 Mon Sep 17 00:00:00 2001
From: Turanszki Janos <turanszkij@gmail.com>
Date: Fri, 20 Aug 2021 09:41:35 +0200
Subject: [PATCH] updated profiler timing display

---
 WickedEngine/wiProfiler.cpp | 24 ++++++++++++++++++++++--
 WickedEngine/wiVersion.cpp  |  2 +-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/WickedEngine/wiProfiler.cpp b/WickedEngine/wiProfiler.cpp
index a0ae54db5..c9ff27bb1 100644
--- a/WickedEngine/wiProfiler.cpp
+++ b/WickedEngine/wiProfiler.cpp
@@ -242,29 +242,49 @@ namespace wiProfiler
 		{
 			if (x.second.IsCPURange())
 			{
+				if (x.first == cpu_frame)
+					continue;
 				time_cache_cpu[x.second.name].num_hits++;
 				time_cache_cpu[x.second.name].total_time += x.second.time;
 			}
 			else
 			{
+				if (x.first == gpu_frame)
+					continue;
 				time_cache_gpu[x.second.name].num_hits++;
 				time_cache_gpu[x.second.name].total_time += x.second.time;
 			}
 		}
 
 		// Print CPU ranges:
+		ss << ranges[cpu_frame].name << ": " << std::fixed << ranges[cpu_frame].time << " ms" << std::endl;
 		for (auto& x : time_cache_cpu)
 		{
-			ss << x.first << " (" << x.second.num_hits << "x)" << ": " << std::fixed << x.second.total_time << " ms" << std::endl;
+			if (x.second.num_hits > 1)
+			{
+				ss << "\t" << x.first << " (" << x.second.num_hits << "x)" << ": " << std::fixed << x.second.total_time << " ms" << std::endl;
+			}
+			else
+			{
+				ss << "\t" << x.first << ": " << std::fixed << x.second.total_time << " ms" << std::endl;
+			}
 			x.second.num_hits = 0;
 			x.second.total_time = 0;
 		}
 		ss << std::endl;
 
 		// Print GPU ranges:
+		ss << ranges[gpu_frame].name << ": " << std::fixed << ranges[gpu_frame].time << " ms" << std::endl;
 		for (auto& x : time_cache_gpu)
 		{
-			ss << x.first << " (" << x.second.num_hits << "x)" << ": " << std::fixed << x.second.total_time << " ms" << std::endl;
+			if (x.second.num_hits > 1)
+			{
+				ss << "\t" << x.first << " (" << x.second.num_hits << "x)" << ": " << std::fixed << x.second.total_time << " ms" << std::endl;
+			}
+			else
+			{
+				ss << "\t" << x.first << ": " << std::fixed << x.second.total_time << " ms" << std::endl;
+			}
 			x.second.num_hits = 0;
 			x.second.total_time = 0;
 		}
diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp
index 235ac0673..0c1724b08 100644
--- a/WickedEngine/wiVersion.cpp
+++ b/WickedEngine/wiVersion.cpp
@@ -9,7 +9,7 @@ namespace wiVersion
 	// minor features, major updates, breaking compatibility changes
 	const int minor = 56;
 	// minor bug fixes, alterations, refactors, updates
-	const int revision = 84;
+	const int revision = 85;
 
 	const std::string version_string = std::to_string(major) + "." + std::to_string(minor) + "." + std::to_string(revision);