From b7c2f7065691aa6523b932e809f22e2a3630ba5a Mon Sep 17 00:00:00 2001 From: Andres Rodriguez Date: Fri, 20 Oct 2017 18:02:11 -0400 Subject: [PATCH] vulkan: update headers & registry to VK 1.0.63 Signed-off-by: Andres Rodriguez Reviewed-by: Bas Nieuwenhuizen --- include/vulkan/vulkan.h | 35 ++++- src/vulkan/registry/vk.xml | 264 +++++++++++++++++++++++++------------ 2 files changed, 213 insertions(+), 86 deletions(-) diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h index b19c1efff91..e1398c68bac 100644 --- a/include/vulkan/vulkan.h +++ b/include/vulkan/vulkan.h @@ -43,7 +43,7 @@ extern "C" { #define VK_VERSION_MINOR(version) (((uint32_t)(version) >> 12) & 0x3ff) #define VK_VERSION_PATCH(version) ((uint32_t)(version) & 0xfff) // Version of this file -#define VK_HEADER_VERSION 61 +#define VK_HEADER_VERSION 63 #define VK_NULL_HANDLE 0 @@ -147,6 +147,7 @@ typedef enum VkResult { VK_ERROR_INVALID_SHADER_NV = -1000012000, VK_ERROR_OUT_OF_POOL_MEMORY_KHR = -1000069000, VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR = -1000072003, + VK_ERROR_NOT_PERMITTED_EXT = -1000174001, VK_RESULT_BEGIN_RANGE = VK_ERROR_FRAGMENTED_POOL, VK_RESULT_END_RANGE = VK_INCOMPLETE, VK_RESULT_RANGE_SIZE = (VK_INCOMPLETE - VK_ERROR_FRAGMENTED_POOL + 1), @@ -353,6 +354,7 @@ typedef enum VkStructureType { VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_INFO_KHR = 1000157001, VK_STRUCTURE_TYPE_VALIDATION_CACHE_CREATE_INFO_EXT = 1000160000, VK_STRUCTURE_TYPE_SHADER_MODULE_VALIDATION_CACHE_CREATE_INFO_EXT = 1000160001, + VK_STRUCTURE_TYPE_DEVICE_QUEUE_GLOBAL_PRIORITY_CREATE_INFO_EXT = 1000174000, VK_STRUCTURE_TYPE_BEGIN_RANGE = VK_STRUCTURE_TYPE_APPLICATION_INFO, VK_STRUCTURE_TYPE_END_RANGE = VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO, VK_STRUCTURE_TYPE_RANGE_SIZE = (VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO - VK_STRUCTURE_TYPE_APPLICATION_INFO + 1), @@ -5486,6 +5488,11 @@ typedef struct VkTextureLODGatherFormatPropertiesAMD { +#define VK_AMD_shader_image_load_store_lod 1 +#define VK_AMD_SHADER_IMAGE_LOAD_STORE_LOD_SPEC_VERSION 1 +#define VK_AMD_SHADER_IMAGE_LOAD_STORE_LOD_EXTENSION_NAME "VK_AMD_shader_image_load_store_lod" + + #define VK_KHX_multiview 1 #define VK_KHX_MULTIVIEW_SPEC_VERSION 1 #define VK_KHX_MULTIVIEW_EXTENSION_NAME "VK_KHX_multiview" @@ -6647,7 +6654,7 @@ typedef struct VkRenderPassSampleLocationsBeginInfoEXT { uint32_t attachmentInitialSampleLocationsCount; const VkAttachmentSampleLocationsEXT* pAttachmentInitialSampleLocations; uint32_t postSubpassSampleLocationsCount; - const VkSubpassSampleLocationsEXT* pSubpassSampleLocations; + const VkSubpassSampleLocationsEXT* pPostSubpassSampleLocations; } VkRenderPassSampleLocationsBeginInfoEXT; typedef struct VkPipelineSampleLocationsStateCreateInfoEXT { @@ -6853,6 +6860,30 @@ VKAPI_ATTR VkResult VKAPI_CALL vkGetValidationCacheDataEXT( #define VK_EXT_SHADER_VIEWPORT_INDEX_LAYER_EXTENSION_NAME "VK_EXT_shader_viewport_index_layer" +#define VK_EXT_global_priority 1 +#define VK_EXT_GLOBAL_PRIORITY_SPEC_VERSION 1 +#define VK_EXT_GLOBAL_PRIORITY_EXTENSION_NAME "VK_EXT_global_priority" + + +typedef enum VkQueueGlobalPriorityEXT { + VK_QUEUE_GLOBAL_PRIORITY_LOW = 128, + VK_QUEUE_GLOBAL_PRIORITY_MEDIUM = 256, + VK_QUEUE_GLOBAL_PRIORITY_HIGH = 512, + VK_QUEUE_GLOBAL_PRIORITY_REALTIME = 1024, + VK_QUEUE_GLOBAL_PRIORITY_BEGIN_RANGE_EXT = VK_QUEUE_GLOBAL_PRIORITY_LOW, + VK_QUEUE_GLOBAL_PRIORITY_END_RANGE_EXT = VK_QUEUE_GLOBAL_PRIORITY_REALTIME, + VK_QUEUE_GLOBAL_PRIORITY_RANGE_SIZE_EXT = (VK_QUEUE_GLOBAL_PRIORITY_REALTIME - VK_QUEUE_GLOBAL_PRIORITY_LOW + 1), + VK_QUEUE_GLOBAL_PRIORITY_MAX_ENUM_EXT = 0x7FFFFFFF +} VkQueueGlobalPriorityEXT; + +typedef struct VkDeviceQueueGlobalPriorityCreateInfoEXT { + VkStructureType sType; + const void* pNext; + VkQueueGlobalPriorityEXT globalPriority; +} VkDeviceQueueGlobalPriorityCreateInfoEXT; + + + #ifdef __cplusplus } #endif diff --git a/src/vulkan/registry/vk.xml b/src/vulkan/registry/vk.xml index f4182d85e66..88e0997148a 100644 --- a/src/vulkan/registry/vk.xml +++ b/src/vulkan/registry/vk.xml @@ -107,7 +107,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 61 +#define VK_HEADER_VERSION 63 #define VK_DEFINE_HANDLE(object) typedef struct object##_T* object; @@ -386,6 +386,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. + WSI extensions @@ -493,10 +494,6 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkOffset2D offset VkExtent2D extent - - VkOffset3D offset - VkExtent3D extent - VkRect2D rect uint32_t baseArrayLayer @@ -981,7 +978,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkSampleCountFlagBits rasterizationSamplesNumber of samples used for rasterization VkBool32 sampleShadingEnableoptional (GL45) float minSampleShadingoptional (GL45) - const VkSampleMask* pSampleMaskArray of sampleMask words + const VkSampleMask* pSampleMaskArray of sampleMask words VkBool32 alphaToCoverageEnable VkBool32 alphaToOneEnable @@ -1531,7 +1528,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType const void* pNext VkViSurfaceCreateFlagsNN flags - void* window + void* window VkStructureType sType @@ -2321,13 +2318,13 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkStructureType sType const void* pNext VkIOSSurfaceCreateFlagsMVK flags - const void* pView + const void* pView VkStructureType sType const void* pNext VkMacOSSurfaceCreateFlagsMVK flags - const void* pView + const void* pView float xcoeff @@ -2543,7 +2540,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. uint32_t attachmentInitialSampleLocationsCount const VkAttachmentSampleLocationsEXT* pAttachmentInitialSampleLocations uint32_t postSubpassSampleLocationsCount - const VkSubpassSampleLocationsEXT* pSubpassSampleLocations + const VkSubpassSampleLocationsEXT* pPostSubpassSampleLocations VkStructureType sType @@ -2619,6 +2616,19 @@ private version is maintained in the 1.0 branch of the member gitlab server. const void* pNext VkValidationCacheEXT validationCache + + VkStructureType sType + const void* pNext + const void* handle + int stride + int format + int usage + + + VkStructureType sType + const void* pNext + VkQueueGlobalPriorityEXT globalPriority + Vulkan enumerant (token) definitions @@ -3645,6 +3655,12 @@ private version is maintained in the 1.0 branch of the member gitlab server. + + + + + + @@ -3792,7 +3808,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkDeviceSize offset VkDeviceSize size VkMemoryMapFlags flags - void** ppData + void** ppData void vkUnmapMemory @@ -4545,7 +4561,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. uint32_t firstQuery uint32_t queryCount - + void vkCmdWriteTimestamp VkCommandBuffer commandBuffer VkPipelineStageFlagBits pipelineStage @@ -5147,7 +5163,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. uint32_t heapIndex uint32_t localDeviceIndex uint32_t remoteDeviceIndex - VkPeerMemoryFeatureFlagsKHX* pPeerMemoryFeatures + VkPeerMemoryFeatureFlagsKHX* pPeerMemoryFeatures VkResult vkBindBufferMemory2KHR @@ -5175,7 +5191,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkResult vkGetDeviceGroupSurfacePresentModesKHX VkDevice device VkSurfaceKHR surface - VkDeviceGroupPresentModeFlagsKHX* pModes + VkDeviceGroupPresentModeFlagsKHX* pModes VkResult vkAcquireNextImage2KHX @@ -5218,7 +5234,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkDevice device VkDescriptorSet descriptorSet VkDescriptorUpdateTemplateKHR descriptorUpdateTemplate - const void* pData + const void* pData void vkCmdPushDescriptorSetWithTemplateKHR @@ -5226,7 +5242,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkDescriptorUpdateTemplateKHR descriptorUpdateTemplate VkPipelineLayout layout uint32_t set - const void* pData + const void* pData void vkSetHdrMetadataEXT @@ -5337,7 +5353,7 @@ private version is maintained in the 1.0 branch of the member gitlab server. VkSamplerYcbcrConversionKHR ycbcrConversion const VkAllocationCallbacks* pAllocator - + VkResult vkCreateValidationCacheEXT VkDevice device const VkValidationCacheCreateInfoEXT* pCreateInfo @@ -5364,6 +5380,29 @@ private version is maintained in the 1.0 branch of the member gitlab server. uint32_t srcCacheCount const VkValidationCacheEXT* pSrcCaches + + VkResult vkGetSwapchainGrallocUsageANDROID + VkDevice device + VkFormat format + VkImageUsageFlags imageUsage + int* grallocUsage + + + VkResult vkAcquireImageANDROID + VkDevice device + VkImage image + int nativeFenceFd + VkSemaphore semaphore + VkFence fence + + + VkResult vkQueueSignalReleaseImageANDROID + VkQueue queue + uint32_t waitSemaphoreCount + const VkSemaphore* pWaitSemaphores + VkImage image + int* pNativeFenceFd + @@ -5727,9 +5766,14 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + + + + + + @@ -5981,10 +6025,10 @@ private version is maintained in the 1.0 branch of the member gitlab server. - + - - + + @@ -7153,69 +7197,69 @@ private version is maintained in the 1.0 branch of the member gitlab server. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7315,5 +7359,57 @@ private version is maintained in the 1.0 branch of the member gitlab server. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- 2.30.2