Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05556b1d authored by Jesse Hall's avatar Jesse Hall
Browse files

vulkan: update Vulkan headers to 1.0.49 

Key changes since 1.0.46:
* Add VK_KHR_get_surface_capabilities2
* Add VK_KHR_shared_presentable_image
* Add VkObjectType enumeration to core API

The extensions had already been added manually in our internal tree,
so this just moves the existing declarations to the same place as in
the public header and fixes one small difference.

Test: dEQP-VK.wsi.android.surface.query_capabilities2
      dEQP-VK.wsi.android.shared_presentable_image.*
Change-Id: I1e4bd5d19f36af0d4e878b3971145a1ae1281dd6
parent 7062f1cb

vulkan/api/vulkan.api

+61 −15
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import platform "platform.api" 
// API version (major.minor.patch)

define VERSION_MAJOR 1

define VERSION_MINOR 0

define VERSION_PATCH 46

define VERSION_PATCH 49



// API limits

define VK_MAX_PHYSICAL_DEVICE_NAME_SIZE 256
@@ -320,7 +320,7 @@ define NULL_HANDLE 0 
@extension("VK_KHR_shared_presentable_image") define VK_KHR_SHARED_PRESENTABLE_IMAGE_SPEC_VERSION 1

@extension("VK_KHR_shared_presentable_image") define VK_KHR_SHARED_PRESENTABLE_IMAGE_EXTENSION_NAME "VK_KHR_shared_presentable_image"



// 119

// 120

@extension("VK_KHR_get_surface_capabilities2") define VK_KHR_GET_SURFACE_CAPABILITIES_2_SPEC_VERSION 1

