From 313e72964eeef60871cb50d8cff81e2ab37be3ec Mon Sep 17 00:00:00 2001 From: Mark Lobodzinski Date: Tue, 14 Mar 2017 10:12:43 -0600 Subject: header: Update to 1.0.43 header version - updated include/vulkan/vulkan.h - updated scripts/cgenerator.py - updated scripts/vk.xml - updated layers json files - updated tests json files - updated loader SOVERSION - updated include/vulkan/vulkan.hpp - updated parameter_validation.cpp with new APIs - updated object_tracker.cpp with new APIs Change-Id: I1fd812cb376d5cddee5ab4acf2e4f8fe6d33b761 --- scripts/cgenerator.py | 2 +- scripts/vk.xml | 906 ++++++++++++++++++++++++++------------------------ 2 files changed, 468 insertions(+), 440 deletions(-) (limited to 'scripts') diff --git a/scripts/cgenerator.py b/scripts/cgenerator.py index 732a6d2d..298a7742 100644 --- a/scripts/cgenerator.py +++ b/scripts/cgenerator.py @@ -268,7 +268,7 @@ class COutputGenerator(OutputGenerator): OutputGenerator.genGroup(self, groupinfo, groupName) groupElem = groupinfo.elem - expandName = re.sub(r'([0-9a-z_])([A-Z0-9][^A-Z0-9]?)',r'\1_\2',groupName).upper() + expandName = re.sub(r'([0-9a-z_])([A-Z0-9])',r'\1_\2',groupName).upper() expandPrefix = expandName expandSuffix = '' diff --git a/scripts/vk.xml b/scripts/vk.xml index e319443d..54f57970 100644 --- a/scripts/vk.xml +++ b/scripts/vk.xml @@ -112,7 +112,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. // Vulkan 1.0 version number #define VK_API_VERSION_1_0 VK_MAKE_VERSION(1, 0, 0) // Version of this file -#define VK_HEADER_VERSION 42 +#define VK_HEADER_VERSION 43 #define VK_DEFINE_HANDLE(object) typedef struct object##_T* object; @@ -1474,7 +1474,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. VkStructureType sType - const void* pNext + const void* pNext VkRect2D srcRect VkRect2D dstRect VkBool32 persistent @@ -1564,7 +1564,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. VkStructureType sType - const void* pNext + const void* pNext uint32_t waitSemaphoreCount const VkSemaphore* pWaitSemaphores uint32_t swapchainCount @@ -1825,25 +1825,6 @@ maintained in the master branch of the Khronos Vulkan GitHub project. void* pNext uint32_t maxPushDescriptors - - VkStructureType sType - void* pNext - VkPhysicalDeviceProperties properties - - - VkStructureType sType - void* pNext - VkImageFormatProperties imageFormatProperties - - - VkStructureType sType - const void* pNext - VkFormat format - VkImageType type - VkImageTiling tiling - VkImageUsageFlags usage - VkImageCreateFlags flags - VkExternalMemoryFeatureFlagsKHX externalMemoryFeatures VkExternalMemoryHandleTypeFlagsKHX exportFromImportedHandleTypes @@ -2168,14 +2149,40 @@ maintained in the master branch of the Khronos Vulkan GitHub project. float x float y - + - VkXYColorEXT displayPrimaryRed - VkXYColorEXT displayPrimaryGreen - VkXYColorEXT displayPrimaryBlue + VkStructureType sType + const void* pNext + + VkXYColorEXT displayPrimaryRed + VkXYColorEXT displayPrimaryGreen + VkXYColorEXT displayPrimaryBlue VkXYColorEXT whitePoint - float maxLuminance - float minLuminance + float maxLuminance + float minLuminance + + float maxContentLightLevel + float maxFrameAverageLightLevel + + + uint64_t refreshDuration + + + uint32_t presentID + uint64_t desiredPresentTime + uint64_t actualPresentTime + uint64_t earliestPresentTime + uint64_t presentMargin + + + VkStructureType sType + const void* pNext + uint32_t swapchainCount + const VkPresentTimeGOOGLE* pTimes + + + uint32_t presentID + uint64_t desiredPresentTime VkStructureType sType @@ -4518,17 +4525,6 @@ maintained in the master branch of the Khronos Vulkan GitHub project. VkCommandPool commandPool VkCommandPoolTrimFlagsKHR flags - - void vkGetPhysicalDeviceProperties2KHX - VkPhysicalDevice physicalDevice - VkPhysicalDeviceProperties2KHX* pProperties - - - VkResult vkGetPhysicalDeviceImageFormatProperties2KHX - VkPhysicalDevice physicalDevice - const VkPhysicalDeviceImageFormatInfo2KHX* pImageFormatInfo - VkImageFormatProperties2KHX* pImageFormatProperties - void vkGetPhysicalDeviceExternalBufferPropertiesKHX VkPhysicalDevice physicalDevice @@ -4739,11 +4735,24 @@ maintained in the master branch of the Khronos Vulkan GitHub project. const void* pData - void vkSetSMPTE2086MetadataEXT + void vkSetHdrMetadataEXT VkDevice device uint32_t swapchainCount const VkSwapchainKHR* pSwapchains - const VkSMPTE2086MetadataEXT* pMetadata + const VkHdrMetadataEXT* pMetadata + + + VkResult vkGetRefreshCycleDurationGOOGLE + VkDevice device + VkSwapchainKHR swapchain + VkRefreshCycleDurationGOOGLE* pDisplayTimingProperties + + + VkResult vkGetPastPresentationTimingGOOGLE + VkDevice device + VkSwapchainKHR swapchain + uint32_t* pPresentationTimingCount + VkPastPresentationTimingGOOGLE* pPresentationTimings VkResult vkCreateIOSSurfaceMVK @@ -5095,7 +5104,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. - + @@ -5221,7 +5230,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. - + @@ -5257,14 +5266,14 @@ maintained in the master branch of the Khronos Vulkan GitHub project. - - + + - + @@ -5501,17 +5510,17 @@ maintained in the master branch of the Khronos Vulkan GitHub project. - + - - - - - - - - - + + + + + + + + + @@ -5585,7 +5594,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. - + @@ -5657,7 +5666,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. - + @@ -5670,8 +5679,8 @@ maintained in the master branch of the Khronos Vulkan GitHub project. - - + + @@ -5683,12 +5692,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. - - - - - @@ -5753,9 +5757,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. - - @@ -5807,82 +5809,82 @@ maintained in the master branch of the Khronos Vulkan GitHub project. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -5896,302 +5898,328 @@ maintained in the master branch of the Khronos Vulkan GitHub project. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3