7 files changed, 33 insertions, 23 deletions

diff --git a/src/video_core/command_processor.cpp b/src/video_core/command_processor.cpp
index 2f92be661..2274dfa66 100644
--- a/src/video_core/command_processor.cpp
+++ b/src/video_core/command_processor.cpp
@@ -142,7 +142,7 @@ static void WritePicaReg(u32 id, u32 value, u32 mask) {
                         // Send to renderer
                         using Pica::Shader::OutputVertex;
                         auto AddTriangle = [](const OutputVertex& v0, const OutputVertex& v1, const OutputVertex& v2) {
-                            VideoCore::g_renderer->rasterizer->AddTriangle(v0, v1, v2);
+                            VideoCore::g_renderer->Rasterizer()->AddTriangle(v0, v1, v2);
                         };
 
                         g_state.immediate.primitive_assembler.SubmitVertex(output, AddTriangle);
@@ -155,7 +155,7 @@ static void WritePicaReg(u32 id, u32 value, u32 mask) {
         case PICA_REG_INDEX(gpu_mode):
             if (regs.gpu_mode == Regs::GPUMode::Configuring && regs.vs_default_attributes_setup.index == 15) {
                 // Draw immediate mode triangles when GPU Mode is set to GPUMode::Configuring
-                VideoCore::g_renderer->rasterizer->DrawTriangles();
+                VideoCore::g_renderer->Rasterizer()->DrawTriangles();
             }
             break;
 
@@ -396,7 +396,7 @@ static void WritePicaReg(u32 id, u32 value, u32 mask) {
                 using Pica::Shader::OutputVertex;
                 auto AddTriangle = [](
                         const OutputVertex& v0, const OutputVertex& v1, const OutputVertex& v2) {
-                    VideoCore::g_renderer->rasterizer->AddTriangle(v0, v1, v2);
+                    VideoCore::g_renderer->Rasterizer()->AddTriangle(v0, v1, v2);
                 };
 
                 primitive_assembler.SubmitVertex(output, AddTriangle);
@@ -407,7 +407,7 @@ static void WritePicaReg(u32 id, u32 value, u32 mask) {
                                                           range.second, range.first);
             }
 
-            VideoCore::g_renderer->rasterizer->DrawTriangles();
+            VideoCore::g_renderer->Rasterizer()->DrawTriangles();
 
 #if PICA_DUMP_GEOMETRY
             geometry_dumper.Dump();
@@ -542,7 +542,7 @@ static void WritePicaReg(u32 id, u32 value, u32 mask) {
             break;
     }
 
-    VideoCore::g_renderer->rasterizer->NotifyPicaRegisterChanged(id);
+    VideoCore::g_renderer->Rasterizer()->NotifyPicaRegisterChanged(id);
 
     if (g_debug_context)
         g_debug_context->OnEvent(DebugContext::Event::PicaCommandProcessed, reinterpret_cast<void*>(&id));
diff --git a/src/video_core/debug_utils/debug_utils.cpp b/src/video_core/debug_utils/debug_utils.cpp
index 6e21caa78..271e81ca1 100644
--- a/src/video_core/debug_utils/debug_utils.cpp
+++ b/src/video_core/debug_utils/debug_utils.cpp
@@ -48,7 +48,7 @@ void DebugContext::OnEvent(Event event, void* data) {
         std::unique_lock<std::mutex> lock(breakpoint_mutex);
 
         // Commit the hardware renderer's framebuffer so it will show on debug widgets
-        VideoCore::g_renderer->rasterizer->FlushFramebuffer();
+        VideoCore::g_renderer->Rasterizer()->FlushFramebuffer();
 
         // TODO: Should stop the CPU thread here once we multithread emulation.
 
diff --git a/src/video_core/renderer_base.h b/src/video_core/renderer_base.h
index 506bff815..f68091cc8 100644
--- a/src/video_core/renderer_base.h
+++ b/src/video_core/renderer_base.h
@@ -22,9 +22,6 @@ public:
         kFramebuffer_Texture
     };
 
-    RendererBase() : m_current_fps(0), m_current_frame(0) {
-    }
-
     virtual ~RendererBase() {
     }
 
@@ -38,7 +35,7 @@ public:
     virtual void SetWindow(EmuWindow* window) = 0;
 
     /// Initialize the renderer
-    virtual void Init() = 0;
+    virtual bool Init() = 0;
 
     /// Shutdown the renderer
     virtual void ShutDown() = 0;
@@ -46,21 +43,24 @@ public:
     // Getter/setter functions:
     // ------------------------
 
-    f32 GetCurrentframe() const {
+    f32 GetCurrentFPS() const {
         return m_current_fps;
     }
 
-    int current_frame() const {
+    int GetCurrentFrame() const {
         return m_current_frame;
     }
 
-    void RefreshRasterizerSetting();
+    VideoCore::RasterizerInterface* Rasterizer() const {
+        return rasterizer.get();
+    }
 
-    std::unique_ptr<VideoCore::RasterizerInterface> rasterizer;
+    void RefreshRasterizerSetting();
 
 protected:
-    f32 m_current_fps;              ///< Current framerate, should be set by the renderer
-    int m_current_frame;            ///< Current frame, should be set by the renderer
+    std::unique_ptr<VideoCore::RasterizerInterface> rasterizer;
+    f32 m_current_fps   = 0.0f;     ///< Current framerate, should be set by the renderer
+    int m_current_frame = 0;        ///< Current frame, should be set by the renderer
 
 private:
     bool opengl_rasterizer_active = false;
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp
index ca3a6a6b4..11c4d0daf 100644
--- a/src/video_core/renderer_opengl/renderer_opengl.cpp
+++ b/src/video_core/renderer_opengl/renderer_opengl.cpp
@@ -445,7 +445,7 @@ static void DebugHandler(GLenum source, GLenum type, GLuint id, GLenum severity,
 }
 
 /// Initialize the renderer
-void RendererOpenGL::Init() {
+bool RendererOpenGL::Init() {
     render_window->MakeCurrent();
 
     // TODO: Make frontends initialize this, so they can use gladLoadGLLoader with their own loaders
@@ -462,9 +462,15 @@ void RendererOpenGL::Init() {
     LOG_INFO(Render_OpenGL, "GL_VERSION: %s", glGetString(GL_VERSION));
     LOG_INFO(Render_OpenGL, "GL_VENDOR: %s", glGetString(GL_VENDOR));
     LOG_INFO(Render_OpenGL, "GL_RENDERER: %s", glGetString(GL_RENDERER));
+    if (!GLAD_GL_VERSION_3_3) {
+        return false;
+    }
+
     InitOpenGLObjects();
 
     RefreshRasterizerSetting();
+
+    return true;
 }
 
 /// Shutdown the renderer
diff --git a/src/video_core/renderer_opengl/renderer_opengl.h b/src/video_core/renderer_opengl/renderer_opengl.h
index b42df7654..fe4d142a5 100644
--- a/src/video_core/renderer_opengl/renderer_opengl.h
+++ b/src/video_core/renderer_opengl/renderer_opengl.h
@@ -31,7 +31,7 @@ public:
     void SetWindow(EmuWindow* window) override;
 
     /// Initialize the renderer
-    void Init() override;
+    bool Init() override;
 
     /// Shutdown the renderer
     void ShutDown() override;
diff --git a/src/video_core/video_core.cpp b/src/video_core/video_core.cpp
index 912db91a4..ee5e50df1 100644
--- a/src/video_core/video_core.cpp
+++ b/src/video_core/video_core.cpp
@@ -28,15 +28,19 @@ std::atomic<bool> g_hw_renderer_enabled;
 std::atomic<bool> g_shader_jit_enabled;
 
 /// Initialize the video core
-void Init(EmuWindow* emu_window) {
+bool Init(EmuWindow* emu_window) {
     Pica::Init();
 
     g_emu_window = emu_window;
     g_renderer = Common::make_unique<RendererOpenGL>();
     g_renderer->SetWindow(g_emu_window);
-    g_renderer->Init();
-
-    LOG_DEBUG(Render, "initialized OK");
+    if (g_renderer->Init()) {
+        LOG_DEBUG(Render, "initialized OK");
+    } else {
+        LOG_ERROR(Render, "initialization failed !");
+        return false;
+    }
+    return true;
 }
 
 /// Shutdown the video core
diff --git a/src/video_core/video_core.h b/src/video_core/video_core.h
index accb0a4eb..bca67fb8c 100644
--- a/src/video_core/video_core.h
+++ b/src/video_core/video_core.h
@@ -41,7 +41,7 @@ extern std::atomic<bool> g_shader_jit_enabled;
 void Start();
 
 /// Initialize the video core
-void Init(EmuWindow* emu_window);
+bool Init(EmuWindow* emu_window);
 
 /// Shutdown the video core
 void Shutdown();