diff --git a/src/Magnum/GL/AbstractObject.cpp b/src/Magnum/GL/AbstractObject.cpp index 36a1d52e9..6467782a2 100644 --- a/src/Magnum/GL/AbstractObject.cpp +++ b/src/Magnum/GL/AbstractObject.cpp @@ -26,11 +26,11 @@ #include "AbstractObject.h" -#include #include #ifndef MAGNUM_TARGET_WEBGL #include #endif +#include #include "Magnum/GL/Context.h" #include "Magnum/GL/Extensions.h" diff --git a/src/Magnum/GL/AbstractTexture.h b/src/Magnum/GL/AbstractTexture.h index f18c50e90..ab09dbd15 100644 --- a/src/Magnum/GL/AbstractTexture.h +++ b/src/Magnum/GL/AbstractTexture.h @@ -338,12 +338,6 @@ class MAGNUM_GL_EXPORT AbstractTexture: public AbstractObject { /** @brief OpenGL texture ID */ GLuint id() const { return _id; } - /** - * @brief OpenGL texture target - * @m_since_latest - */ - GLenum target() const { return _target; } - /** * @brief Release OpenGL object * @@ -357,6 +351,12 @@ class MAGNUM_GL_EXPORT AbstractTexture: public AbstractObject { */ GLuint release(); + /** + * @brief OpenGL texture target + * @m_since_latest + */ + GLenum target() const { return _target; } + #ifndef MAGNUM_TARGET_WEBGL /** * @brief Texture label diff --git a/src/Magnum/GL/Test/CMakeLists.txt b/src/Magnum/GL/Test/CMakeLists.txt index 7368c58a7..639dc578b 100644 --- a/src/Magnum/GL/Test/CMakeLists.txt +++ b/src/Magnum/GL/Test/CMakeLists.txt @@ -28,8 +28,8 @@ # property that would have to be set on each target separately. set(CMAKE_FOLDER "Magnum/GL/Test") -corrade_add_test(GLAttributeTest AttributeTest.cpp LIBRARIES MagnumGLTestLib) corrade_add_test(GLAbstractShaderProgramTest AbstractShaderProgramTest.cpp LIBRARIES MagnumGL) +corrade_add_test(GLAttributeTest AttributeTest.cpp LIBRARIES MagnumGLTestLib) corrade_add_test(GLBufferTest BufferTest.cpp LIBRARIES MagnumGL) corrade_add_test(GLContextTest ContextTest.cpp LIBRARIES MagnumGL) corrade_add_test(GLCubeMapTextureTest CubeMapTextureTest.cpp LIBRARIES MagnumGL)