Merge pull request #1574 from degasus/profiler

Common: Add a built-in profiler
This commit is contained in:
skidau
2014-12-04 13:22:31 +11:00
9 changed files with 236 additions and 0 deletions

View File

@ -8,6 +8,7 @@
#include <strsafe.h>
#include <unordered_map>
#include "Common/Profiler.h"
#include "Common/Timer.h"
#include "Core/ConfigManager.h"
@ -875,6 +876,12 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, co
D3D::font.DrawTextScaled(0, 36, 20, 0.0f, 0xFF00FFFF, Statistics::ToStringProj());
}
std::string profile_output = Profiler::ToString();
if (!profile_output.empty())
{
D3D::font.DrawTextScaled(0, 44, 20, 0.0f, 0xFF00FFFF, profile_output);
}
OSD::DrawMessages();
D3D::EndFrame();