From dcfcb3047c96e7ab0bc6dbb133fa69e9225c1400 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Tue, 24 Jan 2017 08:05:39 +1000 Subject: [PATCH] vulkan: import latest registry for 1.0.39 extensions. Acked-by: Jason Ekstrand Signed-off-by: Dave Airlie --- src/vulkan/registry/vk.xml | 450 +++++++++++++++++++++++++++++++++---- 1 file changed, 408 insertions(+), 42 deletions(-) diff --git a/src/vulkan/registry/vk.xml b/src/vulkan/registry/vk.xml index 4f358c203e4..779875b8193 100644 --- a/src/vulkan/registry/vk.xml +++ b/src/vulkan/registry/vk.xml @@ -1,7 +1,7 @@ -Copyright (c) 2015-2016 The Khronos Group Inc. +Copyright (c) 2015-2017 The Khronos Group Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and/or associated documentation files (the @@ -62,6 +62,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. + @@ -70,6 +71,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. #include "vulkan.h" #include <X11/Xlib.h> + #include <X11/extensions/Xrandr.h> #include <android/native_window.h> #include <mir_toolkit/client_types.h> #include <wayland-client.h> @@ -79,6 +81,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. + @@ -104,7 +107,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 38 +#define VK_HEADER_VERSION 39 #define VK_DEFINE_HANDLE(object) typedef struct object##_T* object; @@ -208,14 +211,17 @@ maintained in the master branch of the Khronos Vulkan GitHub project. typedef VkFlags VkDisplaySurfaceCreateFlagsKHR; typedef VkFlags VkAndroidSurfaceCreateFlagsKHR; typedef VkFlags VkMirSurfaceCreateFlagsKHR; + typedef VkFlags VkViSurfaceCreateFlagsNN; typedef VkFlags VkWaylandSurfaceCreateFlagsKHR; typedef VkFlags VkWin32SurfaceCreateFlagsKHR; typedef VkFlags VkXlibSurfaceCreateFlagsKHR; typedef VkFlags VkXcbSurfaceCreateFlagsKHR; typedef VkFlags VkDebugReportFlagsEXT; + typedef VkFlags VkCommandPoolTrimFlagsKHR; typedef VkFlags VkExternalMemoryHandleTypeFlagsNV; typedef VkFlags VkExternalMemoryFeatureFlagsNV; + typedef VkFlags VkSurfaceCounterFlagsEXT; VK_DEFINE_HANDLE(VkInstance) @@ -357,6 +363,10 @@ maintained in the master branch of the Khronos Vulkan GitHub project. + + + + typedef void (VKAPI_PTR *PFN_vkInternalAllocationNotification)( @@ -492,7 +502,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. VkStructureType sType - const void* pNext + const void* pNext VkDeviceCreateFlags flags uint32_t queueCreateInfoCount const VkDeviceQueueCreateInfo* pQueueCreateInfos @@ -1463,6 +1473,12 @@ maintained in the master branch of the Khronos Vulkan GitHub project. MirConnection* connection MirSurface* mirSurface + + VkStructureType sType + const void* pNext + VkViSurfaceCreateFlagsNN flags + void* window + VkStructureType sType const void* pNext @@ -1517,7 +1533,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 @@ -1713,6 +1729,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. VkObjectEntryTypeNVX type VkObjectEntryUsageFlagsNVX flags VkBuffer buffer + VkIndexType indexType VkObjectEntryTypeNVX type @@ -1720,6 +1737,94 @@ maintained in the master branch of the Khronos Vulkan GitHub project. VkPipelineLayout pipelineLayout VkShaderStageFlags stageFlags + + VkStructureType sType + void* pNext + VkPhysicalDeviceFeatures features + + + VkStructureType sType + void* pNext + VkPhysicalDeviceProperties properties + + + VkStructureType sType + void* pNext + VkFormatProperties formatProperties + + + VkStructureType sType + void* pNext + VkImageFormatProperties imageFormatProperties + + + VkStructureType sType + const void* pNext + VkFormat format + VkImageType type + VkImageTiling tiling + VkImageUsageFlags usage + VkImageCreateFlags flags + + + VkStructureType sType + void* pNext + VkQueueFamilyProperties queueFamilyProperties + + + VkStructureType sType + void* pNext + VkPhysicalDeviceMemoryProperties memoryProperties + + + VkStructureType sType + void* pNext + VkSparseImageFormatProperties properties + + + VkStructureType sType + const void* pNext + VkFormat format + VkImageType type + VkSampleCountFlagBits samples + VkImageUsageFlags usage + VkImageTiling tiling + + + VkStructureType sType + void* pNext + uint32_t minImageCount + uint32_t maxImageCount + VkExtent2D currentExtent + VkExtent2D minImageExtent + VkExtent2D maxImageExtent + uint32_t maxImageArrayLayers + VkSurfaceTransformFlagsKHR supportedTransforms + VkSurfaceTransformFlagBitsKHR currentTransform + VkCompositeAlphaFlagsKHR supportedCompositeAlpha + VkImageUsageFlags supportedUsageFlags + VkSurfaceCounterFlagsEXT supportedSurfaceCounters + + + VkStructureType sType + const void* pNext + VkDisplayPowerStateEXT powerState + + + VkStructureType sType + const void* pNext + VkDeviceEventTypeEXT deviceEvent + + + VkStructureType sType + const void* pNext + VkDisplayEventTypeEXT displayEvent + + + VkStructureType sType + const void* pNext + VkSurfaceCounterFlagsEXT surfaceCounters + @@ -2575,6 +2680,21 @@ maintained in the master branch of the Khronos Vulkan GitHub project. + + + + + + + + + + + + + + + @@ -3372,7 +3492,7 @@ maintained in the master branch of the Khronos Vulkan GitHub project. VkDeviceSize dataSize const void* pData - + void vkCmdFillBuffer VkCommandBuffer commandBuffer VkBuffer dstBuffer @@ -3666,6 +3786,13 @@ maintained in the master branch of the Khronos Vulkan GitHub project. VkQueue queue const VkPresentInfoKHR* pPresentInfo + + VkResult vkCreateViSurfaceNN + VkInstance instance + const VkViSurfaceCreateInfoNN* pCreateInfo + const VkAllocationCallbacks* pAllocator + VkSurfaceKHR* pSurface + VkResult vkCreateWaylandSurfaceKHR VkInstance instance @@ -3863,6 +3990,104 @@ maintained in the master branch of the Khronos Vulkan GitHub project. VkDeviceGeneratedCommandsFeaturesNVX* pFeatures VkDeviceGeneratedCommandsLimitsNVX* pLimits + + void vkGetPhysicalDeviceFeatures2KHR + VkPhysicalDevice physicalDevice + VkPhysicalDeviceFeatures2KHR* pFeatures + + + void vkGetPhysicalDeviceProperties2KHR + VkPhysicalDevice physicalDevice + VkPhysicalDeviceProperties2KHR* pProperties + + + void vkGetPhysicalDeviceFormatProperties2KHR + VkPhysicalDevice physicalDevice + VkFormat format + VkFormatProperties2KHR* pFormatProperties + + + VkResult vkGetPhysicalDeviceImageFormatProperties2KHR + VkPhysicalDevice physicalDevice + const VkPhysicalDeviceImageFormatInfo2KHR* pImageFormatInfo + VkImageFormatProperties2KHR* pImageFormatProperties + + + void vkGetPhysicalDeviceQueueFamilyProperties2KHR + VkPhysicalDevice physicalDevice + uint32_t* pQueueFamilyPropertyCount + VkQueueFamilyProperties2KHR* pQueueFamilyProperties + + + void vkGetPhysicalDeviceMemoryProperties2KHR + VkPhysicalDevice physicalDevice + VkPhysicalDeviceMemoryProperties2KHR* pMemoryProperties + + + void vkGetPhysicalDeviceSparseImageFormatProperties2KHR + VkPhysicalDevice physicalDevice + const VkPhysicalDeviceSparseImageFormatInfo2KHR* pFormatInfo + uint32_t* pPropertyCount + VkSparseImageFormatProperties2KHR* pProperties + + + void vkTrimCommandPoolKHR + VkDevice device + VkCommandPool commandPool + VkCommandPoolTrimFlagsKHR flags + + + VkResult vkReleaseDisplayEXT + VkPhysicalDevice physicalDevice + VkDisplayKHR display + + + VkResult vkAcquireXlibDisplayEXT + VkPhysicalDevice physicalDevice + Display* dpy + VkDisplayKHR display + + + VkResult vkGetRandROutputDisplayEXT + VkPhysicalDevice physicalDevice + Display* dpy + RROutput rrOutput + VkDisplayKHR* pDisplay + + + VkResult vkDisplayPowerControlEXT + VkDevice device + VkDisplayKHR display + const VkDisplayPowerInfoEXT* pDisplayPowerInfo + + + VkResult vkRegisterDeviceEventEXT + VkDevice device + const VkDeviceEventInfoEXT* pDeviceEventInfo + const VkAllocationCallbacks* pAllocator + VkFence* pFence + + + VkResult vkRegisterDisplayEventEXT + VkDevice device + VkDisplayKHR display + const VkDisplayEventInfoEXT* pDisplayEventInfo + const VkAllocationCallbacks* pAllocator + VkFence* pFence + + + VkResult vkGetSwapchainCounterEXT + VkDevice device + VkSwapchainKHR swapchain + VkSurfaceCounterFlagBitsEXT counter + uint64_t* pCounterValue + + + VkResult vkGetPhysicalDeviceSurfaceCapabilities2EXT + VkPhysicalDevice physicalDevice + VkSurfaceKHR surface + VkSurfaceCapabilities2EXT* pSurfaceCapabilities + @@ -4581,10 +4806,35 @@ maintained in the master branch of the Khronos Vulkan GitHub project. - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4601,28 +4851,32 @@ maintained in the master branch of the Khronos Vulkan GitHub project. - + - - + + + + + + - + - - + + - + - - + + - + - - + + @@ -4643,10 +4897,15 @@ maintained in the master branch of the Khronos Vulkan GitHub project. - + - - + + + + + + + @@ -4797,29 +5056,52 @@ maintained in the master branch of the Khronos Vulkan GitHub project. - + - - - + + + + - + - - - + + + + + - + - - - + + + + + + + + - + - - - + + + + + + + + + + + + + + + + + + @@ -4893,10 +5175,94 @@ maintained in the master branch of the Khronos Vulkan GitHub project. - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + -- 2.30.2