mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 20:28:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

VideoCommon: merge debug test generators

Browse source
This commit is contained in:
degasus 2014-12-20 13:02:00 +01:00
commit fb177ca04e
5 changed files with 121 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Source/Core/VideoBackends/OGL/Render.cpp
View file

@ -722,11 +722,8 @@ void Renderer::Init()
}
// Create On-Screen-Messages
void Renderer::DrawDebugInfo()
void Renderer::ShowEfbCopyRegions()
{
// Reset viewport for drawing text
glViewport(0, 0, GLInterface->GetBackBufferWidth(), GLInterface->GetBackBufferHeight());
if (GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGL && g_ActiveConfig.bShowEFBCopyRegions)
{
// Set Line Size
@ -844,14 +841,6 @@ void Renderer::DrawDebugInfo()
// Clear stored regions
stats.efb_regions.clear();
}
std::string debug_info = GetDebugText();
if (!debug_info.empty())
{
// Render a shadow, and then the text.
Renderer::RenderText(debug_info, 21, 21, 0xDD000000);
Renderer::RenderText(debug_info, 20, 20, 0xFF00FFFF);
}
}
void Renderer::RenderText(const std::string& text, int left, int top, u32 color)
@ -1682,7 +1671,10 @@ void Renderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, co
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
DrawDebugInfo();
// Reset viewport for drawing text
glViewport(0, 0, GLInterface->GetBackBufferWidth(), GLInterface->GetBackBufferHeight());
ShowEfbCopyRegions();
DrawDebugText();
// Do our OSD callbacks