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

Commit 820eb81c 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

Change-Id: I7700e554c00aaf6ef05cbac3b91bf70ede387602
parents e7cc7dd9 7a4ecaaf

vulkan/api/vulkan.api

+8 −8
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 1

define VERSION_PATCH 95

define VERSION_PATCH 96















// API limits















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"





























// 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"





























// 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"





























// 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"





























// 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"





























// 247










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













class VkPhysicalDevicePCIBusInfoPropertiesEXT {















    VkStructureType                                 sType















    void*                                           pNext













    u16                                             pciDomain













    u8                                              pciBus













    u8                                              pciDevice













    u8                                              pciFunction













    u32                                             pciDomain













    u32                                             pciBus













    u32                                             pciDevice













    u32                                             pciFunction















}





























@extension("VK_FUCHSIA_imagepipe_surface") // 215

































vulkan/include/vulkan/vulkan_core.h



+8
−8




























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 95













#define VK_HEADER_VERSION 96















































#define VK_NULL_HANDLE 0










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













#endif































#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"































typedef struct VkPhysicalDevicePCIBusInfoPropertiesEXT {















    VkStructureType    sType;















    void*              pNext;













    uint16_t           pciDomain;













    uint8_t            pciBus;













    uint8_t            pciDevice;













    uint8_t            pciFunction;













    uint32_t           pciDomain;













    uint32_t           pciBus;













    uint32_t           pciDevice;













    uint32_t           pciFunction;















} VkPhysicalDevicePCIBusInfoPropertiesEXT;










































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













































#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_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"