@extension("VK_KHR_get_surface_capabilities2") define VK_KHR_GET_SURFACE_CAPABILITIES_2_EXTENSION_NAME "VK_KHR_get_surface_capabilities2"
@@ -409,7 +409,7 @@ enum VkImageLayout { 
    //@extension("VK_KHR_swapchain") // 2

    VK_IMAGE_LAYOUT_PRESENT_SRC_KHR                         = 1000001002,



    //@extension("VK_KHR_shared_presentable_image")

    //@extension("VK_KHR_shared_presentable_image") // 112

    VK_IMAGE_LAYOUT_SHARED_PRESENT_KHR                      = 1000111000,

}
@@ -1005,9 +1005,6 @@ enum VkStructureType { 
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_BUFFER_INFO_KHX  = 1000071002,

    VK_STRUCTURE_TYPE_EXTERNAL_BUFFER_PROPERTIES_KHX            = 1000071003,

    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES_KHX         = 1000071004,

    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2_KHX          = 1000071005,

    VK_STRUCTURE_TYPE_IMAGE_FORMAT_PROPERTIES_2_KHX             = 1000071006,

    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2_KHX   = 1000071007,



    //@extension("VK_KHX_external_memory") // 73

    VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_BUFFER_CREATE_INFO_KHX    = 1000072000,
@@ -1086,10 +1083,10 @@ enum VkStructureType { 
    //@extension("VK_EXT_hdr_metadata") // 106

    VK_STRUCTURE_TYPE_HDR_METADATA_EXT                          = 1000105000,



    //@extension("VK_KHR_shared_presentable_image") // 111

    //@extension("VK_KHR_shared_presentable_image") // 112

    VK_STRUCTURE_TYPE_SHARED_PRESENT_SURFACE_CAPABILITIES_KHR   = 1000111000,



    //@extension("VK_KHR_get_surface_capabilities2") // 119

    //@extension("VK_KHR_get_surface_capabilities2") // 120

    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SURFACE_INFO_2_KHR        = 1000119000,

    VK_STRUCTURE_TYPE_SURFACE_CAPABILITIES_2_KHR                = 1000119001,

    VK_STRUCTURE_TYPE_SURFACE_FORMAT_2_KHR                      = 1000119002,
@@ -1179,6 +1176,55 @@ enum VkDynamicState { 
    VK_DYNAMIC_STATE_DISCARD_RECTANGLE_EXT                  = 1000099000,

}



enum VkObjectType {

    VK_OBJECT_TYPE_UNKNOWN                                  = 0,

    VK_OBJECT_TYPE_INSTANCE                                 = 1,

    VK_OBJECT_TYPE_PHYSICAL_DEVICE                          = 2,

    VK_OBJECT_TYPE_DEVICE                                   = 3,

    VK_OBJECT_TYPE_QUEUE                                    = 4,

    VK_OBJECT_TYPE_SEMAPHORE                                = 5,

    VK_OBJECT_TYPE_COMMAND_BUFFER                           = 6,

    VK_OBJECT_TYPE_FENCE                                    = 7,

    VK_OBJECT_TYPE_DEVICE_MEMORY                            = 8,

    VK_OBJECT_TYPE_BUFFER                                   = 9,

    VK_OBJECT_TYPE_IMAGE                                    = 10,

    VK_OBJECT_TYPE_EVENT                                    = 11,

    VK_OBJECT_TYPE_QUERY_POOL                               = 12,

    VK_OBJECT_TYPE_BUFFER_VIEW                              = 13,

    VK_OBJECT_TYPE_IMAGE_VIEW                               = 14,

    VK_OBJECT_TYPE_SHADER_MODULE                            = 15,

    VK_OBJECT_TYPE_PIPELINE_CACHE                           = 16,

    VK_OBJECT_TYPE_PIPELINE_LAYOUT                          = 17,

    VK_OBJECT_TYPE_RENDER_PASS                              = 18,

    VK_OBJECT_TYPE_PIPELINE                                 = 19,

    VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT                    = 20,

    VK_OBJECT_TYPE_SAMPLER                                  = 21,

    VK_OBJECT_TYPE_DESCRIPTOR_POOL                          = 22,

    VK_OBJECT_TYPE_DESCRIPTOR_SET                           = 23,

    VK_OBJECT_TYPE_FRAMEBUFFER                              = 24,

    VK_OBJECT_TYPE_COMMAND_POOL                             = 25,



    //@extension("VK_KHR_surface") // 1

    VK_OBJECT_TYPE_SURFACE_KHR                              = 1000000000,



    //@extension("VK_KHR_swapchain") // 2

    VK_OBJECT_TYPE_SWAPCHAIN_KHR                            = 1000001000,



    //@extension("VK_KHR_display") // 3

    VK_OBJECT_TYPE_DISPLAY_KHR                              = 1000002000,

    VK_OBJECT_TYPE_DISPLAY_MODE_KHR                         = 1000002001,



    //@extension("VK_KHR_debug_report") // 12

    VK_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT                = 1000011000,



    //@extension("VK_KHR_descriptor_update_template") // 86

    VK_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_KHR           = 1000085000,



    //@extension("VK_NVX_device_generated_commands") // 87

    VK_OBJECT_TYPE_OBJECT_TABLE_NVX                         = 1000086000,

    VK_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_NVX             = 1000086001,

}



@extension("VK_KHR_surface") // 1

enum VkPresentModeKHR {

    VK_PRESENT_MODE_IMMEDIATE_KHR                           = 0x00000000,
@@ -1186,7 +1232,7 @@ enum VkPresentModeKHR { 
    VK_PRESENT_MODE_FIFO_KHR                                = 0x00000002,

    VK_PRESENT_MODE_FIFO_RELAXED_KHR                        = 0x00000003,



    //@extension("VK_KHR_shared_presentable_image")

    //@extension("VK_KHR_shared_presentable_image") // 112

    VK_PRESENT_MODE_SHARED_DEMAND_REFRESH_KHR               = 1000111000,

    VK_PRESENT_MODE_SHARED_CONTINUOUS_REFRESH_KHR           = 1000111001,

}
@@ -4261,28 +4307,28 @@ class VkHdrMetadataEXT { 
    f32                                             maxFrameAverageLightLevel

}



@extension("VK_KHR_shared_presentable_image") // 111

@extension("VK_KHR_shared_presentable_image") // 112

class VkSharedPresentSurfaceCapabilitiesKHR {

    VkStructureType                                 sType

    const void*                                     pNext

    VkImageUsageFlags                               sharedPresentSupportedUsageFlags

}



@extension("VK_KHR_get_surface_capabilities2") // 119

@extension("VK_KHR_get_surface_capabilities2") // 120

class VkPhysicalDeviceSurfaceInfo2KHR {

    VkStructureType                                 sType

    const void*                                     pNext

    VkSurfaceKHR                                    surface

}



@extension("VK_KHR_get_surface_capabilities2") // 119

@extension("VK_KHR_get_surface_capabilities2") // 120

class VkSurfaceCapabilities2KHR {

    VkStructureType                                 sType

    void*                                           pNext

    VkSurfaceCapabilitiesKHR                        surfaceCapabilities

}



@extension("VK_KHR_get_surface_capabilities2") // 119

@extension("VK_KHR_get_surface_capabilities2") // 120

class VkSurfaceFormat2KHR {

    VkStructureType                                 sType

    void*                                           pNext
@@ -7462,7 +7508,7 @@ cmd VkResult vkGetSwapchainStatusKHR( 
    return ?

}



@extension("VK_KHR_get_surface_capabilities2") // 119

@extension("VK_KHR_get_surface_capabilities2") // 120

cmd VkResult vkGetPhysicalDeviceSurfaceCapabilities2KHR(

        VkPhysicalDevice                            physicalDevice,

        const VkPhysicalDeviceSurfaceInfo2KHR*      pSurfaceInfo,
@@ -7470,7 +7516,7 @@ cmd VkResult vkGetPhysicalDeviceSurfaceCapabilities2KHR( 
    return ?

}



@extension("VK_KHR_get_surface_capabilities2") // 119

@extension("VK_KHR_get_surface_capabilities2") // 120

cmd VkResult vkGetPhysicalDeviceSurfaceFormats2KHR(

        VkPhysicalDevice                            physicalDevice,

        const VkPhysicalDeviceSurfaceInfo2KHR*      pSurfaceInfo,

vulkan/include/vulkan/vulkan.h

+102 −66
Original line number Diff line number Diff line
@@ -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 46

#define VK_HEADER_VERSION 49





#define VK_NULL_HANDLE 0
@@ -261,9 +261,6 @@ typedef enum VkStructureType { 
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_BUFFER_INFO_KHX = 1000071002,

    VK_STRUCTURE_TYPE_EXTERNAL_BUFFER_PROPERTIES_KHX = 1000071003,

    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES_KHX = 1000071004,

    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2_KHX = 1000071005,

    VK_STRUCTURE_TYPE_IMAGE_FORMAT_PROPERTIES_2_KHX = 1000071006,

    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2_KHX = 1000071007,

    VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_BUFFER_CREATE_INFO_KHX = 1000072000,

    VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_IMAGE_CREATE_INFO_KHX = 1000072001,

    VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO_KHX = 1000072002,
@@ -901,6 +898,47 @@ typedef enum VkSubpassContents { 
    VK_SUBPASS_CONTENTS_MAX_ENUM = 0x7FFFFFFF

} VkSubpassContents;



typedef enum VkObjectType {

    VK_OBJECT_TYPE_UNKNOWN = 0,

    VK_OBJECT_TYPE_INSTANCE = 1,

    VK_OBJECT_TYPE_PHYSICAL_DEVICE = 2,

    VK_OBJECT_TYPE_DEVICE = 3,

    VK_OBJECT_TYPE_QUEUE = 4,

    VK_OBJECT_TYPE_SEMAPHORE = 5,

    VK_OBJECT_TYPE_COMMAND_BUFFER = 6,

    VK_OBJECT_TYPE_FENCE = 7,

    VK_OBJECT_TYPE_DEVICE_MEMORY = 8,

    VK_OBJECT_TYPE_BUFFER = 9,

    VK_OBJECT_TYPE_IMAGE = 10,

    VK_OBJECT_TYPE_EVENT = 11,

    VK_OBJECT_TYPE_QUERY_POOL = 12,

    VK_OBJECT_TYPE_BUFFER_VIEW = 13,

    VK_OBJECT_TYPE_IMAGE_VIEW = 14,

    VK_OBJECT_TYPE_SHADER_MODULE = 15,

    VK_OBJECT_TYPE_PIPELINE_CACHE = 16,

    VK_OBJECT_TYPE_PIPELINE_LAYOUT = 17,

    VK_OBJECT_TYPE_RENDER_PASS = 18,

    VK_OBJECT_TYPE_PIPELINE = 19,

    VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT = 20,

    VK_OBJECT_TYPE_SAMPLER = 21,

    VK_OBJECT_TYPE_DESCRIPTOR_POOL = 22,

    VK_OBJECT_TYPE_DESCRIPTOR_SET = 23,

    VK_OBJECT_TYPE_FRAMEBUFFER = 24,

    VK_OBJECT_TYPE_COMMAND_POOL = 25,

    VK_OBJECT_TYPE_SURFACE_KHR = 1000000000,

    VK_OBJECT_TYPE_SWAPCHAIN_KHR = 1000001000,

    VK_OBJECT_TYPE_DISPLAY_KHR = 1000002000,

    VK_OBJECT_TYPE_DISPLAY_MODE_KHR = 1000002001,

    VK_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT = 1000011000,

    VK_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_KHR = 1000085000,

    VK_OBJECT_TYPE_OBJECT_TABLE_NVX = 1000086000,

    VK_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_NVX = 1000086001,

    VK_OBJECT_TYPE_BEGIN_RANGE = VK_OBJECT_TYPE_UNKNOWN,

    VK_OBJECT_TYPE_END_RANGE = VK_OBJECT_TYPE_COMMAND_POOL,

    VK_OBJECT_TYPE_RANGE_SIZE = (VK_OBJECT_TYPE_COMMAND_POOL - VK_OBJECT_TYPE_UNKNOWN + 1),

    VK_OBJECT_TYPE_MAX_ENUM = 0x7FFFFFFF

} VkObjectType;



typedef VkFlags VkInstanceCreateFlags;



typedef enum VkFormatFeatureFlagBits {
@@ -4107,6 +4145,64 @@ VKAPI_ATTR void VKAPI_CALL vkCmdPushDescriptorSetWithTemplateKHR( 
    const void*                                 pData);

#endif



#define VK_KHR_shared_presentable_image 1

#define VK_KHR_SHARED_PRESENTABLE_IMAGE_SPEC_VERSION 1

#define VK_KHR_SHARED_PRESENTABLE_IMAGE_EXTENSION_NAME "VK_KHR_shared_presentable_image"



typedef struct VkSharedPresentSurfaceCapabilitiesKHR {

    VkStructureType      sType;

    void*                pNext;

    VkImageUsageFlags    sharedPresentSupportedUsageFlags;

} VkSharedPresentSurfaceCapabilitiesKHR;





typedef VkResult (VKAPI_PTR *PFN_vkGetSwapchainStatusKHR)(VkDevice device, VkSwapchainKHR swapchain);



#ifndef VK_NO_PROTOTYPES

VKAPI_ATTR VkResult VKAPI_CALL vkGetSwapchainStatusKHR(

    VkDevice                                    device,

    VkSwapchainKHR                              swapchain);

#endif



#define VK_KHR_get_surface_capabilities2 1

#define VK_KHR_GET_SURFACE_CAPABILITIES_2_SPEC_VERSION 1

#define VK_KHR_GET_SURFACE_CAPABILITIES_2_EXTENSION_NAME "VK_KHR_get_surface_capabilities2"



typedef struct VkPhysicalDeviceSurfaceInfo2KHR {

    VkStructureType    sType;

    const void*        pNext;

    VkSurfaceKHR       surface;

} VkPhysicalDeviceSurfaceInfo2KHR;



typedef struct VkSurfaceCapabilities2KHR {

    VkStructureType             sType;

    void*                       pNext;

    VkSurfaceCapabilitiesKHR    surfaceCapabilities;

} VkSurfaceCapabilities2KHR;



typedef struct VkSurfaceFormat2KHR {

    VkStructureType       sType;

    void*                 pNext;

    VkSurfaceFormatKHR    surfaceFormat;

} VkSurfaceFormat2KHR;





typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceSurfaceCapabilities2KHR)(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo, VkSurfaceCapabilities2KHR* pSurfaceCapabilities);

typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceSurfaceFormats2KHR)(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo, uint32_t* pSurfaceFormatCount, VkSurfaceFormat2KHR* pSurfaceFormats);



#ifndef VK_NO_PROTOTYPES

VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceCapabilities2KHR(

    VkPhysicalDevice                            physicalDevice,

    const VkPhysicalDeviceSurfaceInfo2KHR*      pSurfaceInfo,

    VkSurfaceCapabilities2KHR*                  pSurfaceCapabilities);



VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceFormats2KHR(

    VkPhysicalDevice                            physicalDevice,

    const VkPhysicalDeviceSurfaceInfo2KHR*      pSurfaceInfo,

    uint32_t*                                   pSurfaceFormatCount,

    VkSurfaceFormat2KHR*                        pSurfaceFormats);

#endif



#define VK_EXT_debug_report 1

VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDebugReportCallbackEXT)
@@ -5770,66 +5866,6 @@ VKAPI_ATTR void VKAPI_CALL vkSetHdrMetadataEXT( 
    const VkHdrMetadataEXT*                     pMetadata);

#endif



#define VK_KHR_shared_presentable_image 1

#define VK_KHR_SHARED_PRESENTABLE_IMAGE_SPEC_VERSION 1

#define VK_KHR_SHARED_PRESENTABLE_IMAGE_EXTENSION_NAME "VK_KHR_shared_presentable_image"



typedef struct VkSharedPresentSurfaceCapabilitiesKHR {

    VkStructureType      sType;

    void*                pNext;

    VkImageUsageFlags    sharedPresentSupportedUsageFlags;

} VkSharedPresentSurfaceCapabilitiesKHR;





typedef VkResult (VKAPI_PTR *PFN_vkGetSwapchainStatusKHR)(VkDevice device, VkSwapchainKHR swapchain);



#ifndef VK_NO_PROTOTYPES

VKAPI_ATTR VkResult VKAPI_CALL vkGetSwapchainStatusKHR(

    VkDevice                                    device,

    VkSwapchainKHR                              swapchain);

#endif



#define VK_KHR_get_surface_capabilities2 1

#define VK_KHR_GET_SURFACE_CAPABILITIES_2_SPEC_VERSION 1

#define VK_KHR_GET_SURFACE_CAPABILITIES_2_EXTENSION_NAME "VK_KHR_get_surface_capabilities2"



typedef struct VkPhysicalDeviceSurfaceInfo2KHR {

    VkStructureType    sType;

    const void*        pNext;

    VkSurfaceKHR       surface;

} VkPhysicalDeviceSurfaceInfo2KHR;



typedef struct VkSurfaceCapabilities2KHR {

    VkStructureType             sType;

    void*                       pNext;

    VkSurfaceCapabilitiesKHR    surfaceCapabilities;

} VkSurfaceCapabilities2KHR;



typedef struct VkSurfaceFormat2KHR {

    VkStructureType       sType;

    void*                 pNext;

    VkSurfaceFormatKHR    surfaceFormat;

} VkSurfaceFormat2KHR;





typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceSurfaceCapabilities2KHR)(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo, VkSurfaceCapabilities2KHR* pSurfaceCapabilities);

typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceSurfaceFormats2KHR)(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR* pSurfaceInfo, uint32_t* pSurfaceFormatCount, VkSurfaceFormat2KHR* pSurfaceFormats);



#ifndef VK_NO_PROTOTYPES

VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceCapabilities2KHR(

    VkPhysicalDevice                            physicalDevice,

    const VkPhysicalDeviceSurfaceInfo2KHR*      pSurfaceInfo,

    VkSurfaceCapabilities2KHR*                  pSurfaceCapabilities);



VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceFormats2KHR(

    VkPhysicalDevice                            physicalDevice,

    const VkPhysicalDeviceSurfaceInfo2KHR*      pSurfaceInfo,

    uint32_t*                                   pSurfaceFormatCount,

    VkSurfaceFormat2KHR*                        pSurfaceFormats);

#endif







#ifdef VK_USE_PLATFORM_IOS_MVK

#define VK_MVK_ios_surface 1

#define VK_MVK_IOS_SURFACE_SPEC_VERSION   2