@ -317,18 +317,6 @@ class MAGNUM_GL_EXPORT AbstractTexture: public AbstractObject {
/** @brief Move constructor */
/** @brief Move constructor */
AbstractTexture ( AbstractTexture & & other ) noexcept ;
AbstractTexture ( AbstractTexture & & other ) noexcept ;
/**
* @ brief Destructor
*
* Deletes associated OpenGL texture .
* @ see @ ref BufferTexture : : wrap ( ) , @ ref CubeMapTexture : : wrap ( ) ,
* @ ref CubeMapTextureArray : : wrap ( ) ,
* @ ref MultisampleTexture : : wrap ( ) , @ ref RectangleTexture : : wrap ( ) ,
* @ ref Texture : : wrap ( ) , @ ref TextureArray : : wrap ( ) ,
* @ ref release ( ) , @ fn_gl_keyword { DeleteTextures }
*/
~ AbstractTexture ( ) ;
/** @brief Copying is not allowed */
/** @brief Copying is not allowed */
AbstractTexture & operator = ( const AbstractTexture & ) = delete ;
AbstractTexture & operator = ( const AbstractTexture & ) = delete ;
@ -409,6 +397,25 @@ class MAGNUM_GL_EXPORT AbstractTexture: public AbstractObject {
*/
*/
void bind ( Int textureUnit ) ;
void bind ( Int textureUnit ) ;
# if !defined(MAGNUM_BUILD_DEPRECATED) || defined(DOXYGEN_GENERATING_OUTPUT)
protected : /* Destructor was public before */
# endif
/**
* @ brief Destructor
*
* Deletes associated OpenGL texture .
* @ see @ ref BufferTexture : : wrap ( ) , @ ref CubeMapTexture : : wrap ( ) ,
* @ ref CubeMapTextureArray : : wrap ( ) ,
* @ ref MultisampleTexture : : wrap ( ) , @ ref RectangleTexture : : wrap ( ) ,
* @ ref Texture : : wrap ( ) , @ ref TextureArray : : wrap ( ) ,
* @ ref release ( ) , @ fn_gl_keyword { DeleteTextures }
*/
/* Not virtual to avoid vtable overhead, however while subclasses are
all the same size ( and thus no risk of memory leaks from additional
members ) these might perform cleanup steps on destruction ( driver
workarouds . . . ) , so we have to disallow deletion from base pointer */
~ AbstractTexture ( ) ;
# ifdef DOXYGEN_GENERATING_OUTPUT
# ifdef DOXYGEN_GENERATING_OUTPUT
private :
private :
# else
# else