Renderer: Use imgui for drawing debug text and OSD

4 files changed, 0 insertions, 19 deletions

diff --git a/Source/Core/VideoBackends/D3D/Render.cpp b/Source/Core/VideoBackends/D3D/Render.cpp
index 43dd44f60f..87190a6d2b 100644
--- a/Source/Core/VideoBackends/D3D/Render.cpp
+++ b/Source/Core/VideoBackends/D3D/Render.cpp
@@ -595,10 +595,6 @@ void Renderer::SwapImpl(AbstractTexture* texture, const EFBRectangle& xfb_region
   D3D11_VIEWPORT vp = CD3D11_VIEWPORT(0.0f, 0.0f, static_cast<float>(m_backbuffer_width),
                                       static_cast<float>(m_backbuffer_height));
   D3D::context->RSSetViewports(1, &vp);
-
-  Renderer::DrawDebugText();
-
-  OSD::DrawMessages();
   DrawImGui();
 
   g_texture_cache->Cleanup(frameCount);
diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp
index e967ae6a75..c857cce083 100644
--- a/Source/Core/VideoBackends/OGL/Render.cpp
+++ b/Source/Core/VideoBackends/OGL/Render.cpp
@@ -1424,9 +1424,6 @@ void Renderer::SwapImpl(AbstractTexture* texture, const EFBRectangle& xfb_region
 
   ResetAPIState();
 
-  // Do our OSD callbacks
-  OSD::DoCallbacks(OSD::CallbackType::OnFrame);
-
   // Check if we need to render to a new surface.
   CheckForSurfaceChange();
   CheckForSurfaceResize();
@@ -1451,10 +1448,6 @@ void Renderer::SwapImpl(AbstractTexture* texture, const EFBRectangle& xfb_region
 
     // Render OSD messages.
     glViewport(0, 0, m_backbuffer_width, m_backbuffer_height);
-    glEnable(GL_BLEND);
-    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-    DrawDebugText();
-    OSD::DrawMessages();
     DrawImGui();
 
     // Swap the back and front buffers, presenting the image.
diff --git a/Source/Core/VideoBackends/Software/SWRenderer.cpp b/Source/Core/VideoBackends/Software/SWRenderer.cpp
index 0b64022725..f8032f7e5d 100644
--- a/Source/Core/VideoBackends/Software/SWRenderer.cpp
+++ b/Source/Core/VideoBackends/Software/SWRenderer.cpp
@@ -97,13 +97,8 @@ std::unique_ptr<AbstractPipeline> SWRenderer::CreatePipeline(const AbstractPipel
 // Called on the GPU thread
 void SWRenderer::SwapImpl(AbstractTexture* texture, const EFBRectangle& xfb_region, u64 ticks)
 {
-  OSD::DoCallbacks(OSD::CallbackType::OnFrame);
-
   if (!IsHeadless())
-  {
-    DrawDebugText();
     m_window->ShowImage(texture, xfb_region);
-  }
 
   UpdateActiveConfig();
 }
diff --git a/Source/Core/VideoBackends/Vulkan/Renderer.cpp b/Source/Core/VideoBackends/Vulkan/Renderer.cpp
index 509269368d..5ae6093f24 100644
--- a/Source/Core/VideoBackends/Vulkan/Renderer.cpp
+++ b/Source/Core/VideoBackends/Vulkan/Renderer.cpp
@@ -704,9 +704,6 @@ void Renderer::DrawScreen(VKTexture* xfb_texture, const EFBRectangle& xfb_region
   // Draw OSD
   SetViewport(0.0f, 0.0f, static_cast<float>(backbuffer->GetWidth()),
               static_cast<float>(backbuffer->GetHeight()), 0.0f, 1.0f);
-  DrawDebugText();
-  OSD::DoCallbacks(OSD::CallbackType::OnFrame);
-  OSD::DrawMessages();
   StateTracker::GetInstance()->SetPendingRebind();
   DrawImGui();