From 362f53f94cc5ee771edfc28cfacdd49e0f118cf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 24 May 2015 02:15:07 +0200 Subject: [PATCH] Cleanup. --- src/Magnum/Magnum.h | 2 +- src/Magnum/Mesh.h | 2 +- src/Magnum/Renderbuffer.h | 2 +- src/Magnum/TransformFeedback.h | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Magnum/Magnum.h b/src/Magnum/Magnum.h index 2bb6584f5..610019ecd 100644 --- a/src/Magnum/Magnum.h +++ b/src/Magnum/Magnum.h @@ -420,6 +420,7 @@ using Math::operator "" _radf; class AbstractFramebuffer; class AbstractImage; +/* AbstractQuery is not used directly */ class AbstractShaderProgram; class AbstractTexture; @@ -493,7 +494,6 @@ typedef MultisampleTexture<3> MultisampleTexture2DArray; #endif #endif -/* AbstractQuery is not used directly */ class PrimitiveQuery; class SampleQuery; class TimeQuery; diff --git a/src/Magnum/Mesh.h b/src/Magnum/Mesh.h index adda4b7aa..bf26e3a38 100644 --- a/src/Magnum/Mesh.h +++ b/src/Magnum/Mesh.h @@ -464,7 +464,7 @@ class MAGNUM_EXPORT Mesh: public AbstractObject { 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) * nor OpenGL ES 3.0 / WebGL 2.0 nor @es_extension{OES,vertex_array_object} diff --git a/src/Magnum/Renderbuffer.h b/src/Magnum/Renderbuffer.h index 6bbab41f4..927f8e260 100644 --- a/src/Magnum/Renderbuffer.h +++ b/src/Magnum/Renderbuffer.h @@ -118,7 +118,7 @@ class MAGNUM_EXPORT Renderbuffer: public AbstractObject { /** @brief Move assignment */ Renderbuffer& operator=(Renderbuffer&& other) noexcept; - /** @brief OpenGL internal renderbuffer ID */ + /** @brief OpenGL renderbuffer ID */ GLuint id() const { return _id; } #ifndef MAGNUM_TARGET_WEBGL diff --git a/src/Magnum/TransformFeedback.h b/src/Magnum/TransformFeedback.h index ae7813fbf..9ac7afd96 100644 --- a/src/Magnum/TransformFeedback.h +++ b/src/Magnum/TransformFeedback.h @@ -183,7 +183,7 @@ class MAGNUM_EXPORT TransformFeedback: public AbstractObject { #ifndef MAGNUM_TARGET_WEBGL /** - * @brief Buffer label + * @brief Transform feedback label * * The result is *not* cached, repeated queries will result in repeated * OpenGL calls. If OpenGL 4.3 is not supported and neither @@ -196,7 +196,7 @@ class MAGNUM_EXPORT TransformFeedback: public AbstractObject { std::string label(); /** - * @brief Set buffer label + * @brief Set transform feedback label * @return Reference to self (for method chaining) * * Default is empty string. If OpenGL 4.3 is not supported and neither