From 808a7d28cfb0ccfa4f190d5a3a52a582b9ebec4f Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 29 Apr 2020 17:44:43 +0200 Subject: [PATCH] - moved benchmark fps output to the custom part of it because it depends on game data. --- src/common/rendering/gl/gl_framebuffer.cpp | 2 +- src/common/rendering/hwrenderer/data/hw_clock.cpp | 6 ++---- src/d_main.cpp | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/common/rendering/gl/gl_framebuffer.cpp b/src/common/rendering/gl/gl_framebuffer.cpp index 5487db3bc2..96d8170b6e 100644 --- a/src/common/rendering/gl/gl_framebuffer.cpp +++ b/src/common/rendering/gl/gl_framebuffer.cpp @@ -53,9 +53,9 @@ #include "gl_debug.h" #include "r_videoscale.h" #include "gl_buffers.h" -#include "swrenderer/r_swscene.h" #include "gl_postprocessstate.h" #include "v_draw.h" +#include "printf.h" #include "flatvertices.h" #include "hw_cvars.h" diff --git a/src/common/rendering/hwrenderer/data/hw_clock.cpp b/src/common/rendering/hwrenderer/data/hw_clock.cpp index ea47d0cb18..84576875bb 100644 --- a/src/common/rendering/hwrenderer/data/hw_clock.cpp +++ b/src/common/rendering/hwrenderer/data/hw_clock.cpp @@ -33,14 +33,13 @@ */ -#include "g_level.h" #include "c_console.h" #include "c_dispatch.h" -#include "r_utility.h" #include "v_video.h" #include "hw_clock.h" #include "i_time.h" #include "i_interface.h" +#include "printf.h" glcycle_t RenderWall,SetupWall,ClipWall; glcycle_t RenderFlat,SetupFlat; @@ -172,8 +171,7 @@ void CheckBench() AppendRenderStats(compose); AppendRenderTimes(compose); AppendLightStats(compose); - //AppendMissingTextureStats(compose); - compose.AppendFormat("%llu fps\n\n", (unsigned long long)LastCount); + compose << "\n\n\n"; FILE *f = fopen("benchmarks.txt", "at"); if (f != NULL) diff --git a/src/d_main.cpp b/src/d_main.cpp index 509e803208..e86b83c38c 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -2860,8 +2860,8 @@ FString System_GetLocationDescription() { auto& vp = r_viewpoint; auto Level = vp.ViewLevel; - return FStringf("Map %s: \"%s\",\nx = %1.4f, y = %1.4f, z = %1.4f, angle = %1.4f, pitch = %1.4f\n", - Level->MapName.GetChars(), Level->LevelName.GetChars(), vp.Pos.X, vp.Pos.Y, vp.Pos.Z, vp.Angles.Yaw.Degrees, vp.Angles.Pitch.Degrees); + return FStringf("Map %s: \"%s\",\nx = %1.4f, y = %1.4f, z = %1.4f, angle = %1.4f, pitch = %1.4f\n%llu fps\n\n", + Level->MapName.GetChars(), Level->LevelName.GetChars(), vp.Pos.X, vp.Pos.Y, vp.Pos.Z, vp.Angles.Yaw.Degrees, vp.Angles.Pitch.Degrees, (unsigned long long)LastCount); }