From 8da626e16dffdf9a0d6cabbb731399a2aa6b3e84 Mon Sep 17 00:00:00 2001 From: Jon Leech Date: Fri, 29 Apr 2016 15:24:14 +0200 Subject: [PATCH] Merge misc. tweaks from private repository. --- .../VK_KHR_wayland_surface/vk_khr_wayland_surface.txt | 2 +- .../VK_KHR_wayland_surface/platformCreateSurface_wayland.txt | 4 ++-- .../vulkan/validity/protos/vkCmdCopyQueryPoolResults.txt | 4 ++-- doc/specs/vulkan/validity/protos/vkGetQueryPoolResults.txt | 4 ++-- doc/specs/vulkan/validity/structs/VkSpecializationInfo.txt | 2 +- doc/specs/vulkan/validity/structs/VkSubpassDescription.txt | 2 +- src/vulkan/vulkan.h | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/specs/vulkan/appendices/VK_KHR_wayland_surface/vk_khr_wayland_surface.txt b/doc/specs/vulkan/appendices/VK_KHR_wayland_surface/vk_khr_wayland_surface.txt index 003464e8..391c7e98 100644 --- a/doc/specs/vulkan/appendices/VK_KHR_wayland_surface/vk_khr_wayland_surface.txt +++ b/doc/specs/vulkan/appendices/VK_KHR_wayland_surface/vk_khr_wayland_surface.txt @@ -8,7 +8,7 @@ *IP Status*:: No known IP claims. *Dependencies*:: - - This extension is written against version 0.151.0 of the {apiname} API. + - This extension is written against version 0.151.0 of the Vulkan API. - This extension requires VK_KHR_surface. *Contributors*:: - Patrick Doane, Blizzard diff --git a/doc/specs/vulkan/chapters/VK_KHR_wayland_surface/platformCreateSurface_wayland.txt b/doc/specs/vulkan/chapters/VK_KHR_wayland_surface/platformCreateSurface_wayland.txt index 677379ab..a992af35 100644 --- a/doc/specs/vulkan/chapters/VK_KHR_wayland_surface/platformCreateSurface_wayland.txt +++ b/doc/specs/vulkan/chapters/VK_KHR_wayland_surface/platformCreateSurface_wayland.txt @@ -37,13 +37,13 @@ the window, after the first image is presented. pname:minImageExtent is latexmath:[$(1,1)$], and pname:maxImageExtent is the maximum supported surface size. -Some {apiname} functions may: send protocol over the specified +Some Vulkan functions may: send protocol over the specified code:wl_device connection when using a swapchain or presentable images created from a slink:VkSurfaceKHR referring to a code:wl_surface. Applications must: therefore ensure that both the code:wl_device and the code:wl_surface remain valid for the lifetime of any slink:VkSwapchainKHR objects created from a particular code:wl_device and code:wl_surface. Also, -calling flink:vkQueuePresentKHR will result in {apiname} sending +calling flink:vkQueuePresentKHR will result in Vulkan sending code:wl_surface.commit requests to the underlying code:wl_surface of each slink:VkSwapchainKHR objects referenced by pname:pPresentInfo. Therefore, if the application wishes to synchronize any window changes with a particular diff --git a/doc/specs/vulkan/validity/protos/vkCmdCopyQueryPoolResults.txt b/doc/specs/vulkan/validity/protos/vkCmdCopyQueryPoolResults.txt index 07bdd94a..34847878 100644 --- a/doc/specs/vulkan/validity/protos/vkCmdCopyQueryPoolResults.txt +++ b/doc/specs/vulkan/validity/protos/vkCmdCopyQueryPoolResults.txt @@ -18,8 +18,8 @@ endif::doctype-manpage[] * pname:dstOffset must: be less than the size of pname:dstBuffer * pname:firstQuery must: be less than the number of queries in pname:queryPool * The sum of pname:firstQuery and pname:queryCount must: be less than or equal to the number of queries in pname:queryPool -* If ename:VK_QUERY_RESULT_64_BIT is not set in pname:flags then pname:dstOffset and pname:stride must be multiples of `4` -* If ename:VK_QUERY_RESULT_64_BIT is set in pname:flags then pname:dstOffset and pname:stride must be multiples of `8` +* If ename:VK_QUERY_RESULT_64_BIT is not set in pname:flags then pname:dstOffset and pname:stride must: be multiples of `4` +* If ename:VK_QUERY_RESULT_64_BIT is set in pname:flags then pname:dstOffset and pname:stride must: be multiples of `8` * pname:dstBuffer must: have enough storage, from pname:dstOffset, to contain the result of each query, as described <> * pname:dstBuffer must: have been created with ename:VK_BUFFER_USAGE_TRANSFER_DST_BIT usage flag * If the pname:queryType used to create pname:queryPool was ename:VK_QUERY_TYPE_TIMESTAMP, pname:flags mustnot: contain ename:VK_QUERY_RESULT_PARTIAL_BIT diff --git a/doc/specs/vulkan/validity/protos/vkGetQueryPoolResults.txt b/doc/specs/vulkan/validity/protos/vkGetQueryPoolResults.txt index ed588a52..1d5261b8 100644 --- a/doc/specs/vulkan/validity/protos/vkGetQueryPoolResults.txt +++ b/doc/specs/vulkan/validity/protos/vkGetQueryPoolResults.txt @@ -15,8 +15,8 @@ endif::doctype-manpage[] * pname:queryPool must: have been created, allocated or retrieved from pname:device * Each of pname:device and pname:queryPool must: have been created, allocated or retrieved from the same sname:VkPhysicalDevice * pname:firstQuery must: be less than the number of queries in pname:queryPool -* If ename:VK_QUERY_RESULT_64_BIT is not set in pname:flags then pname:pData and pname:stride must be multiples of `4` -* If ename:VK_QUERY_RESULT_64_BIT is set in pname:flags then pname:pData and pname:stride must be multiples of `8` +* If ename:VK_QUERY_RESULT_64_BIT is not set in pname:flags then pname:pData and pname:stride must: be multiples of `4` +* If ename:VK_QUERY_RESULT_64_BIT is set in pname:flags then pname:pData and pname:stride must: be multiples of `8` * The sum of pname:firstQuery and pname:queryCount must: be less than or equal to the number of queries in pname:queryPool * pname:dataSize must: be large enough to contain the result of each query, as described <> * If the pname:queryType used to create pname:queryPool was ename:VK_QUERY_TYPE_TIMESTAMP, pname:flags mustnot: contain ename:VK_QUERY_RESULT_PARTIAL_BIT diff --git a/doc/specs/vulkan/validity/structs/VkSpecializationInfo.txt b/doc/specs/vulkan/validity/structs/VkSpecializationInfo.txt index 7053c7f8..26e8b37d 100644 --- a/doc/specs/vulkan/validity/structs/VkSpecializationInfo.txt +++ b/doc/specs/vulkan/validity/structs/VkSpecializationInfo.txt @@ -10,7 +10,7 @@ endif::doctype-manpage[] * If pname:mapEntryCount is not `0`, pname:pMapEntries must: be a pointer to an array of pname:mapEntryCount sname:VkSpecializationMapEntry structures * If pname:dataSize is not `0`, pname:pData must: be a pointer to an array of pname:dataSize bytes * The pname:offset member of any given element of pname:pMapEntries must: be less than pname:dataSize -* For any given element of pname:pMapEntries, pname:size must be less than or equal to pname:dataSize minus pname:offset +* For any given element of pname:pMapEntries, pname:size must: be less than or equal to pname:dataSize minus pname:offset ifndef::doctype-manpage[] ******************************************************************************** endif::doctype-manpage[] diff --git a/doc/specs/vulkan/validity/structs/VkSubpassDescription.txt b/doc/specs/vulkan/validity/structs/VkSubpassDescription.txt index a2f507e2..4f39e801 100644 --- a/doc/specs/vulkan/validity/structs/VkSubpassDescription.txt +++ b/doc/specs/vulkan/validity/structs/VkSubpassDescription.txt @@ -25,7 +25,7 @@ endif::doctype-manpage[] * If any input attachments are ename:VK_ATTACHMENT_UNUSED, then any pipelines bound during the subpass mustnot: accesss those input attachments from the fragment shader * The pname:attachment member of any element of pname:pPreserveAttachments mustnot: be ename:VK_ATTACHMENT_UNUSED * Any given element of pname:pPreserveAttachments mustnot: also be an element of any other member of the subpass description -* If any attachment is used as both an input attachment and a color or depth/stencil attachment, then each use must use the same pname:layout +* If any attachment is used as both an input attachment and a color or depth/stencil attachment, then each use must: use the same pname:layout ifndef::doctype-manpage[] ******************************************************************************** endif::doctype-manpage[] diff --git a/src/vulkan/vulkan.h b/src/vulkan/vulkan.h index c26d4ce9..206d5fe7 100644 --- a/src/vulkan/vulkan.h +++ b/src/vulkan/vulkan.h @@ -3428,7 +3428,7 @@ typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceDisplayPropertiesKHR)(VkPhys typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceDisplayPlanePropertiesKHR)(VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkDisplayPlanePropertiesKHR* pProperties); typedef VkResult (VKAPI_PTR *PFN_vkGetDisplayPlaneSupportedDisplaysKHR)(VkPhysicalDevice physicalDevice, uint32_t planeIndex, uint32_t* pDisplayCount, VkDisplayKHR* pDisplays); typedef VkResult (VKAPI_PTR *PFN_vkGetDisplayModePropertiesKHR)(VkPhysicalDevice physicalDevice, VkDisplayKHR display, uint32_t* pPropertyCount, VkDisplayModePropertiesKHR* pProperties); -typedef VkResult (VKAPI_PTR *PFN_vkCreateDisplayModeKHR)(VkPhysicalDevice physicalDevice, VkDisplayKHR display, const VkDisplayModeCreateInfoKHR*pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDisplayModeKHR* pMode); +typedef VkResult (VKAPI_PTR *PFN_vkCreateDisplayModeKHR)(VkPhysicalDevice physicalDevice, VkDisplayKHR display, const VkDisplayModeCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkDisplayModeKHR* pMode); typedef VkResult (VKAPI_PTR *PFN_vkGetDisplayPlaneCapabilitiesKHR)(VkPhysicalDevice physicalDevice, VkDisplayModeKHR mode, uint32_t planeIndex, VkDisplayPlaneCapabilitiesKHR* pCapabilities); typedef VkResult (VKAPI_PTR *PFN_vkCreateDisplayPlaneSurfaceKHR)(VkInstance instance, const VkDisplaySurfaceCreateInfoKHR* pCreateInfo, const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);