diff options
| author | skidau <skidau@gmail.com> | 2014-12-04 13:22:31 +1100 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2014-12-04 13:22:31 +1100 |
| commit | 7bc78827edcfc4c71ce87e5658fe4fcc01c7e526 (patch) | |
| tree | d7c9363b6a173e404b6336b21009691350b2acb4 /Source/Core/VideoBackends/D3D/Render.cpp | |
| parent | 4c09f3ab055296b9e74fdac48893fa0c977cb776 (diff) | |
| parent | 94d9d138d9b8547dc63a705014a5f5b874472613 (diff) | |
Merge pull request #1574 from degasus/profiler
Common: Add a built-in profiler
Diffstat (limited to 'Source/Core/VideoBackends/D3D/Render.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/D3D/Render.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Source/Core/VideoBackends/D3D/Render.cpp b/Source/Core/VideoBackends/D3D/Render.cpp index 5db7b8b4ec..6adf3ac52f 100644 --- a/Source/Core/VideoBackends/D3D/Render.cpp +++ b/Source/Core/VideoBackends/D3D/Render.cpp @@ -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(); |