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

Commit e8ec6a28 authored by Jesse Hall's avatar Jesse Hall
Browse files

vulkan: update Vulkan headers to 1.0.43 

Test: mmm frameworks/native/vulkan
Merged-In: Ib4fb6c279349c821384f73991105218e14dd6a79
Change-Id: Ib6b72ca50bff647552f1cad1e726d5398104ffe1
parent d0599585

vulkan/api/vulkan.api

+95 −47
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 42

define VERSION_PATCH 43



// API limits

define VK_MAX_PHYSICAL_DEVICE_NAME_SIZE 256
@@ -73,7 +73,7 @@ define NULL_HANDLE 0 
@extension("VK_KHR_xcb_surface") define VK_KHR_XCB_SURFACE_NAME                 "VK_KHR_xcb_surface"



// 7

@extension("VK_KHR_wayland_surface") define VK_KHR_WAYLAND_SURFACE_SPEC_VERSION 5

@extension("VK_KHR_wayland_surface") define VK_KHR_WAYLAND_SURFACE_SPEC_VERSION 6

@extension("VK_KHR_wayland_surface") define VK_KHR_WAYLAND_SURFACE_NAME         "VK_KHR_wayland_surface"



// 8
@@ -276,6 +276,10 @@ define NULL_HANDLE 0 
@extension("VK_EXT_display_control") define VK_EXT_DISPLAY_CONTROL_SPEC_VERSION 1

@extension("VK_EXT_display_control") define VK_EXT_DISPLAY_CONTROL_COUNTER_EXTENSION_NAME "VK_EXT_display_control"



// 93

@extension("VK_GOOGLE_display_timing") define VK_GOOGLE_DISPLAY_TIMING_SPEC_VERSION 1

@extension("VK_GOOGLE_display_timing") define VK_GOOGLE_DISPLAY_TIMING_EXTENSION_NAME "VK_GOOGLE_display_timing"



// 95

@extension("VK_NV_sample_mask_override_coverage") define VK_NV_SAMPLE_MASK_OVERRIDE_COVERAGE_SPEC_VERSION 1

@extension("VK_NV_sample_mask_override_coverage") define VK_NV_SAMPLE_MASK_OVERRIDE_COVERAGE_EXTENSION_NAME "VK_NV_sample_mask_override_coverage"
@@ -300,6 +304,10 @@ define NULL_HANDLE 0 
@extension("VK_EXT_discard_rectangles") define VK_EXT_DISCARD_RECTANGLES_SPEC_VERSION 1

@extension("VK_EXT_discard_rectangles") define VK_EXT_DISCARD_RECTANGLES_EXTENSION_NAME "VK_EXT_discard_rectangles"



// 106

@extension("VK_EXT_hdr_metadata") define VK_EXT_HDR_METADATA_SPEC_VERSION 1

@extension("VK_EXT_hdr_metadata") define VK_EXT_HDR_METADATA_EXTENSION_NAME "VK_EXT_hdr_metadata"



// 123

@extension("VK_MVK_ios_surface") define VK_MVK_IOS_SURFACE_SPEC_VERSION 1

