From 28032a39098af7c1b3d7c59c33bf3498e09ed547 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 23 Nov 2013 10:54:56 +0100 Subject: [PATCH] Doc++ --- src/AbstractShaderProgram.h | 8 +++++--- src/Buffer.h | 2 +- src/Shader.cpp | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/AbstractShaderProgram.h b/src/AbstractShaderProgram.h index 87fef947a..eaa4b3c2b 100644 --- a/src/AbstractShaderProgram.h +++ b/src/AbstractShaderProgram.h @@ -216,7 +216,7 @@ layout(binding = 1) uniform sampler2D specularTexture; If you don't have the required extension (or if you want to change the layer later), declare the uniforms without the `layout()` qualifier and set the -texture layer uniform using @ref setUniform(Int, const T&) "setUniform(Int, Int)". +texture layer uniform using @ref Magnum::AbstractShaderProgram::setUniform(Int, const T&) "setUniform(Int, Int)". Note that additional syntax changes may be needed for GLSL 1.20 and GLSL ES 1.0. @code @@ -230,9 +230,11 @@ setUniform(SpecularTextureUniform, SpecularTextureLayer); @see @ref Shader::maxTextureImageUnits() @requires_gl42 %Extension @extension{ARB,shading_language_420pack} for explicit - texture layer binding instead of using @ref setUniform(Int, const T&) "setUniform(Int, Int)". + texture layer binding instead of using + @ref Magnum::AbstractShaderProgram::setUniform(Int, const T&) "setUniform(Int, Int)". @requires_gl Explicit texture layer binding is not supported in OpenGL ES. Use - @ref setUniform(Int, const T&) "setUniform(Int, Int)" instead. + @ref Magnum::AbstractShaderProgram::setUniform(Int, const T&) "setUniform(Int, Int)" + instead. @section AbstractShaderProgram-rendering-workflow Rendering workflow diff --git a/src/Buffer.h b/src/Buffer.h index 14a3447b8..0c7384777 100644 --- a/src/Buffer.h +++ b/src/Buffer.h @@ -44,7 +44,7 @@ namespace Magnum { /** * @brief %Buffer usage * - * @see @ref Buffer::setData(Containers::ArrayReference, BufferUsage) + * @see @ref Buffer::setData(Containers::ArrayReference, BufferUsage) */ enum class BufferUsage: GLenum { /** diff --git a/src/Shader.cpp b/src/Shader.cpp index 3bd02eac6..4993c0f4b 100644 --- a/src/Shader.cpp +++ b/src/Shader.cpp @@ -627,7 +627,7 @@ bool Shader::compile() { CORRADE_ASSERT(sources.size() > 1, "Shader::compile(): no files added", false); /* Array of source string pointers and their lengths */ - /** @todo Use `Containers::::ArrayTuple` to avoid one allocation if it ever + /** @todo Use `Containers::ArrayTuple` to avoid one allocation if it ever gets to be implemented (we need properly aligned memory too) */ Containers::Array pointers(sources.size()); Containers::Array sizes(sources.size());