ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fixed documentation links to EXT_debug_label.

pull/38/head
Vladimír Vondruš 13 years ago
parent
4c33f86101
commit
f1e2bf3b93
9 changed files with 35 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/AbstractObject.h
  2. 8
      src/AbstractShaderProgram.h
  3. 8
      src/AbstractTexture.h
  4. 12
      src/Buffer.h
  5. 8
      src/Framebuffer.h
  6. 8
      src/Mesh.h
  7. 8
      src/Query.h
  8. 8
      src/Renderbuffer.h
  9. 8
      src/Shader.h

2
src/AbstractObject.h
Unescape View File

@ -53,7 +53,7 @@ class MAGNUM_EXPORT AbstractObject {
* *
* The result is cached, repeated queries don't result in repeated * The result is cached, repeated queries don't result in repeated
* OpenGL calls. If @extension{KHR,debug} desktop or ES extension is * OpenGL calls. If @extension{KHR,debug} desktop or ES extension is
* not available, returns `0`. Note that @extension{EXT,debug_label} * not available, returns `0`. Note that @extension2{EXT,debug_label}
* has no such limit. * has no such limit.
* @see @ref AbstractQuery::setLabel(), @ref AbstractShaderProgram::setLabel(), * @see @ref AbstractQuery::setLabel(), @ref AbstractShaderProgram::setLabel(),
* @ref AbstractTexture::setLabel(), @ref Buffer::setLabel(), * @ref AbstractTexture::setLabel(), @ref Buffer::setLabel(),

8
src/AbstractShaderProgram.h
Unescape View File

@ -513,10 +513,10 @@ class MAGNUM_EXPORT AbstractShaderProgram: public AbstractObject {
* *
* 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 neither @extension{KHR,debug} nor * OpenGL calls. If neither @extension{KHR,debug} nor
* @extension{EXT,debug_label} desktop or ES extension is available, * @extension2{EXT,debug_label} desktop or ES extension is available,
* this function returns empty string. * this function returns empty string.
* @see @fn_gl{GetObjectLabel} with @def_gl{PROGRAM} or * @see @fn_gl{GetObjectLabel} with @def_gl{PROGRAM} or
* @fn_gl_extension{GetObjectLabel,EXT,object_label} with * @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with
* @def_gl{PROGRAM_OBJECT_EXT} * @def_gl{PROGRAM_OBJECT_EXT}
*/ */
std::string label() const; std::string label() const;
@ -526,10 +526,10 @@ class MAGNUM_EXPORT AbstractShaderProgram: public AbstractObject {
* @return Reference to self (for method chaining) * @return Reference to self (for method chaining)
* *
* Default is empty string. If neither @extension{KHR,debug} nor * Default is empty string. If neither @extension{KHR,debug} nor
* @extension{EXT,debug_label} desktop or ES extension is available, * @extension2{EXT,debug_label} desktop or ES extension is available,
* this function does nothing. * this function does nothing.
* @see @ref maxLabelLength(), @fn_gl{ObjectLabel} with * @see @ref maxLabelLength(), @fn_gl{ObjectLabel} with
* @def_gl{PROGRAM} or @fn_gl_extension{LabelObject,EXT,object_label} * @def_gl{PROGRAM} or @fn_gl_extension2{LabelObject,EXT,debug_label}
* with @def_gl{PROGRAM_OBJECT_EXT} * with @def_gl{PROGRAM_OBJECT_EXT}
*/ */
AbstractShaderProgram& setLabel(const std::string& label); AbstractShaderProgram& setLabel(const std::string& label);

8
src/AbstractTexture.h
Unescape View File

@ -171,10 +171,10 @@ class MAGNUM_EXPORT AbstractTexture: public AbstractObject {
* *
* 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 neither @extension{KHR,debug} nor * OpenGL calls. If neither @extension{KHR,debug} nor
* @extension{EXT,debug_label} desktop or ES extension is available, * @extension2{EXT,debug_label} desktop or ES extension is available,
* this function returns empty string. * this function returns empty string.
* @see @fn_gl{GetObjectLabel} or * @see @fn_gl{GetObjectLabel} or
* @fn_gl_extension{GetObjectLabel,EXT,object_label} with * @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with
* @def_gl{TEXTURE} * @def_gl{TEXTURE}
*/ */
std::string label() const; std::string label() const;
@ -184,10 +184,10 @@ class MAGNUM_EXPORT AbstractTexture: public AbstractObject {
* @return Reference to self (for method chaining) * @return Reference to self (for method chaining)
* *
* Default is empty string. If neither @extension{KHR,debug} nor * Default is empty string. If neither @extension{KHR,debug} nor
* @extension{EXT,debug_label} desktop or ES extension is available, * @extension2{EXT,debug_label} desktop or ES extension is available,
* this function does nothing. * this function does nothing.
* @see @ref maxLabelLength(), @fn_gl{ObjectLabel} or * @see @ref maxLabelLength(), @fn_gl{ObjectLabel} or
* @fn_gl_extension{LabelObject,EXT,object_label} with * @fn_gl_extension2{LabelObject,EXT,debug_label} with
* @def_gl{TEXTURE} * @def_gl{TEXTURE}
*/ */
AbstractTexture& setLabel(const std::string& label); AbstractTexture& setLabel(const std::string& label);

12
src/Buffer.h
Unescape View File

@ -553,10 +553,10 @@ class MAGNUM_EXPORT Buffer: public AbstractObject {
* *
* 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 neither @extension{KHR,debug} nor * OpenGL calls. If neither @extension{KHR,debug} nor
* @extension{EXT,debug_label} desktop or ES extension is available, * @extension2{EXT,debug_label} desktop or ES extension is available,
* this function returns empty string. * this function returns empty string.
* @see @fn_gl{GetObjectLabel} with @def_gl{BUFFER} or * @see @fn_gl{GetObjectLabel} with @def_gl{BUFFER} or
* @fn_gl_extension{GetObjectLabel,EXT,object_label} with * @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with
* @def_gl{BUFFER_OBJECT_EXT} * @def_gl{BUFFER_OBJECT_EXT}
*/ */
std::string label() const; std::string label() const;
@ -566,11 +566,11 @@ class MAGNUM_EXPORT Buffer: public AbstractObject {
* @return Reference to self (for method chaining) * @return Reference to self (for method chaining)
* *
* Default is empty string. If neither @extension{KHR,debug} nor * Default is empty string. If neither @extension{KHR,debug} nor
* @extension{EXT,debug_label} desktop or ES extension is available, * @extension2{EXT,debug_label} desktop or ES extension is available,
* this function does nothing. * this function does nothing.
* @see @ref maxLabelLength(), @fn_gl{ObjectLabel} with * @see @ref maxLabelLength(), @fn_gl{ObjectLabel} with @def_gl{BUFFER}
* @def_gl{BUFFER} or @fn_gl_extension{LabelObject,EXT,object_label} * or @fn_gl_extension2{LabelObject,EXT,debug_label} with
* with @def_gl{BUFFER_OBJECT_EXT} * @def_gl{BUFFER_OBJECT_EXT}
*/ */
Buffer& setLabel(const std::string& label); Buffer& setLabel(const std::string& label);

8
src/Framebuffer.h
Unescape View File

@ -309,10 +309,10 @@ class MAGNUM_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractObje
* *
* 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 neither @extension{KHR,debug} nor * OpenGL calls. If neither @extension{KHR,debug} nor
* @extension{EXT,debug_label} desktop or ES extension is available, * @extension2{EXT,debug_label} desktop or ES extension is available,
* this function returns empty string. * this function returns empty string.
* @see @fn_gl{GetObjectLabel} or * @see @fn_gl{GetObjectLabel} or
* @fn_gl_extension{GetObjectLabel,EXT,object_label} with * @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with
* @def_gl{FRAMEBUFFER} * @def_gl{FRAMEBUFFER}
*/ */
std::string label() const; std::string label() const;
@ -322,10 +322,10 @@ class MAGNUM_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractObje
* @return Reference to self (for method chaining) * @return Reference to self (for method chaining)
* *
* Default is empty string. If neither @extension{KHR,debug} nor * Default is empty string. If neither @extension{KHR,debug} nor
* @extension{EXT,debug_label} desktop or ES extension is available, * @extension2{EXT,debug_label} desktop or ES extension is available,
* this function does nothing. * this function does nothing.
* @see @ref maxLabelLength(), @fn_gl{ObjectLabel} or * @see @ref maxLabelLength(), @fn_gl{ObjectLabel} or
* @fn_gl_extension{LabelObject,EXT,object_label} with * @fn_gl_extension2{LabelObject,EXT,debug_label} with
* @def_gl{FRAMEBUFFER} * @def_gl{FRAMEBUFFER}
*/ */
Framebuffer& setLabel(const std::string& label); Framebuffer& setLabel(const std::string& label);

8
src/Mesh.h
Unescape View File

@ -420,10 +420,10 @@ class MAGNUM_EXPORT Mesh: public AbstractObject {
* *
* 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 neither @extension{KHR,debug} nor * OpenGL calls. If neither @extension{KHR,debug} nor
* @extension{EXT,debug_label} desktop or ES extension is available, * @extension2{EXT,debug_label} desktop or ES extension is available,
* this function returns empty string. * this function returns empty string.
* @see @fn_gl{GetObjectLabel} with @def_gl{VERTEX_ARRAY} or * @see @fn_gl{GetObjectLabel} with @def_gl{VERTEX_ARRAY} or
* @fn_gl_extension{GetObjectLabel,EXT,object_label} with * @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with
* @def_gl{VERTEX_ARRAY_OBJECT_EXT} * @def_gl{VERTEX_ARRAY_OBJECT_EXT}
*/ */
std::string label() const; std::string label() const;
@ -433,10 +433,10 @@ class MAGNUM_EXPORT Mesh: public AbstractObject {
* @return Reference to self (for method chaining) * @return Reference to self (for method chaining)
* *
* Default is empty string. If neither @extension{KHR,debug} nor * Default is empty string. If neither @extension{KHR,debug} nor
* @extension{EXT,debug_label} desktop or ES extension is available, * @extension2{EXT,debug_label} desktop or ES extension is available,
* this function does nothing. * this function does nothing.
* @see @ref maxLabelLength(), @fn_gl{ObjectLabel} with * @see @ref maxLabelLength(), @fn_gl{ObjectLabel} with
* @def_gl{VERTEX_ARRAY} or @fn_gl_extension{LabelObject,EXT,object_label} * @def_gl{VERTEX_ARRAY} or @fn_gl_extension2{LabelObject,EXT,debug_label}
* with @def_gl{VERTEX_ARRAY_OBJECT_EXT} * with @def_gl{VERTEX_ARRAY_OBJECT_EXT}
*/ */
Mesh& setLabel(const std::string& label); Mesh& setLabel(const std::string& label);

8
src/Query.h
Unescape View File

@ -53,10 +53,10 @@ class MAGNUM_EXPORT AbstractQuery: public AbstractObject {
* *
* 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 neither @extension{KHR,debug} nor * OpenGL calls. If neither @extension{KHR,debug} nor
* @extension{EXT,debug_label} desktop or ES extension is available, * @extension2{EXT,debug_label} desktop or ES extension is available,
* this function returns empty string. * this function returns empty string.
* @see @fn_gl{GetObjectLabel} with @def_gl{QUERY} or * @see @fn_gl{GetObjectLabel} with @def_gl{QUERY} or
* @fn_gl_extension{GetObjectLabel,EXT,object_label} with * @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with
* @def_gl{QUERY_OBJECT_EXT} * @def_gl{QUERY_OBJECT_EXT}
*/ */
std::string label() const; std::string label() const;
@ -66,10 +66,10 @@ class MAGNUM_EXPORT AbstractQuery: public AbstractObject {
* @return Reference to self (for method chaining) * @return Reference to self (for method chaining)
* *
* Default is empty string. If neither @extension{KHR,debug} nor * Default is empty string. If neither @extension{KHR,debug} nor
* @extension{EXT,debug_label} desktop or ES extension is available, * @extension2{EXT,debug_label} desktop or ES extension is available,
* this function does nothing. * this function does nothing.
* @see @ref maxLabelLength(), @fn_gl{ObjectLabel} with * @see @ref maxLabelLength(), @fn_gl{ObjectLabel} with
* @def_gl{QUERY} or @fn_gl_extension{LabelObject,EXT,object_label} * @def_gl{QUERY} or @fn_gl_extension2{LabelObject,EXT,debug_label}
* with @def_gl{QUERY_OBJECT_EXT} * with @def_gl{QUERY_OBJECT_EXT}
*/ */
AbstractQuery& setLabel(const std::string& label); AbstractQuery& setLabel(const std::string& label);

8
src/Renderbuffer.h
Unescape View File

@ -107,10 +107,10 @@ class MAGNUM_EXPORT Renderbuffer: public AbstractObject {
* *
* 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 neither @extension{KHR,debug} nor * OpenGL calls. If neither @extension{KHR,debug} nor
* @extension{EXT,debug_label} desktop or ES extension is available, * @extension2{EXT,debug_label} desktop or ES extension is available,
* this function returns empty string. * this function returns empty string.
* @see @fn_gl{GetObjectLabel} or * @see @fn_gl{GetObjectLabel} or
* @fn_gl_extension{GetObjectLabel,EXT,object_label} with * @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with
* @def_gl{RENDERBUFFER} * @def_gl{RENDERBUFFER}
*/ */
std::string label() const; std::string label() const;
@ -120,10 +120,10 @@ class MAGNUM_EXPORT Renderbuffer: public AbstractObject {
* @return Reference to self (for method chaining) * @return Reference to self (for method chaining)
* *
* Default is empty string. If neither @extension{KHR,debug} nor * Default is empty string. If neither @extension{KHR,debug} nor
* @extension{EXT,debug_label} desktop or ES extension is available, * @extension2{EXT,debug_label} desktop or ES extension is available,
* this function does nothing. * this function does nothing.
* @see @ref maxLabelLength(), @fn_gl{ObjectLabel} or * @see @ref maxLabelLength(), @fn_gl{ObjectLabel} or
* @fn_gl_extension{LabelObject,EXT,object_label} with * @fn_gl_extension2{LabelObject,EXT,debug_label} with
* @def_gl{RENDERBUFFER} * @def_gl{RENDERBUFFER}
*/ */
Renderbuffer& setLabel(const std::string& label); Renderbuffer& setLabel(const std::string& label);

8
src/Shader.h
Unescape View File

@ -461,10 +461,10 @@ class MAGNUM_EXPORT Shader: public AbstractObject {
* *
* 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 neither @extension{KHR,debug} nor * OpenGL calls. If neither @extension{KHR,debug} nor
* @extension{EXT,debug_label} desktop or ES extension is available, * @extension2{EXT,debug_label} desktop or ES extension is available,
* this function returns empty string. * this function returns empty string.
* @see @fn_gl{GetObjectLabel} with @def_gl{SHADER} or * @see @fn_gl{GetObjectLabel} with @def_gl{SHADER} or
* @fn_gl_extension{GetObjectLabel,EXT,object_label} with * @fn_gl_extension2{GetObjectLabel,EXT,debug_label} with
* @def_gl{SHADER_OBJECT_EXT} * @def_gl{SHADER_OBJECT_EXT}
*/ */
std::string label() const; std::string label() const;
@ -474,10 +474,10 @@ class MAGNUM_EXPORT Shader: public AbstractObject {
* @return Reference to self (for method chaining) * @return Reference to self (for method chaining)
* *
* Default is empty string. If neither @extension{KHR,debug} nor * Default is empty string. If neither @extension{KHR,debug} nor
* @extension{EXT,debug_label} desktop or ES extension is available, * @extension2{EXT,debug_label} desktop or ES extension is available,
* this function does nothing. * this function does nothing.
* @see @ref maxLabelLength(), @fn_gl{ObjectLabel} with * @see @ref maxLabelLength(), @fn_gl{ObjectLabel} with
* @def_gl{SHADER} or @fn_gl_extension{LabelObject,EXT,object_label} * @def_gl{SHADER} or @fn_gl_extension2{LabelObject,EXT,debug_label}
* with @def_gl{SHADER_OBJECT_EXT} * with @def_gl{SHADER_OBJECT_EXT}
*/ */
Shader& setLabel(const std::string& label); Shader& setLabel(const std::string& label);

Write Preview
Loading…
Cancel
Save