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

Commit 26ce864c authored by Jesse Hall's avatar Jesse Hall Committed by android-build-merger
Browse files

Merge "vulkan: Update Vulkan headers to 1.1.96" am: 7a4ecaaf am: 820eb81c 

am: 52859157

Change-Id: I83ef0d4a32ce6f235dd6a17b08bcd63fad1238c2
parents 0510d906 52859157

vulkan/api/vulkan.api

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

// API version (major.minor.patch)

define VERSION_MAJOR 1

define VERSION_MAJOR 1

define VERSION_MINOR 1

define VERSION_MINOR 1

define VERSION_PATCH 95

define VERSION_PATCH 96

















// API limits







// API limits











define VK_MAX_PHYSICAL_DEVICE_NAME_SIZE 256







define VK_MAX_PHYSICAL_DEVICE_NAME_SIZE 256










@@ -620,7 +620,7 @@ define NULL_HANDLE 0









@extension("VK_KHR_vulkan_memory_model") define VK_KHR_VULKAN_MEMORY_MODEL_EXTENSION_NAME "VK_KHR_vulkan_memory_model"







@extension("VK_KHR_vulkan_memory_model") define VK_KHR_VULKAN_MEMORY_MODEL_EXTENSION_NAME "VK_KHR_vulkan_memory_model"



























// 213







// 213











@extension("VK_EXT_pci_bus_info") define VK_EXT_PCI_BUS_INFO_SPEC_VERSION 1







@extension("VK_EXT_pci_bus_info") define VK_EXT_PCI_BUS_INFO_SPEC_VERSION 2











@extension("VK_EXT_pci_bus_info") define VK_EXT_PCI_BUS_INFO_EXENSION_NAME "VK_EXT_pci_bus_info"







@extension("VK_EXT_pci_bus_info") define VK_EXT_PCI_BUS_INFO_EXENSION_NAME "VK_EXT_pci_bus_info"



























// 215







// 215









@@ -636,11 +636,11 @@ define NULL_HANDLE 0









@extension("VK_EXT_scalar_block_layout") define VK_EXT_SCALAR_BLOCK_LAYOUT_EXTENSION_NAME "VK_EXT_scalar_block_layout"







@extension("VK_EXT_scalar_block_layout") define VK_EXT_SCALAR_BLOCK_LAYOUT_EXTENSION_NAME "VK_EXT_scalar_block_layout"



























// 224







// 224











@extension("VK_GOOGLE_hlsl_functionality1") define VK_GOOGLE_HLSL_FUNCTIONALITY1_SPEC_VERSION 0







@extension("VK_GOOGLE_hlsl_functionality1") define VK_GOOGLE_HLSL_FUNCTIONALITY1_SPEC_VERSION 1











@extension("VK_GOOGLE_hlsl_functionality1") define VK_GOOGLE_HLSL_FUNCTIONALITY1_EXTENSION_NAME "VK_GOOGLE_hlsl_functionality1"







@extension("VK_GOOGLE_hlsl_functionality1") define VK_GOOGLE_HLSL_FUNCTIONALITY1_EXTENSION_NAME "VK_GOOGLE_hlsl_functionality1"



























// 225







// 225











@extension("VK_GOOGLE_decorate_string") define VK_GOOGLE_DECORATE_STRING_SPEC_VERSION 0







@extension("VK_GOOGLE_decorate_string") define VK_GOOGLE_DECORATE_STRING_SPEC_VERSION 1











@extension("VK_GOOGLE_decorate_string") define VK_GOOGLE_DECORATE_STRING_EXTENSION_NAME "VK_GOOGLE_decorate_string"







@extension("VK_GOOGLE_decorate_string") define VK_GOOGLE_DECORATE_STRING_EXTENSION_NAME "VK_GOOGLE_decorate_string"



























// 247







// 247










