Browse Source

GL: minor.

pull/680/head
Vladimír Vondruš 10 months ago
parent
commit
0abacbb84d
  1. 2
      src/Magnum/GL/AbstractObject.cpp
  2. 12
      src/Magnum/GL/AbstractTexture.h
  3. 2
      src/Magnum/GL/Test/CMakeLists.txt

2
src/Magnum/GL/AbstractObject.cpp

@ -26,11 +26,11 @@
#include "AbstractObject.h"
#include <Corrade/Utility/Assert.h>
#include <Corrade/Containers/ArrayView.h>
#ifndef MAGNUM_TARGET_WEBGL
#include <Corrade/Containers/String.h>
#endif
#include <Corrade/Utility/Assert.h>
#include "Magnum/GL/Context.h"
#include "Magnum/GL/Extensions.h"

12
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

2
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)

Loading…
Cancel
Save