Browse Source

Cleanup.

pull/107/head
Vladimír Vondruš 11 years ago
parent
commit
362f53f94c
  1. 2
      src/Magnum/Magnum.h
  2. 2
      src/Magnum/Mesh.h
  3. 2
      src/Magnum/Renderbuffer.h
  4. 4
      src/Magnum/TransformFeedback.h

2
src/Magnum/Magnum.h

@ -420,6 +420,7 @@ using Math::operator "" _radf;
class AbstractFramebuffer; class AbstractFramebuffer;
class AbstractImage; class AbstractImage;
/* AbstractQuery is not used directly */
class AbstractShaderProgram; class AbstractShaderProgram;
class AbstractTexture; class AbstractTexture;
@ -493,7 +494,6 @@ typedef MultisampleTexture<3> MultisampleTexture2DArray;
#endif #endif
#endif #endif
/* AbstractQuery is not used directly */
class PrimitiveQuery; class PrimitiveQuery;
class SampleQuery; class SampleQuery;
class TimeQuery; class TimeQuery;

2
src/Magnum/Mesh.h

@ -464,7 +464,7 @@ class MAGNUM_EXPORT Mesh: public AbstractObject {
Mesh& operator=(Mesh&& other) noexcept; Mesh& operator=(Mesh&& other) noexcept;
/** /**
* @brief OpenGL mesh ID * @brief OpenGL vertex array ID
* *
* If neither @extension{ARB,vertex_array_object} (part of OpenGL 3.0) * If neither @extension{ARB,vertex_array_object} (part of OpenGL 3.0)
* nor OpenGL ES 3.0 / WebGL 2.0 nor @es_extension{OES,vertex_array_object} * nor OpenGL ES 3.0 / WebGL 2.0 nor @es_extension{OES,vertex_array_object}

2
src/Magnum/Renderbuffer.h

@ -118,7 +118,7 @@ class MAGNUM_EXPORT Renderbuffer: public AbstractObject {
/** @brief Move assignment */ /** @brief Move assignment */
Renderbuffer& operator=(Renderbuffer&& other) noexcept; Renderbuffer& operator=(Renderbuffer&& other) noexcept;
/** @brief OpenGL internal renderbuffer ID */ /** @brief OpenGL renderbuffer ID */
GLuint id() const { return _id; } GLuint id() const { return _id; }
#ifndef MAGNUM_TARGET_WEBGL #ifndef MAGNUM_TARGET_WEBGL

4
src/Magnum/TransformFeedback.h

@ -183,7 +183,7 @@ class MAGNUM_EXPORT TransformFeedback: public AbstractObject {
#ifndef MAGNUM_TARGET_WEBGL #ifndef MAGNUM_TARGET_WEBGL
/** /**
* @brief Buffer label * @brief Transform feedback label
* *
* The result is *not* cached, repeated queries will result in repeated * The result is *not* cached, repeated queries will result in repeated
* OpenGL calls. If OpenGL 4.3 is not supported and neither * OpenGL calls. If OpenGL 4.3 is not supported and neither
@ -196,7 +196,7 @@ class MAGNUM_EXPORT TransformFeedback: public AbstractObject {
std::string label(); std::string label();
/** /**
* @brief Set buffer label * @brief Set transform feedback label
* @return Reference to self (for method chaining) * @return Reference to self (for method chaining)
* *
* Default is empty string. If OpenGL 4.3 is not supported and neither * Default is empty string. If OpenGL 4.3 is not supported and neither

Loading…
Cancel
Save