From 4916086cf41ff0c5137d81fe251af8b1c4f30c24 Mon Sep 17 00:00:00 2001 From: Mark Lobodzinski Date: Tue, 1 Aug 2017 09:15:06 -0600 Subject: header: Update to version 1.0.57 of the vulkan hdr - updated vulkan.h - updated vk.xml - updated cgenerator.py - updated Win/Lin json files - updated and fixed vk_validation_error_database.h - updated vk_validation_error_messages.h - updated vulkan.hpp Change-Id: Idebc490660833daac43d234db44131e9bf2b910b --- scripts/cgenerator.py | 11 +++++++- scripts/vk.xml | 78 +++++++++++++++++++++++++++------------------------ 2 files changed, 52 insertions(+), 37 deletions(-) (limited to 'scripts') diff --git a/scripts/cgenerator.py b/scripts/cgenerator.py index 298a7742..836de52d 100644 --- a/scripts/cgenerator.py +++ b/scripts/cgenerator.py @@ -240,7 +240,16 @@ class COutputGenerator(OutputGenerator): # Add extra newline after multi-line entries. if '\n' in s: s += '\n' - self.appendSection(category, s) + # This is a temporary workaround for internal issue #877, + # while we consider other approaches. The problem is that + # function pointer types can have dependencies on structures + # and vice-versa, so they can't be strictly separated into + # sections. The workaround is to define those types in the + # same section, in dependency order. + if (category == 'funcpointer'): + self.appendSection('struct', s) + else: + self.appendSection(category, s) # # Struct (e.g. C "struct" type) generation. # This is a special case of the tag where the contents are diff --git a/scripts/vk.xml b/scripts/vk.xml index 5561e7f6..85a49afb 100644 --- a/scripts/vk.xml +++ b/scripts/vk.xml @@ -106,7 +106,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. // Vulkan 1.0 version number #define VK_API_VERSION_1_0 VK_MAKE_VERSION(1, 0, 0)// Patch version should always be set to 0 // Version of this file -#define VK_HEADER_VERSION 56 +#define VK_HEADER_VERSION 57 #define VK_DEFINE_HANDLE(object) typedef struct object##_T* object; @@ -546,7 +546,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext VkDeviceCreateFlags flags uint32_t queueCreateInfoCount const VkDeviceQueueCreateInfo* pQueueCreateInfos @@ -558,7 +558,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext VkInstanceCreateFlags flags const VkApplicationInfo* pApplicationInfo uint32_t enabledLayerCount @@ -580,7 +580,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext VkDeviceSize allocationSizeSize of memory allocation uint32_t memoryTypeIndexIndex of the of the memory type to allocate from @@ -663,7 +663,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext VkBufferCreateFlags flagsBuffer creation flags VkDeviceSize sizeSpecified in bytes VkBufferUsageFlags usageBuffer usage flags @@ -729,7 +729,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext VkImageCreateFlags flagsImage creation flags VkImageType imageType VkFormat format @@ -798,7 +798,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext uint32_t waitSemaphoreCount const VkSemaphore* pWaitSemaphores uint32_t bufferBindCount @@ -942,7 +942,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext VkPipelineViewportStateCreateFlags flags uint32_t viewportCount const VkViewport* pViewports @@ -951,7 +951,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext VkPipelineRasterizationStateCreateFlags flags VkBool32 depthClampEnable VkBool32 rasterizerDiscardEnable @@ -966,7 +966,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext VkPipelineMultisampleStateCreateFlags flags VkSampleCountFlagBits rasterizationSamplesNumber of samples used for rasterization VkBool32 sampleShadingEnableoptional (GL45) @@ -987,7 +987,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext VkPipelineColorBlendStateCreateFlags flags VkBool32 logicOpEnable VkLogicOp logicOp @@ -1027,7 +1027,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext VkPipelineCreateFlags flagsPipeline creation flags uint32_t stageCount const VkPipelineShaderStageCreateInfo* pStagesOne entry for each active shader stage @@ -1069,7 +1069,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext VkSamplerCreateFlags flags VkFilter magFilterFilter mode for magnification VkFilter minFilterFilter mode for minifiation @@ -1112,13 +1112,13 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext VkCommandBufferUsageFlags flagsCommand buffer usage flags const VkCommandBufferInheritanceInfo* pInheritanceInfoPointer to inheritance info for secondary command buffers VkStructureType sType - const void* pNext + const void* pNext VkRenderPass renderPass VkFramebuffer framebuffer VkRect2D renderArea @@ -1181,7 +1181,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext VkRenderPassCreateFlags flags uint32_t attachmentCount const VkAttachmentDescription* pAttachments @@ -1197,7 +1197,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext VkFenceCreateFlags flagsFence creation flags @@ -1383,7 +1383,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext VkSemaphoreCreateFlags flagsSemaphore creation flags @@ -1425,7 +1425,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext uint32_t waitSemaphoreCount const VkSemaphore* pWaitSemaphores const VkPipelineStageFlags* pWaitDstStageMask @@ -1557,7 +1557,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext VkSwapchainCreateFlagsKHR flags VkSurfaceKHR surfaceThe swapchain's target surface uint32_t minImageCountMinimum number of presentation images the application needs @@ -1577,7 +1577,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext uint32_t waitSemaphoreCountNumber of semaphores to wait for before presenting const VkSemaphore* pWaitSemaphoresSemaphores to wait for before presenting uint32_t swapchainCountNumber of swapchains to present in this call @@ -1782,12 +1782,12 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - void* pNext + void* pNext VkPhysicalDeviceFeatures features VkStructureType sType - void* pNext + void* pNext VkPhysicalDeviceProperties properties @@ -1797,12 +1797,12 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - void* pNext + void* pNext VkImageFormatProperties imageFormatProperties VkStructureType sType - const void* pNext + const void* pNext VkFormat format VkImageType type VkImageTiling tiling @@ -2159,7 +2159,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - const void* pNext + const void* pNext VkImage image VkDeviceMemory memory VkDeviceSize memoryOffset @@ -2360,7 +2360,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - void* pNext + void* pNext VkSurfaceCapabilitiesKHR surfaceCapabilities @@ -2398,7 +2398,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType - void* pNext + void* pNext VkMemoryRequirements memoryRequirements @@ -6691,10 +6691,10 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + - - + + @@ -6739,9 +6739,9 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + - + @@ -6880,10 +6880,10 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + - - + + @@ -6916,5 +6916,11 @@ private version is maintained in the 1.0 branch of the member gitlab server. + + + + + + -- cgit v1.2.3