From 48db23fc87c82db34391cc2758be3170746e6928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 6 Feb 2020 11:55:13 +0100 Subject: [PATCH] doc: improve GL API mapping. --- doc/opengl-mapping.dox | 7 +++---- src/Magnum/GL/Mesh.h | 3 ++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/opengl-mapping.dox b/doc/opengl-mapping.dox index 932f690d6..1848fdefc 100644 --- a/doc/opengl-mapping.dox +++ b/doc/opengl-mapping.dox @@ -186,7 +186,7 @@ OpenGL function | Matching API @fn_gl{GenRenderbuffers}, \n @fn_gl{CreateRenderbuffers}, \n @fn_gl{DeleteRenderbuffers} | @ref GL::Renderbuffer constructor and destructor @fn_gl{GenSamplers}, \n @fn_gl{CreateSamplers}, \n @fn_gl{DeleteSamplers} | | @fn_gl{GenTextures}, \n @fn_gl{CreateTextures}, \n @fn_gl{DeleteTextures} | @ref GL::AbstractTexture constructor and destructor -@fn_gl{GenTransformFeedbacks}, \n @fn_gl{CreateTransformFeedbacks}, \n @fn_gl{DeleteTransformFeedbacks} | | +@fn_gl{GenTransformFeedbacks}, \n @fn_gl{CreateTransformFeedbacks}, \n @fn_gl{DeleteTransformFeedbacks} | @ref GL::TransformFeedback constructor and destructor @fn_gl{GenVertexArrays}, \n @fn_gl{CreateVertexArrays}, \n @fn_gl{DeleteVertexArrays} | @ref GL::Mesh constructor and destructor @fn_gl{GenerateMipmap}, \n `glGenerateTextureMipmap()` | @ref GL::Texture::generateMipmap(), \n @ref GL::TextureArray::generateMipmap(), \n @ref GL::CubeMapTexture::generateMipmap(), \n @ref GL::CubeMapTextureArray::generateMipmap() @fn_gl{Get} | see @ref opengl-mapping-state "table below" @@ -405,7 +405,7 @@ OpenGL function | Matching API --------------------------------------- | ------------ @fn_gl{ValidateProgram} | @ref GL::AbstractShaderProgram::validate() @fn_gl{ValidateProgramPipeline} | | -@fn_gl{VertexArrayElementBuffer} | | +@fn_gl{VertexArrayElementBuffer} | @ref GL::Mesh::setIndexBuffer() @fn_gl{VertexAttrib} | not supported (@ref opengl-unsupported "details") @fn_gl{VertexAttribBinding}, \n `glVertexArrayAttribBinding()` | | @fn_gl{VertexAttribDivisor} | @ref GL::Mesh::addVertexBufferInstanced() @@ -555,8 +555,7 @@ glGet() parameter | Matching API @def_gl{SHADER_COMPILER} | not supported (@ref opengl-unsupported "details") @def_gl{SHADER_STORAGE_BUFFER_BINDING}, \n @def_gl{SHADER_STORAGE_BUFFER_SIZE}, \n @def_gl{SHADER_STORAGE_BUFFER_START} | not queryable @def_gl{SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT} | @ref GL::Buffer::shaderStorageOffsetAlignment() -@def_gl{SMOOTH_LINE_WIDTH_GRANULARITY} / @def_gl{LINE_WIDTH_GRANULARITY}, \n -@def_gl{SMOOTH_LINE_WIDTH_RANGE} / @def_gl{LINE_WIDTH_RANGE} | not supported (@ref opengl-unsupported "details") +@def_gl{SMOOTH_LINE_WIDTH_GRANULARITY}, @def_gl{LINE_WIDTH_GRANULARITY}, \n @def_gl{SMOOTH_LINE_WIDTH_RANGE}, @def_gl{LINE_WIDTH_RANGE} | not supported (@ref opengl-unsupported "details") @def_gl{STENCIL_BACK_FUNC}, \n @def_gl{STENCIL_BACK_REF}, \n @def_gl{STENCIL_BACK_VALUE_MASK}, \n @def_gl{STENCIL_FUNC}, \n @def_gl{STENCIL_REF}, \n @def_gl{STENCIL_VALUE_MASK} | not queryable, @ref GL::Renderer::setStencilFunction() setter only @def_gl{STENCIL_BACK_FAIL}, \n @def_gl{STENCIL_BACK_PASS_DEPTH_FAIL}, \n @def_gl{STENCIL_BACK_PASS_DEPTH_PASS}, \n @def_gl{STENCIL_FAIL}, \n @def_gl{STENCIL_PASS_DEPTH_FAIL}, \n @def_gl{STENCIL_PASS_DEPTH_PASS} | not queryable, @ref GL::Renderer::setStencilOperation() setter only @def_gl{SUBPIXEL_BITS} | | diff --git a/src/Magnum/GL/Mesh.h b/src/Magnum/GL/Mesh.h index a04d121fa..27042152a 100644 --- a/src/Magnum/GL/Mesh.h +++ b/src/Magnum/GL/Mesh.h @@ -864,7 +864,8 @@ class MAGNUM_GL_EXPORT Mesh: public AbstractObject { * * @see @ref maxElementIndex(), @ref maxElementsIndices(), * @ref maxElementsVertices(), @ref setCount(), @ref isIndexed(), - * @fn_gl{BindVertexArray}, @fn_gl{BindBuffer} + * @fn_gl{BindVertexArray}, @fn_gl{BindBuffer} or + * @fn_gl_keyword{VertexArrayElementBuffer} */ Mesh& setIndexBuffer(Buffer& buffer, GLintptr offset, MeshIndexType type, UnsignedInt start, UnsignedInt end);