diff --git a/doc/vulkan-mapping.dox b/doc/vulkan-mapping.dox index 3db6bbb0a..e2a2ae4ff 100644 --- a/doc/vulkan-mapping.dox +++ b/doc/vulkan-mapping.dox @@ -938,7 +938,7 @@ Vulkan enum | Matching API @type_vk{QueryPipelineStatisticFlagBits}, \n @type_vk{QueryPipelineStatisticFlags} | | @type_vk{QueryResultFlagBits}, \n @type_vk{QueryResultFlags} | | @type_vk{QueryType} | | -@type_vk{QueueFlagBits}, \n @type_vk{QueueFlags} | | +@type_vk{QueueFlagBits}, \n @type_vk{QueueFlags} | @ref QueueFlag, \n @ref QueueFlags @subsection vulkan-mapping-enums-r R diff --git a/src/Magnum/Vk/Device.h b/src/Magnum/Vk/Device.h index 581871a16..4b5ef53d5 100644 --- a/src/Magnum/Vk/Device.h +++ b/src/Magnum/Vk/Device.h @@ -423,8 +423,8 @@ class MAGNUM_VK_EXPORT Device { * @snippet MagnumVk.cpp Device-isExtensionEnabled * * Note that this returns @cpp true @ce only if given extension is - * supported by the driver *and* it was enabled in - * @ref DeviceCreateInfo when creating the @ref Device. For querying + * supported by the driver *and* it was enabled via + * @ref DeviceCreateInfo::addEnabledExtensions(). For querying * extension support before creating a device use * @ref ExtensionProperties::isSupported(). */ @@ -439,7 +439,8 @@ class MAGNUM_VK_EXPORT Device { /** * @brief Features enabled on the device * - * @see @ref DeviceProperties::features() + * @see @ref DeviceCreateInfo::setEnabledFeatures(), + * @ref DeviceProperties::features() */ const DeviceFeatures& enabledFeatures() const { return _enabledFeatures; } diff --git a/src/Magnum/Vk/DeviceCreateInfo.h b/src/Magnum/Vk/DeviceCreateInfo.h index bb5b9babc..44fc0c45c 100644 --- a/src/Magnum/Vk/DeviceCreateInfo.h +++ b/src/Magnum/Vk/DeviceCreateInfo.h @@ -176,7 +176,7 @@ class MAGNUM_VK_EXPORT DeviceCreateInfo { * or in at least one of the enabled layers, use * @ref ExtensionProperties::isSupported() to check for their presence. * - * The function makes copies of string views that are not owning or + * The function makes copies of string views that are not global or * null-terminated, use the @link Containers::Literals::operator""_s() @endlink * literal to prevent that where possible. */ diff --git a/src/Magnum/Vk/DeviceFeatures.h b/src/Magnum/Vk/DeviceFeatures.h index 5f51040d3..df5d06d95 100644 --- a/src/Magnum/Vk/DeviceFeatures.h +++ b/src/Magnum/Vk/DeviceFeatures.h @@ -46,7 +46,7 @@ Contains information stored in the @type_vk_keyword{PhysicalDeviceFeatures2} structure chain. Values correspond to equivalently named structure fields, usually just with the first letter uppercase instead of lowercase. @see @ref DeviceFeatures, @ref DeviceProperties::features(), - @ref Device::enabledFeatures() + @ref DeviceCreateInfo::setEnabledFeatures(), @ref Device::enabledFeatures() @todo @type_vk{PhysicalDeviceVulkan12Features} additionally has `samplerMirrorClampToEdge`, `drawIndirectCount`, `descriptorIndexing`, diff --git a/src/Magnum/Vk/Instance.h b/src/Magnum/Vk/Instance.h index 2e2918970..7e1eec334 100644 --- a/src/Magnum/Vk/Instance.h +++ b/src/Magnum/Vk/Instance.h @@ -371,9 +371,9 @@ class MAGNUM_VK_EXPORT Instance { * @snippet MagnumVk.cpp Instance-isExtensionEnabled * * Note that this returns @cpp true @ce only if given extension is - * supported by the driver *and* it was enabled in - * @ref InstanceCreateInfo when creating the @ref Instance. For - * querying extension support before creating an instance use + * supported by the driver *and* it was enabled via + * @ref InstanceCreateInfo::addEnabledExtensions(). For querying + * extension support before creating an instance use * @ref InstanceExtensionProperties::isSupported(). */ template bool isExtensionEnabled() const { diff --git a/src/Magnum/Vk/InstanceCreateInfo.h b/src/Magnum/Vk/InstanceCreateInfo.h index 2dae05001..24f91a1bf 100644 --- a/src/Magnum/Vk/InstanceCreateInfo.h +++ b/src/Magnum/Vk/InstanceCreateInfo.h @@ -156,7 +156,7 @@ class MAGNUM_VK_EXPORT InstanceCreateInfo { * Use the @ref version() helper to create the @p version value. The * name is @cpp nullptr @ce by default. * - * The function makes copies of string views that are not owning or + * The function makes copies of string views that are not global or * null-terminated, use the @link Containers::Literals::operator""_s() @endlink * literal to prevent that where possible. */ @@ -172,7 +172,7 @@ class MAGNUM_VK_EXPORT InstanceCreateInfo { * @ref Vk-Instance-command-line "command-line options", it's not * added. * - * The function makes copies of string views that are not owning or + * The function makes copies of string views that are not global or * null-terminated, use the @link Containers::Literals::operator""_s() @endlink * literal to prevent that where possible. */ @@ -192,7 +192,7 @@ class MAGNUM_VK_EXPORT InstanceCreateInfo { * @ref Vk-Instance-command-line "command-line options", it's not * added. * - * The function makes copies of string views that are not owning or + * The function makes copies of string views that are not global or * null-terminated, use the @link Containers::Literals::operator""_s() @endlink * literal to prevent that where possible. */ diff --git a/src/Magnum/Vk/Memory.h b/src/Magnum/Vk/Memory.h index 9aeac6c62..2e4920dd7 100644 --- a/src/Magnum/Vk/Memory.h +++ b/src/Magnum/Vk/Memory.h @@ -27,6 +27,7 @@ /** @file * @brief Class @ref Magnum::Vk::MemoryRequirements, @ref Magnum::Vk::MemoryAllocateInfo, @ref Magnum::Vk::Memory, enum @ref Magnum::Vk::MemoryFlag, enum set @ref Magnum::Vk::MemoryFlags + * @m_since_latest */ #include diff --git a/src/Magnum/Vk/MemoryAllocateInfo.h b/src/Magnum/Vk/MemoryAllocateInfo.h index 67d6472fc..f0290e519 100644 --- a/src/Magnum/Vk/MemoryAllocateInfo.h +++ b/src/Magnum/Vk/MemoryAllocateInfo.h @@ -27,6 +27,7 @@ /** @file * @brief Class @ref Magnum::Vk::MemoryRequirements, @ref Magnum::Vk::MemoryAllocateInfo + * @m_since_latest */ #include "Magnum/Magnum.h" diff --git a/src/Magnum/Vk/PixelFormat.h b/src/Magnum/Vk/PixelFormat.h index cffd0ad42..41f8f8bca 100644 --- a/src/Magnum/Vk/PixelFormat.h +++ b/src/Magnum/Vk/PixelFormat.h @@ -1394,7 +1394,10 @@ enum class PixelFormat: Int { CompressedPvrtc2RGBA4bppSrgb = VK_FORMAT_PVRTC2_4BPP_SRGB_BLOCK_IMG }; -/** @debugoperatorenum{PixelFormat} */ +/** +@debugoperatorenum{PixelFormat} +@m_since_latest +*/ MAGNUM_VK_EXPORT Debug& operator<<(Debug& debug, PixelFormat value); /** diff --git a/src/Magnum/Vk/RenderPass.h b/src/Magnum/Vk/RenderPass.h index 68ed91005..df75e4e6d 100644 --- a/src/Magnum/Vk/RenderPass.h +++ b/src/Magnum/Vk/RenderPass.h @@ -27,6 +27,7 @@ /** @file * @brief Class @ref Magnum::Vk::RenderPass, @ref Magnum::Vk::RenderPassBeginInfo, @ref Magnum::Vk::SubpassBeginInfo, @ref Magnum::Vk::SubpassEndInfo, enum @ref Magnum::Vk::SubpassContents + * @m_since_latest */ #include diff --git a/src/Magnum/Vk/RenderPassCreateInfo.h b/src/Magnum/Vk/RenderPassCreateInfo.h index 122711f7c..8f84e6ca4 100644 --- a/src/Magnum/Vk/RenderPassCreateInfo.h +++ b/src/Magnum/Vk/RenderPassCreateInfo.h @@ -27,6 +27,7 @@ /** @file * @brief Class @ref Magnum::Vk::AttachmentDescription, @ref Magnum::Vk::AttachmentReference, @ref Magnum::Vk::SubpassDescription, @ref Magnum::Vk::SubpassDependency, @ref Magnum::Vk::RenderPassCreateInfo, enum @ref Magnum::Vk::AttachmentLoadOperation, @ref Magnum::Vk::AttachmentStoreOperation + * @m_since_latest */ #include