From a3961750a7174be7402fc492367f017d845b8e1f Mon Sep 17 00:00:00 2001
From: Stenzek <stenzek@gmail.com>
Date: Wed, 3 Oct 2018 23:03:13 +1000
Subject: Drop Host_GetRenderSurface and pass display to backend

---
 Source/Core/VideoBackends/Software/SWRenderer.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'Source/Core/VideoBackends/Software/SWRenderer.cpp')

diff --git a/Source/Core/VideoBackends/Software/SWRenderer.cpp b/Source/Core/VideoBackends/Software/SWRenderer.cpp
index f4e322619d..5e76cdd296 100644
--- a/Source/Core/VideoBackends/Software/SWRenderer.cpp
+++ b/Source/Core/VideoBackends/Software/SWRenderer.cpp
@@ -7,6 +7,7 @@
 #include <string>
 
 #include "Common/CommonTypes.h"
+#include "Common/GL/GLContext.h"
 
 #include "Core/Config/GraphicsSettings.h"
 #include "Core/HW/Memmap.h"
@@ -28,6 +29,11 @@ SWRenderer::SWRenderer()
 {
 }
 
+bool SWRenderer::IsHeadless() const
+{
+  return g_main_gl_context->IsHeadless();
+}
+
 std::unique_ptr<AbstractTexture> SWRenderer::CreateTexture(const TextureConfig& config)
 {
   return std::make_unique<SW::SWTexture>(config);
-- 
cgit v1.2.3


From dcdd02d646230e7903520a41dc9f86e57ae16dbe Mon Sep 17 00:00:00 2001
From: Stenzek <stenzek@gmail.com>
Date: Wed, 3 Oct 2018 23:03:26 +1000
Subject: GLContext: Remove global context pointer

---
 Source/Core/VideoBackends/Software/SWRenderer.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'Source/Core/VideoBackends/Software/SWRenderer.cpp')

diff --git a/Source/Core/VideoBackends/Software/SWRenderer.cpp b/Source/Core/VideoBackends/Software/SWRenderer.cpp
index 5e76cdd296..2c6a97027b 100644
--- a/Source/Core/VideoBackends/Software/SWRenderer.cpp
+++ b/Source/Core/VideoBackends/Software/SWRenderer.cpp
@@ -24,14 +24,15 @@
 #include "VideoCommon/VideoBackendBase.h"
 #include "VideoCommon/VideoConfig.h"
 
-SWRenderer::SWRenderer()
-    : ::Renderer(static_cast<int>(MAX_XFB_WIDTH), static_cast<int>(MAX_XFB_HEIGHT))
+SWRenderer::SWRenderer(std::unique_ptr<SWOGLWindow> window)
+    : ::Renderer(static_cast<int>(MAX_XFB_WIDTH), static_cast<int>(MAX_XFB_HEIGHT)),
+      m_window(std::move(window))
 {
 }
 
 bool SWRenderer::IsHeadless() const
 {
-  return g_main_gl_context->IsHeadless();
+  return m_window->IsHeadless();
 }
 
 std::unique_ptr<AbstractTexture> SWRenderer::CreateTexture(const TextureConfig& config)
@@ -55,7 +56,7 @@ SWRenderer::CreateFramebuffer(const AbstractTexture* color_attachment,
 
 void SWRenderer::RenderText(const std::string& pstr, int left, int top, u32 color)
 {
-  SWOGLWindow::s_instance->PrintText(pstr, left, top, color);
+  m_window->PrintText(pstr, left, top, color);
 }
 
 class SWShader final : public AbstractShader
@@ -100,7 +101,7 @@ void SWRenderer::SwapImpl(AbstractTexture* texture, const EFBRectangle& xfb_regi
   if (!IsHeadless())
   {
     DrawDebugText();
-    SWOGLWindow::s_instance->ShowImage(texture, xfb_region);
+    m_window->ShowImage(texture, xfb_region);
   }
 
   UpdateActiveConfig();
-- 
cgit v1.2.3