diff --git a/doc/vulkan-mapping.dox b/doc/vulkan-mapping.dox index 2b7501770..07890b3fa 100644 --- a/doc/vulkan-mapping.dox +++ b/doc/vulkan-mapping.dox @@ -110,7 +110,7 @@ Vulkan function | Matching API Vulkan function | Matching API --------------------------------------- | ------------ @fn_vk{CmdBeginQuery}, \n @fn_vk{CmdEndQuery} | | -@fn_vk{CmdBeginDebugUtilsLabelEXT} @m_class{m-label m-flat m-warning} **EXT**, \n @fn_vk{CmdEndebugUtilsLabelEXT} @m_class{m-label m-flat m-warning} **EXT** | | +@fn_vk{CmdBeginDebugUtilsLabelEXT} @m_class{m-label m-flat m-warning} **EXT**, \n @fn_vk{CmdEndDebugUtilsLabelEXT} @m_class{m-label m-flat m-warning} **EXT** | | @fn_vk{CmdBeginRenderPass}, \n @fn_vk{CmdBeginRenderPass2} @m_class{m-label m-flat m-success} **KHR, 1.2**, \n @fn_vk{CmdNextSubpass}, \n @fn_vk{CmdNextSubpass2} @m_class{m-label m-flat m-success} **KHR, 1.2**, \n @fn_vk{CmdEndRenderpass}, \n @fn_vk{CmdEndRenderpass2} @m_class{m-label m-flat m-success} **KHR, 1.2** | @ref CommandBuffer::beginRenderPass(), \n @ref CommandBuffer::nextSubpass(), \n @ref CommandBuffer::endRenderPass() @fn_vk{CmdBindDescriptorSets} | | @fn_vk{CmdBindIndexBuffer} | | diff --git a/src/Magnum/Vk/CommandBuffer.h b/src/Magnum/Vk/CommandBuffer.h index f77a3c425..0ced89cc1 100644 --- a/src/Magnum/Vk/CommandBuffer.h +++ b/src/Magnum/Vk/CommandBuffer.h @@ -349,9 +349,9 @@ class MAGNUM_VK_EXPORT CommandBuffer { * @fn_vk_keyword{CmdEndRenderPass} */ #ifdef DOXYGEN_GENERATING_OUTPUT - CommandBuffer& endRenderPass(const SubpassEndInfo& info = SubpassEndInfo{}); + CommandBuffer& endRenderPass(const SubpassEndInfo& endInfo = SubpassEndInfo{}); #else - CommandBuffer& endRenderPass(const SubpassEndInfo& info); + CommandBuffer& endRenderPass(const SubpassEndInfo& endInfo); CommandBuffer& endRenderPass(); #endif diff --git a/src/Magnum/Vk/RenderPassCreateInfo.h b/src/Magnum/Vk/RenderPassCreateInfo.h index 81fccc900..b91d412bb 100644 --- a/src/Magnum/Vk/RenderPassCreateInfo.h +++ b/src/Magnum/Vk/RenderPassCreateInfo.h @@ -125,7 +125,7 @@ information. While the class operates on the @type_vk{AttachmentDescription2} structure that's new in Vulkan 1.2 or is provided by the -@vk_extension{KHR,create_renderpass2} extenstion, conversion from and to +@vk_extension{KHR,create_renderpass2} extension, conversion from and to @type_vk{AttachmentDescription} is provided to some extent --- you can create an @ref AttachmentDescription from it, call various methods on the instance and then get a @type_vk{AttachmentDescription} back again using @@ -333,7 +333,7 @@ inside a @ref SubpassDescription, which is subsequently passed to a While the class operates on the @type_vk{AttachmentReference2} structure that's new in Vulkan 1.2 or is provided by the @vk_extension{KHR,create_renderpass2} -extenstion, conversion from and to @type_vk{AttachmentReference} is provided to +extension, conversion from and to @type_vk{AttachmentReference} is provided to some extent --- you can create an @ref AttachmentReference from it, call various methods on the instance and then get a @type_vk{AttachmentReference} back again using @ref vkAttachmentReference(). @@ -458,7 +458,7 @@ information. While the class operates on the @type_vk{SubpassDescription2} structure that's new in Vulkan 1.2 or is provided by the @vk_extension{KHR,create_renderpass2} -extenstion, conversion from and to @type_vk{SubpassDescription} is provided to +extension, conversion from and to @type_vk{SubpassDescription} is provided to some extent --- you can create a @ref SubpassDescription from it, call various methods on the instance and then get a @type_vk{SubpassDescription} back again using @ref vkSubpassDescription(). Note that, because of the nested data @@ -699,7 +699,7 @@ information. While the class operates on the @type_vk{SubpassDependency2} structure that's new in Vulkan 1.2 or is provided by the @vk_extension{KHR,create_renderpass2} -extenstion, conversion from and to @type_vk{SubpassDependency} is provided to +extension, conversion from and to @type_vk{SubpassDependency} is provided to some extent --- you can create a @ref SubpassDependency from it, call various methods on the instance and then get a @type_vk{SubpassDependency} back again using @ref vkSubpassDependency(). @@ -835,7 +835,7 @@ Wraps a @type_vk_keyword{RenderPassCreateInfo2}. See While the class operates on the @type_vk{RenderPassCreateInfo2} structure that's new in Vulkan 1.2 or is provided by the -@vk_extension{KHR,create_renderpass2} extenstion, conversion from and to +@vk_extension{KHR,create_renderpass2} extension, conversion from and to @type_vk{RenderPassCreateInfo} is provided to some extent ---- you can create a @ref RenderPassCreateInfo from it, call various methods on the instance and then get a @type_vk{RenderPassCreateInfo} back again using