summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner2014-08-28 05:51:57 -0300
committerGravatar Tony Wasserka2014-10-12 14:37:24 +0200
commit787a1b047c150f6be705b66ffa929083bd5671f5 (patch)
treeb5c2a1992620cfa5b264aab8a34efb5579da3cb8 /src
parentMerge pull request #119 from lioncash/warn (diff)
downloadyuzu-787a1b047c150f6be705b66ffa929083bd5671f5.tar.gz
yuzu-787a1b047c150f6be705b66ffa929083bd5671f5.tar.xz
yuzu-787a1b047c150f6be705b66ffa929083bd5671f5.zip
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.h2
-rw-r--r--src/video_core/renderer_opengl/renderer_opengl.h4
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:
19 RendererBase() : m_current_fps(0), m_current_frame(0) { 19 RendererBase() : m_current_fps(0), m_current_frame(0) {
20 } 20 }
21 21
22 ~RendererBase() { 22 virtual ~RendererBase() {
23 } 23 }
24 24
25 /// Swap buffers (render frame) 25 /// 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 @@
13 13
14#include <array> 14#include <array>
15 15
16class RendererOpenGL : virtual public RendererBase { 16class RendererOpenGL : public RendererBase {
17public: 17public:
18 18
19 RendererOpenGL(); 19 RendererOpenGL();
20 ~RendererOpenGL(); 20 ~RendererOpenGL() override;
21 21
22 /// Swap buffers (render frame) 22 /// Swap buffers (render frame)
23 void SwapBuffers(); 23 void SwapBuffers();