From 83973f3ba6f0139bd4947f9bb97a2b3d324b27a8 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Thu, 28 Aug 2014 05:51:57 -0300 Subject: [PATCH] Remove virtual inheritance from RendererOpenGL Also make destructor virtual so that instances are properly destructed. --- src/video_core/renderer_base.h | 2 +- src/video_core/renderer_opengl/renderer_opengl.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/video_core/renderer_base.h b/src/video_core/renderer_base.h index 2650620b4..f1dbc9d17 100644 --- a/src/video_core/renderer_base.h +++ b/src/video_core/renderer_base.h @@ -19,7 +19,7 @@ public: RendererBase() : m_current_fps(0), m_current_frame(0) { } - ~RendererBase() { + virtual ~RendererBase() { } /// Swap buffers (render frame) diff --git a/src/video_core/renderer_opengl/renderer_opengl.h b/src/video_core/renderer_opengl/renderer_opengl.h index e90fa0c77..687845d62 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.h +++ b/src/video_core/renderer_opengl/renderer_opengl.h @@ -13,11 +13,11 @@ #include -class RendererOpenGL : virtual public RendererBase { +class RendererOpenGL : public RendererBase { public: RendererOpenGL(); - ~RendererOpenGL(); + ~RendererOpenGL() override; /// Swap buffers (render frame) void SwapBuffers();