diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2014-08-28 05:51:57 -0300 |
---|---|---|
committer | Tony Wasserka <NeoBrainX@gmail.com> | 2014-10-12 14:37:24 +0200 |
commit | 787a1b047c150f6be705b66ffa929083bd5671f5 (patch) | |
tree | b5c2a1992620cfa5b264aab8a34efb5579da3cb8 /src | |
parent | 8fb064cd62d3091b88bb2660a0264997f5cb163d (diff) |
Remove virtual inheritance from RendererOpenGL
Also make destructor virtual so that instances are properly destructed.
Diffstat (limited to 'src')
-rw-r--r-- | src/video_core/renderer_base.h | 2 | ||||
-rw-r--r-- | 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 0d25b2a52..98ae7aa66 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.h +++ b/src/video_core/renderer_opengl/renderer_opengl.h @@ -13,11 +13,11 @@ #include <array> -class RendererOpenGL : virtual public RendererBase { +class RendererOpenGL : public RendererBase { public: RendererOpenGL(); - ~RendererOpenGL(); + ~RendererOpenGL() override; /// Swap buffers (render frame) void SwapBuffers(); |