diff --git a/doc/cmake.dox b/doc/cmake.dox index 524086e17..cea2328cb 100644 --- a/doc/cmake.dox +++ b/doc/cmake.dox @@ -103,7 +103,7 @@ Platform namespace is split into more components: - `%WindowlessWglApplication` -- @ref Platform::WindowlessWglApplication "WindowlessWglApplication" For manual context creation (without application wrappers) there are also -platform-specific context libraries (see @ref platfom-custom for more +platform-specific context libraries (see @ref platform-custom for more information): - `CglContext` -- CGL context diff --git a/doc/opengl-support.dox b/doc/opengl-support.dox index 1dbe88f94..48ce39b86 100644 --- a/doc/opengl-support.dox +++ b/doc/opengl-support.dox @@ -108,7 +108,7 @@ following: %Extension | Status -------------------------------------------- | ------ @extension{ARB,instanced_arrays} | done -@extension{ARB,blend_func_extended} | missing limit query +@extension{ARB,blend_func_extended} | done @extension{ARB,explicit_attrib_location} | done (shading language only) @extension{ARB,occlusion_query2} | done @extension{ARB,sampler_objects} | | diff --git a/src/Magnum/AbstractFramebuffer.h b/src/Magnum/AbstractFramebuffer.h index 625e453c8..c3c11c26e 100644 --- a/src/Magnum/AbstractFramebuffer.h +++ b/src/Magnum/AbstractFramebuffer.h @@ -195,8 +195,8 @@ class MAGNUM_EXPORT AbstractFramebuffer { * @brief Max supported dual-source draw buffer count * * The result is cached, repeated queries don't result in repeated - * OpenGL calls. If extension @extension{ARB,blend_func_extended} is - * not available, returns `0`. + * OpenGL calls. If extension @extension{ARB,blend_func_extended} (part + * of OpenGL 3.3) is not available, returns `0`. * @see @ref DefaultFramebuffer::mapForDraw(), @ref Framebuffer::mapForDraw(), * @fn_gl{Get} with @def_gl{MAX_DUAL_SOURCE_DRAW_BUFFERS} * @requires_gl Multiple blending inputs are not available in diff --git a/src/Magnum/Framebuffer.h b/src/Magnum/Framebuffer.h index 9741d1a88..eceb3e023 100644 --- a/src/Magnum/Framebuffer.h +++ b/src/Magnum/Framebuffer.h @@ -293,8 +293,8 @@ class MAGNUM_EXPORT Framebuffer: public AbstractFramebuffer, public AbstractObje * @brief Max supported color attachment count * * The result is cached, repeated queries don't result in repeated - * OpenGL calls. If ES extension @extension{NV,fbo_color_attachments} - * is not available, returns `0`. + * OpenGL calls. If neither OpenGL ES 3.0 nor ES extension + * @extension{NV,fbo_color_attachments} is available, returns `0`. * @see @ref mapForDraw(), @fn_gl{Get} with @def_gl{MAX_COLOR_ATTACHMENTS} */ static Int maxColorAttachments(); diff --git a/src/Magnum/Renderbuffer.h b/src/Magnum/Renderbuffer.h index c5bfe4b4f..3173e3d6d 100644 --- a/src/Magnum/Renderbuffer.h +++ b/src/Magnum/Renderbuffer.h @@ -75,9 +75,9 @@ class MAGNUM_EXPORT Renderbuffer: public AbstractObject { * @brief Max supported sample count * * The result is cached, repeated queries don't result in repeated - * OpenGL calls. If ES extension @es_extension{ANGLE,framebuffer_multisample} - * or @es_extension{NV,framebuffer_multisample} is not available, - * returns `0`. + * OpenGL calls. If neither OpenGL ES 3.0 nor ES extension + * @es_extension{ANGLE,framebuffer_multisample} / + * @es_extension{NV,framebuffer_multisample} is available, returns `0`. * @see @ref setStorageMultisample(), @fn_gl{Get} with @def_gl{MAX_SAMPLES} */ static Int maxSamples(); diff --git a/src/Magnum/Renderer.h b/src/Magnum/Renderer.h index e69e8f3c4..bbaddfd24 100644 --- a/src/Magnum/Renderer.h +++ b/src/Magnum/Renderer.h @@ -452,8 +452,8 @@ class MAGNUM_EXPORT Renderer { * * Initial value is `1.0f`. * @see @ref Feature::ProgramPointSize, @fn_gl{PointSize} - * @requires_gl In OpenGL ES use `gl_PointSize` builtin vertex shader - * variable. + * @requires_gl Use `gl_PointSize` builtin vertex shader variable in + * OpenGL ES instead. */ static void setPointSize(Float size); #endif diff --git a/src/Magnum/TextureArray.h b/src/Magnum/TextureArray.h index 78630806d..f4865b588 100644 --- a/src/Magnum/TextureArray.h +++ b/src/Magnum/TextureArray.h @@ -400,13 +400,19 @@ template class TextureArray: public AbstractTexture { /** @brief One-dimensional texture array +@requires_gl30 %Extension @extension{EXT,texture_array} @requires_gl Only @ref Magnum::Texture2DArray "Texture2DArray" is available in OpenGL ES. */ typedef TextureArray<1> Texture1DArray; #endif -/** @brief Two-dimensional texture array */ +/** +@brief Two-dimensional texture array + +@requires_gl30 %Extension @extension{EXT,texture_array} +@requires_gles30 %Array textures are not available in OpenGL ES 2.0. +*/ typedef TextureArray<2> Texture2DArray; }