Browse Source

Remove virtual inheritance from RendererOpenGL

Also make destructor virtual so that instances are properly destructed.
pull/15/merge
Yuri Kunde Schlesner 11 years ago
committed by Tony Wasserka
parent
commit
787a1b047c
  1. 2
      src/video_core/renderer_base.h
  2. 4
      src/video_core/renderer_opengl/renderer_opengl.h

2
src/video_core/renderer_base.h

@ -19,7 +19,7 @@ public:
RendererBase() : m_current_fps(0), m_current_frame(0) { RendererBase() : m_current_fps(0), m_current_frame(0) {
} }
~RendererBase() {
virtual ~RendererBase() {
} }
/// Swap buffers (render frame) /// Swap buffers (render frame)

4
src/video_core/renderer_opengl/renderer_opengl.h

@ -13,11 +13,11 @@
#include <array> #include <array>
class RendererOpenGL : virtual public RendererBase {
class RendererOpenGL : public RendererBase {
public: public:
RendererOpenGL(); RendererOpenGL();
~RendererOpenGL();
~RendererOpenGL() override;
/// Swap buffers (render frame) /// Swap buffers (render frame)
void SwapBuffers(); void SwapBuffers();

Loading…
Cancel
Save