status-im
/
Vulkan-Docs
mirror of https://github.com/status-im/Vulkan-Docs.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge misc. tweaks from private repository

This commit is contained in:
Jon Leech 2016-03-03 05:14:25 -08:00
parent 0c6134ccb5
commit 8bb47094f4
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
out/index.html
View File

@ -9,21 +9,21 @@
related documents. It is updated by hand periodically by Jon Leech. </p>
<ul>
<li> The <a href="1.0/styleguide.html">Vulkan Style Guide</a> is a work
<li> The <a href="core/styleguide.html">Vulkan Style Guide</a> is a work
in progress (but significantly complete) document, useful when
writing and modifying Specification and reference page language.
<li> <b> Core API Specifications </b>
<ul>
<li> <a href="1.0/xhtml/vkspec.html">Single document</a> (XHTML from 'a2x') </li>
<li> <a href="1.0/pdf/vkspec.pdf"> Vulkan API spec (PDF)</a> </li>
<!-- <li> <a href="1.0/vkspec.chunked/index.html">Chunked HTML</a> (may be out of date or not present) </li> -->
<li> <a href="core/xhtml/vkspec.html">Single document</a> (XHTML from 'a2x') </li>
<li> <a href="core/pdf/vkspec.pdf"> Vulkan API spec (PDF)</a> </li>
<!-- <li> <a href="core/vkspec.chunked/index.html">Chunked HTML</a> (may be out of date or not present) </li> -->
</ul>
</li>
<li> <b> Core+WSI API Specifications </b>
<ul>
<li> <a href="1.0-wsi_extensions/xhtml/vkspec.html">Single document</a> (XHTML from 'a2x') </li>
<li> <a href="1.0-wsi_extensions/pdf/vkspec.pdf"> Vulkan API spec (PDF)</a> </li>
<!-- <li> <a href="1.0-wsi_extensions/vkspec.chunked/index.html">Chunked HTML</a> (may be out of date or not present) </li> -->
<li> <a href="wsi/xhtml/vkspec.html">Single document</a> (XHTML from 'a2x') </li>
<li> <a href="wsi/pdf/vkspec.pdf"> Vulkan API spec (PDF)</a> </li>
<!-- <li> <a href="wsi/vkspec.chunked/index.html">Chunked HTML</a> (may be out of date or not present) </li> -->
</ul>
</li>
<li> <b> Khronos Data Format 1.1 Specification </b>
@ -34,27 +34,27 @@
</li>
<li> <b> Validator script output (Core API only)</b>
<ul>
<li> <a href="1.0/checks/notInSpec.txt">List of commands, structs, etc. not included in API spec</a></li>
<li> <a href="1.0/checks/specErrs.txt">Validator script output for API specification</a>
<li> <a href="1.0/checks/manErrs.txt">Validator script output for man pages</a>
<li> <a href="core/checks/notInSpec.txt">List of commands, structs, etc. not included in API spec</a></li>
<li> <a href="core/checks/specErrs.txt">Validator script output for API specification</a>
<li> <a href="core/checks/manErrs.txt">Validator script output for man pages</a>
</ul>
</li>
<li> <b> Reference pages (Core API only)</b>
<ul>
<li> <a href="1.0/apispec.html">Vulkan ref pages</a> (HTML, single document) </li>
<li> <a href="1.0/apispec.pdf">Vulkan ref pages</a> (PDF, single document) </li>
<li> <a href="1.0/man/html/">Vulkan ref pages</a> (HTML, separate files) </li>
<li> <a href="1.0/man/3/">Vulkan ref pages</a> (nroff / Unix man page markup, separate files) </li>
<li> <a href="core/apispec.html">Vulkan ref pages</a> (HTML, single document) </li>
<li> <a href="core/apispec.pdf">Vulkan ref pages</a> (PDF, single document) </li>
<li> <a href="core/man/html/">Vulkan ref pages</a> (HTML, separate files) </li>
<li> <a href="core/man/3/">Vulkan ref pages</a> (nroff / Unix man page markup, separate files) </li>
</ul>
</li>
<li> <b> The following targets are for internal use only and are probably
not included in, or if included, not up to date in the sandbox
</b> </li>
not included in, or if included, not up to date in the sandbox
</b> </li>
<ul>
<li> Core API <a href="1.0/html/vkspec.html">Single document</a> (HTML from
'asciibook') </li>
<li> Core+WSI API <a href="1.0-wsi_extensions/html/vkspec.html">Single
document</a> (HTML from 'asciibook') </li>
<li> Core API <a href="core/html/vkspec.html">Single document</a> (HTML from
'asciibook') </li>
<li> Core+WSI API <a href="wsi/html/vkspec.html">Single
document</a> (HTML from 'asciibook') </li>
</ul>
</li>
</ul>

2
src/spec/vk.xml
View File

@ -4489,7 +4489,7 @@ maintained in the master branch of the Khronos Vulkan Github project.
<proto><type>VkResult</type> <name>vkCreateDisplayModeKHR</name></proto>
<param><type>VkPhysicalDevice</type> <name>physicalDevice</name></param>
<param externsync="true"><type>VkDisplayKHR</type> <name>display</name></param>
<param>const <type>VkDisplayModeCreateInfoKHR</type>*<name>pCreateInfo</name></param>
<param>const <type>VkDisplayModeCreateInfoKHR</type>* <name>pCreateInfo</name></param>
<param optional="true">const <type>VkAllocationCallbacks</type>* <name>pAllocator</name></param>
<param><type>VkDisplayModeKHR</type>* <name>pMode</name></param>
</command>

2
src/vulkan/vulkan.h
View File

@ -3393,7 +3393,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);