@@ -7740,10 +7740,10 @@ class VkPhysicalDeviceVulkanMemoryModelFeaturesKHR {









class VkPhysicalDevicePCIBusInfoPropertiesEXT {







class VkPhysicalDevicePCIBusInfoPropertiesEXT {











    VkStructureType                                 sType







    VkStructureType                                 sType











    void*                                           pNext







    void*                                           pNext











    u16                                             pciDomain







    u32                                             pciDomain











    u8                                              pciBus







    u32                                             pciBus











    u8                                              pciDevice







    u32                                             pciDevice











    u8                                              pciFunction







    u32                                             pciFunction











}







}



























@extension("VK_FUCHSIA_imagepipe_surface") // 215







@extension("VK_FUCHSIA_imagepipe_surface") // 215

































vulkan/include/vulkan/vulkan_core.h



+8
−8






























Original line number
Original line
Diff line number
Diff line








@@ -43,7 +43,7 @@ extern "C" {









#define VK_VERSION_MINOR(version) (((uint32_t)(version) >> 12) & 0x3ff)







#define VK_VERSION_MINOR(version) (((uint32_t)(version) >> 12) & 0x3ff)











#define VK_VERSION_PATCH(version) ((uint32_t)(version) & 0xfff)







#define VK_VERSION_PATCH(version) ((uint32_t)(version) & 0xfff)











// Version of this file







// Version of this file











#define VK_HEADER_VERSION 95







#define VK_HEADER_VERSION 96



















































#define VK_NULL_HANDLE 0







#define VK_NULL_HANDLE 0










@@ -8862,16 +8862,16 @@ VKAPI_ATTR void VKAPI_CALL vkGetQueueCheckpointDataNV(









#endif







#endif































#define VK_EXT_pci_bus_info 1







#define VK_EXT_pci_bus_info 1











#define VK_EXT_PCI_BUS_INFO_SPEC_VERSION  1







#define VK_EXT_PCI_BUS_INFO_SPEC_VERSION  2











#define VK_EXT_PCI_BUS_INFO_EXTENSION_NAME "VK_EXT_pci_bus_info"







#define VK_EXT_PCI_BUS_INFO_EXTENSION_NAME "VK_EXT_pci_bus_info"































typedef struct VkPhysicalDevicePCIBusInfoPropertiesEXT {







typedef struct VkPhysicalDevicePCIBusInfoPropertiesEXT {











    VkStructureType    sType;







    VkStructureType    sType;











    void*              pNext;







    void*              pNext;











    uint16_t           pciDomain;







    uint32_t           pciDomain;











    uint8_t            pciBus;







    uint32_t           pciBus;











    uint8_t            pciDevice;







    uint32_t           pciDevice;











    uint8_t            pciFunction;







    uint32_t           pciFunction;











} VkPhysicalDevicePCIBusInfoPropertiesEXT;







} VkPhysicalDevicePCIBusInfoPropertiesEXT;


















































@@ -8917,12 +8917,12 @@ typedef struct VkPhysicalDeviceScalarBlockLayoutFeaturesEXT {

















































#define VK_GOOGLE_hlsl_functionality1 1







#define VK_GOOGLE_hlsl_functionality1 1











#define VK_GOOGLE_HLSL_FUNCTIONALITY1_SPEC_VERSION 0







#define VK_GOOGLE_HLSL_FUNCTIONALITY1_SPEC_VERSION 1











#define VK_GOOGLE_HLSL_FUNCTIONALITY1_EXTENSION_NAME "VK_GOOGLE_hlsl_functionality1"







#define VK_GOOGLE_HLSL_FUNCTIONALITY1_EXTENSION_NAME "VK_GOOGLE_hlsl_functionality1"



















































#define VK_GOOGLE_decorate_string 1







#define VK_GOOGLE_decorate_string 1











#define VK_GOOGLE_DECORATE_STRING_SPEC_VERSION 0







#define VK_GOOGLE_DECORATE_STRING_SPEC_VERSION 1











#define VK_GOOGLE_DECORATE_STRING_EXTENSION_NAME "VK_GOOGLE_decorate_string"







#define VK_GOOGLE_DECORATE_STRING_EXTENSION_NAME "VK_GOOGLE_decorate_string"