Browse Source

Publicly inherit AbstractTexture in BufferTexture.

There isn't anything to hide anymore.
pull/51/head
Vladimír Vondruš 12 years ago
parent
commit
10cf24e158
  1. 28
      src/Magnum/BufferTexture.h

28
src/Magnum/BufferTexture.h

@ -200,13 +200,10 @@ and respective function documentation for more information.
@requires_gl31 %Extension @extension{ARB,texture_buffer_object}
@requires_gl Texture buffers are not available in OpenGL ES.
*/
class MAGNUM_EXPORT BufferTexture: private AbstractTexture {
class MAGNUM_EXPORT BufferTexture: public AbstractTexture {
friend struct Implementation::TextureState;
public:
/** @copydoc AbstractTexture::maxLabelLength() */
static Int maxLabelLength() { return AbstractTexture::maxLabelLength(); }
/**
* @brief Minimum required alignment for texture buffer offsets
*
@ -225,21 +222,6 @@ class MAGNUM_EXPORT BufferTexture: private AbstractTexture {
*/
explicit BufferTexture(): AbstractTexture(GL_TEXTURE_BUFFER) {}
/** @copydoc AbstractTexture::id() */
Int id() const { return AbstractTexture::id(); }
/** @copydoc AbstractTexture::label() */
std::string label() const { return AbstractTexture::label(); }
/** @copydoc AbstractTexture::setLabel() */
BufferTexture& setLabel(const std::string& label) {
AbstractTexture::setLabel(label);
return *this;
}
/** @copydoc AbstractTexture::bind() */
void bind(Int layer) { AbstractTexture::bind(layer); }
/**
* @brief Set texture buffer
* @param internalFormat Internal format
@ -269,6 +251,14 @@ class MAGNUM_EXPORT BufferTexture: private AbstractTexture {
*/
void setBuffer(BufferTextureFormat internalFormat, Buffer& buffer, GLintptr offset, GLsizeiptr size);
/* Overloads to remove WTF-factor from method chaining order */
#ifndef DOXYGEN_GENERATING_OUTPUT
BufferTexture& setLabel(const std::string& label) {
AbstractTexture::setLabel(label);
return *this;
}
#endif
private:
void MAGNUM_LOCAL setBufferImplementationDefault(BufferTextureFormat internalFormat, Buffer& buffer);
void MAGNUM_LOCAL setBufferImplementationDSA(BufferTextureFormat internalFormat, Buffer& buffer);

Loading…
Cancel
Save