Merge pull request #7478 from stenzek/imgui

Replace raster font with dear imgui

1 files changed, 2 insertions, 14 deletions

diff --git a/Source/Core/VideoBackends/Software/SWRenderer.cpp b/Source/Core/VideoBackends/Software/SWRenderer.cpp
index 0b64022725..6369b35b20 100644
--- a/Source/Core/VideoBackends/Software/SWRenderer.cpp
+++ b/Source/Core/VideoBackends/Software/SWRenderer.cpp
@@ -25,7 +25,7 @@
 #include "VideoCommon/VideoConfig.h"
 
 SWRenderer::SWRenderer(std::unique_ptr<SWOGLWindow> window)
-    : ::Renderer(static_cast<int>(MAX_XFB_WIDTH), static_cast<int>(MAX_XFB_HEIGHT),
+    : ::Renderer(static_cast<int>(MAX_XFB_WIDTH), static_cast<int>(MAX_XFB_HEIGHT), 1.0f,
                  AbstractTextureFormat::RGBA8),
       m_window(std::move(window))
 {
@@ -55,11 +55,6 @@ SWRenderer::CreateFramebuffer(const AbstractTexture* color_attachment,
                                    static_cast<const SW::SWTexture*>(depth_attachment));
 }
 
-void SWRenderer::RenderText(const std::string& pstr, int left, int top, u32 color)
-{
-  m_window->PrintText(pstr, left, top, color);
-}
-
 class SWShader final : public AbstractShader
 {
 public:
@@ -95,17 +90,10 @@ std::unique_ptr<AbstractPipeline> SWRenderer::CreatePipeline(const AbstractPipel
 }
 
 // Called on the GPU thread
-void SWRenderer::SwapImpl(AbstractTexture* texture, const EFBRectangle& xfb_region, u64 ticks)
+void SWRenderer::RenderXFBToScreen(const AbstractTexture* texture, const EFBRectangle& xfb_region)
 {
-  OSD::DoCallbacks(OSD::CallbackType::OnFrame);
-
   if (!IsHeadless())
-  {
-    DrawDebugText();
     m_window->ShowImage(texture, xfb_region);
-  }
-
-  UpdateActiveConfig();
 }
 
 u32 SWRenderer::AccessEFB(EFBAccessType type, u32 x, u32 y, u32 InputData)