Browse Source

No need to have virtual destructor in AbstractFramebuffer.

pull/278/head
Vladimír Vondruš 13 years ago
parent
commit
4a4e492785
  1. 2
      src/AbstractFramebuffer.cpp
  2. 3
      src/AbstractFramebuffer.h

2
src/AbstractFramebuffer.cpp

@ -47,8 +47,6 @@ FramebufferTarget AbstractFramebuffer::readTarget = FramebufferTarget::ReadDraw;
FramebufferTarget AbstractFramebuffer::drawTarget = FramebufferTarget::ReadDraw; FramebufferTarget AbstractFramebuffer::drawTarget = FramebufferTarget::ReadDraw;
#endif #endif
AbstractFramebuffer::~AbstractFramebuffer() {}
void AbstractFramebuffer::bind(FramebufferTarget target) { void AbstractFramebuffer::bind(FramebufferTarget target) {
bindInternal(target); bindInternal(target);
setViewportInternal(); setViewportInternal();

3
src/AbstractFramebuffer.h

@ -190,7 +190,6 @@ class MAGNUM_EXPORT AbstractFramebuffer {
} }
explicit AbstractFramebuffer() = default; explicit AbstractFramebuffer() = default;
virtual ~AbstractFramebuffer() = 0;
/** /**
* @brief Bind framebuffer for rendering * @brief Bind framebuffer for rendering
@ -269,6 +268,8 @@ class MAGNUM_EXPORT AbstractFramebuffer {
#else #else
protected: protected:
#endif #endif
~AbstractFramebuffer() = default;
void MAGNUM_LOCAL bindInternal(FramebufferTarget target); void MAGNUM_LOCAL bindInternal(FramebufferTarget target);
FramebufferTarget MAGNUM_LOCAL bindInternal(); FramebufferTarget MAGNUM_LOCAL bindInternal();
void MAGNUM_LOCAL setViewportInternal(); void MAGNUM_LOCAL setViewportInternal();

Loading…
Cancel
Save