Minor profiler fixes.

lhofhansl · lhofhansl · commit 289425f6bd6c · 2020-12-23T14:48:08.000-08:00
diff --git a/src/client/clientmap.cpp b/src/client/clientmap.cpp
@@ -290,6 +290,7 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
 	*/
 
 	u32 vertex_count = 0;
+	u32 drawcall_count = 0;
 
 	// For limiting number of mesh animations per frame
 	u32 mesh_animate_count = 0;
@@ -391,6 +392,7 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
 			}
 			driver->setMaterial(list.m);
 
+			drawcall_count += list.bufs.size();
 			for (auto &pair : list.bufs) {
 				scene::IMeshBuffer *buf = pair.second;
 
@@ -411,6 +413,7 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)
 	}
 
 	g_profiler->avg(prefix + "vertices drawn [#]", vertex_count);
+	g_profiler->avg(prefix + "drawcalls [#]", drawcall_count);
 }
 
 static bool getVisibleBrightness(Map *map, const v3f &p0, v3f dir, float step,
diff --git a/src/profiler.cpp b/src/profiler.cpp
@@ -38,7 +38,7 @@ ScopeProfiler::~ScopeProfiler()
 		return;
 
 	float duration_ms = m_timer->stop(true);
-	float duration = duration_ms / 1000.0;
+	float duration = duration_ms;
 	if (m_profiler) {
 		switch (m_type) {
 		case SPT_ADD:

Original file line number	Diff line number	Diff line change
`@@ -290,6 +290,7 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)`
`290`	`290`	`*/`
`291`	`291`
`292`	`292`	`u32 vertex_count = 0;`
	`293`	`+ u32 drawcall_count = 0;`
`293`	`294`
`294`	`295`	`// For limiting number of mesh animations per frame`
`295`	`296`	`u32 mesh_animate_count = 0;`
`@@ -391,6 +392,7 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)`
`391`	`392`	`}`
`392`	`393`	`driver->setMaterial(list.m);`
`393`	`394`
	`395`	`+ drawcall_count += list.bufs.size();`
`394`	`396`	`for (auto &pair : list.bufs) {`
`395`	`397`	`scene::IMeshBuffer *buf = pair.second;`
`396`	`398`
`@@ -411,6 +413,7 @@ void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass)`
`411`	`413`	`}`
`412`	`414`
`413`	`415`	`g_profiler->avg(prefix + "vertices drawn [#]", vertex_count);`
	`416`	`+ g_profiler->avg(prefix + "drawcalls [#]", drawcall_count);`
`414`	`417`	`}`
`415`	`418`
`416`	`419`	`static bool getVisibleBrightness(Map *map, const v3f &p0, v3f dir, float step,`