Browse Source

Minor cleanup.

pull/51/head
Vladimír Vondruš 12 years ago
parent
commit
ecf7bfa2c1
  1. 12
      src/Magnum/AbstractTexture.h
  2. 3
      src/Magnum/TextureArray.h

12
src/Magnum/AbstractTexture.h

@ -157,6 +157,12 @@ class MAGNUM_EXPORT AbstractTexture: public AbstractObject {
static Int maxIntegerSamples(); static Int maxIntegerSamples();
#endif #endif
/** @brief Copying is not allowed */
AbstractTexture(const AbstractTexture&) = delete;
/** @brief Move constructor */
AbstractTexture(AbstractTexture&& other) noexcept;
/** /**
* @brief Destructor * @brief Destructor
* *
@ -165,12 +171,6 @@ class MAGNUM_EXPORT AbstractTexture: public AbstractObject {
*/ */
~AbstractTexture(); ~AbstractTexture();
/** @brief Copying is not allowed */
AbstractTexture(const AbstractTexture&) = delete;
/** @brief Move constructor */
AbstractTexture(AbstractTexture&& other) noexcept;
/** @brief Copying is not allowed */ /** @brief Copying is not allowed */
AbstractTexture& operator=(const AbstractTexture&) = delete; AbstractTexture& operator=(const AbstractTexture&) = delete;

3
src/Magnum/TextureArray.h

@ -100,7 +100,8 @@ template<UnsignedInt dimensions> class TextureArray: public AbstractTexture {
* @brief Constructor * @brief Constructor
* *
* Creates new OpenGL texture object. * Creates new OpenGL texture object.
* @see @fn_gl{GenTextures} with @def_gl{TEXTURE_1D_ARRAY} or @def_gl{TEXTURE_2D_ARRAY} * @see @fn_gl{GenTextures} with @def_gl{TEXTURE_1D_ARRAY} or
* @def_gl{TEXTURE_2D_ARRAY}
*/ */
explicit TextureArray(): AbstractTexture(Implementation::textureArrayTarget<dimensions>()) {} explicit TextureArray(): AbstractTexture(Implementation::textureArrayTarget<dimensions>()) {}

Loading…
Cancel
Save