Leahnaya/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-09-12 13:27:59 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1574 from degasus/profiler

Browse Source 
Common: Add a built-in profiler
This commit is contained in:
skidau
2014-12-04 13:22:31 +11:00
parent 4c09f3ab05 94d9d138d9
commit 7bc78827ed
9 changed files with 236 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/VideoBackends/D3D/Render.cpp
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();

3
Source/Core/VideoBackends/OGL/Render.cpp
View File

@@ -12,6 +12,7 @@
#include "Common/Atomic.h"
#include "Common/CommonPaths.h"
#include "Common/FileUtil.h"
#include "Common/Profiler.h"
#include "Common/StringUtil.h"
#include "Common/Thread.h"
#include "Common/Timer.h"
@@ -764,6 +765,8 @@ void Renderer::DrawDebugInfo()
if (SConfig::GetInstance().m_ShowInputDisplay)
debug_info += Movie::GetInputDisplay();
debug_info += Profiler::ToString();
if (GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGL && g_ActiveConfig.bShowEFBCopyRegions)
{
// Set Line Size