From 1adcd47dcbd80e0435d42e61dab3f00a22d1ca38 Mon Sep 17 00:00:00 2001
From: Stenzek <stenzek@gmail.com>
Date: Fri, 9 Feb 2018 20:52:25 +1000
Subject: Renderer: Add a base Initialize() method to match Shutdown()

---
 Source/Core/VideoBackends/OGL/Render.cpp | 27 ++++++++++++++++-----------
 Source/Core/VideoBackends/OGL/Render.h   |  2 +-
 Source/Core/VideoBackends/OGL/main.cpp   |  3 ++-
 3 files changed, 19 insertions(+), 13 deletions(-)

(limited to 'Source/Core/VideoBackends/OGL')

diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp
index 120774b4f7..8b35e59bbb 100644
--- a/Source/Core/VideoBackends/OGL/Render.cpp
+++ b/Source/Core/VideoBackends/OGL/Render.cpp
@@ -811,19 +811,11 @@ bool Renderer::IsHeadless() const
   return m_main_gl_context->IsHeadless();
 }
 
-void Renderer::Shutdown()
+bool Renderer::Initialize()
 {
-  ::Renderer::Shutdown();
-  g_framebuffer_manager.reset();
+  if (!::Renderer::Initialize())
+    return false;
 
-  UpdateActiveConfig();
-
-  s_raster_font.reset();
-  m_post_processor.reset();
-}
-
-void Renderer::Init()
-{
   // Initialize the FramebufferManager
   g_framebuffer_manager = std::make_unique<FramebufferManager>(
       m_target_width, m_target_height, s_MSAASamples, BoundingBox::NeedsStencilBuffer());
@@ -832,6 +824,19 @@ void Renderer::Init()
 
   m_post_processor = std::make_unique<OpenGLPostProcessing>();
   s_raster_font = std::make_unique<RasterFont>();
+
+  return true;
+}
+
+void Renderer::Shutdown()
+{
+  ::Renderer::Shutdown();
+  g_framebuffer_manager.reset();
+
+  UpdateActiveConfig();
+
+  s_raster_font.reset();
+  m_post_processor.reset();
 }
 
 std::unique_ptr<AbstractTexture> Renderer::CreateTexture(const TextureConfig& config)
diff --git a/Source/Core/VideoBackends/OGL/Render.h b/Source/Core/VideoBackends/OGL/Render.h
index f0cc668563..de051ba0d7 100644
--- a/Source/Core/VideoBackends/OGL/Render.h
+++ b/Source/Core/VideoBackends/OGL/Render.h
@@ -88,7 +88,7 @@ public:
 
   bool IsHeadless() const override;
 
-  void Init();
+  bool Initialize() override;
   void Shutdown() override;
 
   std::unique_ptr<AbstractTexture> CreateTexture(const TextureConfig& config) override;
diff --git a/Source/Core/VideoBackends/OGL/main.cpp b/Source/Core/VideoBackends/OGL/main.cpp
index 6e364113cc..c4ccbdcfd5 100644
--- a/Source/Core/VideoBackends/OGL/main.cpp
+++ b/Source/Core/VideoBackends/OGL/main.cpp
@@ -179,7 +179,8 @@ bool VideoBackend::Initialize(const WindowSystemInfo& wsi)
   g_texture_cache = std::make_unique<TextureCache>();
   g_sampler_cache = std::make_unique<SamplerCache>();
   g_shader_cache = std::make_unique<VideoCommon::ShaderCache>();
-  static_cast<Renderer*>(g_renderer.get())->Init();
+  if (!g_renderer->Initialize())
+    return false;
   TextureConverter::Init();
   BoundingBox::Init(g_renderer->GetTargetWidth(), g_renderer->GetTargetHeight());
   return g_shader_cache->Initialize();
-- 
cgit v1.2.3