@extension("VK_MVK_ios_surface") define VK_MVK_IOS_SURFACE_EXTENSION_NAME "VK_MVK_ios_surface"
@@ -1038,6 +1046,9 @@ enum VkStructureType { 
    VK_STRUCTURE_TYPE_DISPLAY_EVENT_INFO_EXT                    = 1000091002,

    VK_STRUCTURE_TYPE_SWAPCHAIN_COUNTER_CREATE_INFO_EXT         = 1000091003,



    //@extension("VK_GOOGLE_display_timing") // 93

    VK_STRUCTURE_TYPE_PRESENT_TIMES_INFO_GOOGLE                 = 1000092000,



    //@extension("VK_NVX_multiview_per_view_attributes") // 98

    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_ATTRIBUTES_PROPERTIES_NVX  = 1000097000,
@@ -1048,6 +1059,9 @@ enum VkStructureType { 
    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DISCARD_RECTANGLE_PROPERTIES_EXT  = 1000099000,

    VK_STRUCTURE_TYPE_PIPELINE_DISCARD_RECTANGLE_STATE_CREATE_INFO_EXT  = 1000099001,



    //@extension("VK_EXT_hdr_metadata") // 106

    VK_STRUCTURE_TYPE_HDR_METADATA_EXT                          = 1000105000,



    //@extension("VK_MVK_ios_surface") // 123

    VK_STRUCTURE_TYPE_IOS_SURFACE_CREATE_INFO_MVK               = 1000122000,
@@ -3704,31 +3718,6 @@ class VkPhysicalDeviceIDPropertiesKHX { 
    VkBool32                                    deviceLUIDValid

}



@extension("VK_KHX_external_memory_capabilities") // 72

class VkPhysicalDeviceProperties2KHX {

    VkStructureType                             sType

    void*                                       pNext

    VkPhysicalDeviceProperties                  properties

}



@extension("VK_KHX_external_memory_capabilities") // 72

class VkImageFormatProperties2KHX {

    VkStructureType                             sType

    void*                                       pNext

    VkImageFormatProperties                     imageFormatProperties

}



@extension("VK_KHX_external_memory_capabilities") // 72

class VkPhysicalDeviceImageFormatInfo2KHX {

    VkStructureType                             sType

    const void*                                 pNext

    VkFormat                                    format

    VkImageType                                 type

    VkImageTiling                               tiling

    VkImageUsageFlags                           usage

    VkImageCreateFlags                          flags

}



@extension("VK_KHX_external_memory") // 73

class VkExternalMemoryImageCreateInfoKHX {

    VkStructureType                             sType
@@ -4080,6 +4069,34 @@ class VkSwapchainCounterCreateInfoEXT { 
    VkSurfaceCounterFlagsEXT                    surfaceCounters

}



@extension("VK_GOOGLE_display_timing") // 93

class VkRefreshCycleDurationGOOGLE {

    u64                                             refreshDuration

}



@extension("VK_GOOGLE_display_timing") // 93

class VkPastPresentationTimingGOOGLE {

    u32                                             presentID

    u64                                             desiredPresentTime

    u64                                             actualPresentTime

    u64                                             earliestPresentTime

    u64                                             presentMargin

}



@extension("VK_GOOGLE_display_timing") // 93

class VkPresentTimeGOOGLE {

    u32                                             presentID

    u64                                             desiredPresentTime

}



@extension("VK_GOOGLE_display_timing") // 93

class VkPresentTimesInfoGOOGLE {

    VkStructureType                                 sType

    const void*                                     pNext

    u32                                             swapchainCount

    const VkPresentTimeGOOGLE*                      pTimes

}



@extension("VK_NVX_multiview_per_view_attributes") // 98

class VkPhysicalDeviceMultiviewPerViewAttributesPropertiesNVX {

    VkStructureType                             sType
@@ -4121,6 +4138,26 @@ class VkPipelineDiscardRectangleStateCreateInfoEXT { 
    const VkRect2D*                                 pDiscardRectangles

}



@extension("VK_EXT_hdr_metadata") // 106

class VkXYColorEXT {

    f32                                             x

    f32                                             y

}



@extension("VK_EXT_hdr_metadata") // 106

class VkHdrMetadataEXT {

    VkStructureType                                 sType

    const void*                                     pNext

    VkXYColorEXT                                    displayPrimaryRed

    VkXYColorEXT                                    displayPrimaryGreen

    VkXYColorEXT                                    displayPrimaryBlue

    VkXYColorEXT                                    whitePoint

    f32                                             maxLuminance

    f32                                             minLuminance

    f32                                             maxContentLightLevel

    f32                                             maxFrameAverageLightLevel

}



@extension("VK_MVK_ios_surface") // 123

class VkIOSSurfaceCreateInfoMVK {

    VkStructureType                                 sType
@@ -6970,20 +7007,6 @@ cmd void vkGetPhysicalDeviceExternalBufferPropertiesKHX( 
        VkExternalBufferPropertiesKHX*                  pExternalBufferProperties) {

}



@extension("VK_KHX_external_memory_capabilities") // 72

cmd void vkGetPhysicalDeviceProperties2KHX(

        VkPhysicalDevice                            physicalDevice,

        VkPhysicalDeviceProperties2KHX*             pProperties) {

}



@extension("VK_KHX_external_memory_capabilities") // 72

cmd VkResult vkGetPhysicalDeviceImageFormatProperties2KHX(

        VkPhysicalDevice                            physicalDevice,

        const VkPhysicalDeviceImageFormatInfo2KHX*  pImageFormatInfo,

        VkImageFormatProperties2KHX*                pImageFormatProperties) {

    return ?

}



@extension("VK_KHX_external_memory_win32") // 74

cmd VkResult vkGetMemoryWin32HandleKHX(

        VkDevice                                    device,
@@ -7249,6 +7272,23 @@ cmd VkResult vkGetSwapchainCounterEXT( 
    return ?

}



@extension("VK_GOOGLE_display_timing") // 93

cmd VkResult vkGetRefreshCycleDurationGOOGLE(

        VkDevice                                    device,

        VkSwapchainKHR                              swapchain,

        VkRefreshCycleDurationGOOGLE*               pDisplayTimingProperties) {

    return ?

}



@extension("VK_GOOGLE_display_timing") // 93

cmd VkResult vkGetPastPresentationTimingGOOGLE(

        VkDevice                                    device,

        VkSwapchainKHR                              swapchain,

        u32*                                        pPresentationTimingCount,

        VkPastPresentationTimingGOOGLE*             pPresentationTimings) {

    return ?

}



@extension("VK_EXT_discard_rectangles") // 100

cmd void vkCmdSetDiscardRectangleEXT(

        VkCommandBuffer                             commandBuffer,
@@ -7257,6 +7297,14 @@ cmd void vkCmdSetDiscardRectangleEXT( 
        const VkRect2D*                             pDiscardRectangles) {

}



@extension("VK_EXT_hdr_metadata") // 106

cmd void vkSetHdrMetadataEXT(

        VkDevice                                    device,

        u32                                         swapchainCount,

        const VkSwapchainKHR*                       pSwapchains,

        const VkHdrMetadataEXT*                     pMetadata) {

}



@extension("VK_MVK_ios_surface") // 123

cmd VkResult vkCreateIOSSurfaceMVK(

        VkInstance                                  instance,

vulkan/include/vulkan/vulkan.h

+82 −35
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 42

#define VK_HEADER_VERSION 43





#define VK_NULL_HANDLE 0
@@ -294,10 +294,12 @@ typedef enum VkStructureType { 
    VK_STRUCTURE_TYPE_DEVICE_EVENT_INFO_EXT = 1000091001,

    VK_STRUCTURE_TYPE_DISPLAY_EVENT_INFO_EXT = 1000091002,

    VK_STRUCTURE_TYPE_SWAPCHAIN_COUNTER_CREATE_INFO_EXT = 1000091003,

    VK_STRUCTURE_TYPE_PRESENT_TIMES_INFO_GOOGLE = 1000092000,

    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_PER_VIEW_ATTRIBUTES_PROPERTIES_NVX = 1000097000,

    VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_SWIZZLE_STATE_CREATE_INFO_NV = 1000098000,

    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DISCARD_RECTANGLE_PROPERTIES_EXT = 1000099000,

    VK_STRUCTURE_TYPE_PIPELINE_DISCARD_RECTANGLE_STATE_CREATE_INFO_EXT = 1000099001,

    VK_STRUCTURE_TYPE_HDR_METADATA_EXT = 1000105000,

    VK_STRUCTURE_TYPE_IOS_SURFACE_CREATE_INFO_MVK = 1000122000,

    VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK = 1000123000,

    VK_STRUCTURE_TYPE_BEGIN_RANGE = VK_STRUCTURE_TYPE_APPLICATION_INFO,
@@ -3703,7 +3705,7 @@ VKAPI_ATTR VkBool32 VKAPI_CALL vkGetPhysicalDeviceXcbPresentationSupportKHR( 
#define VK_KHR_wayland_surface 1

#include <wayland-client.h>



#define VK_KHR_WAYLAND_SURFACE_SPEC_VERSION 5

#define VK_KHR_WAYLAND_SURFACE_SPEC_VERSION 6

#define VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME "VK_KHR_wayland_surface"



typedef VkFlags VkWaylandSurfaceCreateFlagsKHR;
@@ -4849,47 +4851,14 @@ typedef struct VkPhysicalDeviceIDPropertiesKHX { 
    VkBool32           deviceLUIDValid;

} VkPhysicalDeviceIDPropertiesKHX;



typedef struct VkPhysicalDeviceProperties2KHX {

    VkStructureType               sType;

    void*                         pNext;

    VkPhysicalDeviceProperties    properties;

} VkPhysicalDeviceProperties2KHX;



typedef struct VkImageFormatProperties2KHX {

    VkStructureType            sType;

    void*                      pNext;

    VkImageFormatProperties    imageFormatProperties;

} VkImageFormatProperties2KHX;



typedef struct VkPhysicalDeviceImageFormatInfo2KHX {

    VkStructureType       sType;

    const void*           pNext;

    VkFormat              format;

    VkImageType           type;

    VkImageTiling         tiling;

    VkImageUsageFlags     usage;

    VkImageCreateFlags    flags;

} VkPhysicalDeviceImageFormatInfo2KHX;





typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceExternalBufferPropertiesKHX)(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalBufferInfoKHX* pExternalBufferInfo, VkExternalBufferPropertiesKHX* pExternalBufferProperties);

typedef void (VKAPI_PTR *PFN_vkGetPhysicalDeviceProperties2KHX)(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2KHX* pProperties);

typedef VkResult (VKAPI_PTR *PFN_vkGetPhysicalDeviceImageFormatProperties2KHX)(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2KHX* pImageFormatInfo, VkImageFormatProperties2KHX* pImageFormatProperties);



#ifndef VK_NO_PROTOTYPES

VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceExternalBufferPropertiesKHX(

    VkPhysicalDevice                            physicalDevice,

    const VkPhysicalDeviceExternalBufferInfoKHX* pExternalBufferInfo,

    VkExternalBufferPropertiesKHX*              pExternalBufferProperties);



VKAPI_ATTR void VKAPI_CALL vkGetPhysicalDeviceProperties2KHX(

    VkPhysicalDevice                            physicalDevice,

    VkPhysicalDeviceProperties2KHX*             pProperties);



VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceImageFormatProperties2KHX(

    VkPhysicalDevice                            physicalDevice,

    const VkPhysicalDeviceImageFormatInfo2KHX*  pImageFormatInfo,

    VkImageFormatProperties2KHX*                pImageFormatProperties);

#endif



#define VK_KHX_external_memory 1
@@ -5565,6 +5534,51 @@ VKAPI_ATTR VkResult VKAPI_CALL vkGetSwapchainCounterEXT( 
    uint64_t*                                   pCounterValue);

#endif



#define VK_GOOGLE_display_timing 1

#define VK_GOOGLE_DISPLAY_TIMING_SPEC_VERSION 1

#define VK_GOOGLE_DISPLAY_TIMING_EXTENSION_NAME "VK_GOOGLE_display_timing"



typedef struct VkRefreshCycleDurationGOOGLE {

    uint64_t    refreshDuration;

} VkRefreshCycleDurationGOOGLE;



typedef struct VkPastPresentationTimingGOOGLE {

    uint32_t    presentID;

    uint64_t    desiredPresentTime;

    uint64_t    actualPresentTime;

    uint64_t    earliestPresentTime;

    uint64_t    presentMargin;

} VkPastPresentationTimingGOOGLE;



typedef struct VkPresentTimeGOOGLE {

    uint32_t    presentID;

    uint64_t    desiredPresentTime;

} VkPresentTimeGOOGLE;



typedef struct VkPresentTimesInfoGOOGLE {

    VkStructureType               sType;

    const void*                   pNext;

    uint32_t                      swapchainCount;

    const VkPresentTimeGOOGLE*    pTimes;

} VkPresentTimesInfoGOOGLE;





typedef VkResult (VKAPI_PTR *PFN_vkGetRefreshCycleDurationGOOGLE)(VkDevice device, VkSwapchainKHR swapchain, VkRefreshCycleDurationGOOGLE* pDisplayTimingProperties);

typedef VkResult (VKAPI_PTR *PFN_vkGetPastPresentationTimingGOOGLE)(VkDevice device, VkSwapchainKHR swapchain, uint32_t* pPresentationTimingCount, VkPastPresentationTimingGOOGLE* pPresentationTimings);



#ifndef VK_NO_PROTOTYPES

VKAPI_ATTR VkResult VKAPI_CALL vkGetRefreshCycleDurationGOOGLE(

    VkDevice                                    device,

    VkSwapchainKHR                              swapchain,

    VkRefreshCycleDurationGOOGLE*               pDisplayTimingProperties);



VKAPI_ATTR VkResult VKAPI_CALL vkGetPastPresentationTimingGOOGLE(

    VkDevice                                    device,

    VkSwapchainKHR                              swapchain,

    uint32_t*                                   pPresentationTimingCount,

    VkPastPresentationTimingGOOGLE*             pPresentationTimings);

#endif



#define VK_NV_sample_mask_override_coverage 1

#define VK_NV_SAMPLE_MASK_OVERRIDE_COVERAGE_SPEC_VERSION 1

#define VK_NV_SAMPLE_MASK_OVERRIDE_COVERAGE_EXTENSION_NAME "VK_NV_sample_mask_override_coverage"
@@ -5673,6 +5687,39 @@ VKAPI_ATTR void VKAPI_CALL vkCmdSetDiscardRectangleEXT( 
    const VkRect2D*                             pDiscardRectangles);

#endif



#define VK_EXT_hdr_metadata 1

#define VK_EXT_HDR_METADATA_SPEC_VERSION  1

#define VK_EXT_HDR_METADATA_EXTENSION_NAME "VK_EXT_hdr_metadata"



typedef struct VkXYColorEXT {

    float    x;

    float    y;

} VkXYColorEXT;



typedef struct VkHdrMetadataEXT {

    VkStructureType    sType;

    const void*        pNext;

    VkXYColorEXT       displayPrimaryRed;

    VkXYColorEXT       displayPrimaryGreen;

    VkXYColorEXT       displayPrimaryBlue;

    VkXYColorEXT       whitePoint;

    float              maxLuminance;

    float              minLuminance;

    float              maxContentLightLevel;

    float              maxFrameAverageLightLevel;

} VkHdrMetadataEXT;





typedef void (VKAPI_PTR *PFN_vkSetHdrMetadataEXT)(VkDevice device, uint32_t swapchainCount, const VkSwapchainKHR* pSwapchains, const VkHdrMetadataEXT* pMetadata);



#ifndef VK_NO_PROTOTYPES

VKAPI_ATTR void VKAPI_CALL vkSetHdrMetadataEXT(

    VkDevice                                    device,

    uint32_t                                    swapchainCount,

    const VkSwapchainKHR*                       pSwapchains,

    const VkHdrMetadataEXT*                     pMetadata);

#endif



#ifdef VK_USE_PLATFORM_IOS_MVK

#define VK_MVK_ios_surface 1

#define VK_MVK_IOS_SURFACE_SPEC_VERSION   2

vulkan/libvulkan/api_gen.cpp

+0 −2
Original line number Diff line number Diff line
@@ -464,13 +464,11 @@ VKAPI_ATTR PFN_vkVoidFunction GetDeviceProcAddr(VkDevice device, const char* pNa 
        "vkGetPhysicalDeviceGeneratedCommandsPropertiesNVX",

        "vkGetPhysicalDeviceImageFormatProperties",

        "vkGetPhysicalDeviceImageFormatProperties2KHR",

        "vkGetPhysicalDeviceImageFormatProperties2KHX",

        "vkGetPhysicalDeviceMemoryProperties",

        "vkGetPhysicalDeviceMemoryProperties2KHR",

        "vkGetPhysicalDevicePresentRectanglesKHX",

        "vkGetPhysicalDeviceProperties",

        "vkGetPhysicalDeviceProperties2KHR",

        "vkGetPhysicalDeviceProperties2KHX",

        "vkGetPhysicalDeviceQueueFamilyProperties",

        "vkGetPhysicalDeviceQueueFamilyProperties2KHR",

        "vkGetPhysicalDeviceSparseImageFormatProperties",