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

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

resolve merge conflicts of 91397ff4 to master 

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Icb2c466acbe1ca7c8db1f8922f6ee6f00ae3db09
parents 96a715f5 91397ff4

vulkan/api/vulkan.api

+49 −4
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 94

define VERSION_PATCH 95















// API limits















define VK_MAX_PHYSICAL_DEVICE_NAME_SIZE 256










@@ -287,6 +287,10 @@ define NULL_HANDLE 0













@extension("VK_EXT_conditional_rendering") define VK_EXT_CONDITIONAL_RENDERING_SPEC_VERSION 1















@extension("VK_EXT_conditional_rendering") define VK_EXT_CONDITIONAL_RENDERING_EXTENSION_NAME "VK_EXT_conditional_rendering"



























// 83













@extension("VK_KHR_shader_float16_int8") define VK_KHR_SHADER_FLOAT16_INT8_SPEC_VERSION 1













@extension("VK_KHR_shader_float16_int8") define VK_KHR_SHADER_FLOAT16_INT8_EXTENSION_NAME "VK_KHR_shader_float16_int8"



























// 84















@extension("VK_KHR_16bit_storage") define VK_KHR_16BIT_STORAGE_SPEC_VERSION 1















@extension("VK_KHR_16bit_storage") define VK_KHR_16BIT_STORAGE_EXTENSION_NAME "VK_KHR_16bit_storage"










@@ -575,6 +579,10 @@ define NULL_HANDLE 0













@extension("VK_KHR_driver_properties") define VK_KHR_DRIVER_PROPERTIES_SPEC_VERSION 1















@extension("VK_KHR_driver_properties") define VK_KHR_DRIVER_PROPERTIES_EXTENSION_NAME "VK_KHR_driver_properties"



























// 198













@extension("VK_KHR_shader_float_controls") define VK_KHR_SHADER_FLOAT_CONTROLS_SPEC_VERSION 1













@extension("VK_KHR_shader_float_controls") define VK_KHR_SHADER_FLOAT_CONTROLS_EXTENSION_NAME "VK_KHR_shader_float_controls"



























// 199















@extension("VK_NV_shader_subgroup_partitioned") define VK_NV_SHADER_SUBGROUP_PARTITIONED_SPEC_VERSION 1















@extension("VK_NV_shader_subgroup_partitioned") define VK_NV_SHADER_SUBGROUP_PARTITIONED_EXTENSION_NAME "VK_NV_shader_subgroup_partitioned"










@@ -1615,6 +1623,9 @@ enum VkStructureType {













    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONDITIONAL_RENDERING_FEATURES_EXT        = 1000081001,















    VK_STRUCTURE_TYPE_CONDITIONAL_RENDERING_BEGIN_INFO_EXT                      = 1000081002,



























    //@extension("VK_KHR_shader_float16_int8") // 83













    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT16_INT8_FEATURES_KHR     = 1000082000,



























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















    VK_STRUCTURE_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_CREATE_INFO_KHR    = 1000085000,
























@@ -1848,6 +1859,9 @@ enum VkStructureType {













    //@extension("VK_KHR_driver_properties") // 197















    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR             = 1000196000,



























    //@extension("VK_KHR_shader_float_controls") // 198













    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES_KHR     = 1000197000,



























    //@extension("VK_AMD_shader_core_properties") // 186















    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_AMD        = 1000185000,
























@@ -6092,6 +6106,14 @@ class VkCommandBufferInheritanceConditionalRenderingInfoEXT {













    VkBool32                                    conditionalRenderingEnable















}



























@extension("VK_KHR_shader_float16_int8") // 83













class VkPhysicalDeviceFloat16Int8FeaturesKHR {













    VkStructureType                             sType













    void*                                       pNext













    VkBool32                                    shaderFloat16













    VkBool32                                    shaderInt8













}



























@extension("VK_KHR_16bit_storage") // 84















class VkPhysicalDevice16BitStorageFeaturesKHR {















    VkStructureType                             sType










@@ -6776,11 +6798,11 @@ class VkDebugUtilsMessengerCallbackDataEXT {













    s32                                             messageIdNumber















    const char*                                     pMessage















    u32                                             queueLabelCount













    VkDebugUtilsLabelEXT*                           pQueueLabels













    const VkDebugUtilsLabelEXT*                     pQueueLabels















    u32                                             cmdBufLabelCount













    VkDebugUtilsLabelEXT*                           pCmdBufLabels













    const VkDebugUtilsLabelEXT*                     pCmdBufLabels















    u32                                             objectCount













    VkDebugUtilsObjectNameInfoEXT*                  pObjects













    const VkDebugUtilsObjectNameInfoEXT*            pObjects















}





























@extension("VK_EXT_debug_utils") // 129










@@ -7598,6 +7620,29 @@ class VkPhysicalDeviceDriverPropertiesKHR {













    VkConformanceVersionKHR                         conformanceVersion















}



























@extension("VK_KHR_shader_float_controls") // 198













class VkPhysicalDeviceFloatControlsPropertiesKHR {













    VkStructureType                                 sType













    void*                                           pNext













    VkBool32                                        separateDenormSettings













    VkBool32                                        separateRoundingModeSettings













    VkBool32                                        shaderSignedZeroInfNanPreserveFloat16













    VkBool32                                        shaderSignedZeroInfNanPreserveFloat32













    VkBool32                                        shaderSignedZeroInfNanPreserveFloat64













    VkBool32                                        shaderDenormPreserveFloat16













    VkBool32                                        shaderDenormPreserveFloat32













    VkBool32                                        shaderDenormPreserveFloat64













    VkBool32                                        shaderDenormFlushToZeroFloat16













    VkBool32                                        shaderDenormFlushToZeroFloat32













    VkBool32                                        shaderDenormFlushToZeroFloat64













    VkBool32                                        shaderRoundingModeRTEFloat16













    VkBool32                                        shaderRoundingModeRTEFloat32













    VkBool32                                        shaderRoundingModeRTEFloat64













    VkBool32                                        shaderRoundingModeRTZFloat16













    VkBool32                                        shaderRoundingModeRTZFloat32













    VkBool32                                        shaderRoundingModeRTZFloat64













}



























@extension("VK_NV_compute_shader_derivatives") // 202















class VkPhysicalDeviceComputeShaderDerivativesFeaturesNV {















    VkStructureType                                 sType

































vulkan/include/vulkan/vulkan_core.h



+47
−4




























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 94













#define VK_HEADER_VERSION 95















































#define VK_NULL_HANDLE 0










@@ -327,6 +327,7 @@ typedef enum VkStructureType {













    VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_CONDITIONAL_RENDERING_INFO_EXT = 1000081000,















    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONDITIONAL_RENDERING_FEATURES_EXT = 1000081001,















    VK_STRUCTURE_TYPE_CONDITIONAL_RENDERING_BEGIN_INFO_EXT = 1000081002,













    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT16_INT8_FEATURES_KHR = 1000082000,















    VK_STRUCTURE_TYPE_PRESENT_REGIONS_KHR = 1000084000,















    VK_STRUCTURE_TYPE_OBJECT_TABLE_CREATE_INFO_NVX = 1000086000,















    VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_CREATE_INFO_NVX = 1000086001,










@@ -442,6 +443,7 @@ typedef enum VkStructureType {













    VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT = 1000190001,















    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT = 1000190002,















    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES_KHR = 1000196000,













    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES_KHR = 1000197000,















    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COMPUTE_SHADER_DERIVATIVES_FEATURES_NV = 1000201000,















    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MESH_SHADER_FEATURES_NV = 1000202000,















    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MESH_SHADER_PROPERTIES_NV = 1000202001,










@@ -5493,6 +5495,19 @@ VKAPI_ATTR void VKAPI_CALL vkCmdPushDescriptorSetWithTemplateKHR(













    const void*                                 pData);















#endif





























#define VK_KHR_shader_float16_int8 1













#define VK_KHR_SHADER_FLOAT16_INT8_SPEC_VERSION 1













#define VK_KHR_SHADER_FLOAT16_INT8_EXTENSION_NAME "VK_KHR_shader_float16_int8"



























typedef struct VkPhysicalDeviceFloat16Int8FeaturesKHR {













    VkStructureType    sType;













    void*              pNext;













    VkBool32           shaderFloat16;













    VkBool32           shaderInt8;













} VkPhysicalDeviceFloat16Int8FeaturesKHR;

























































#define VK_KHR_16bit_storage 1















#define VK_KHR_16BIT_STORAGE_SPEC_VERSION 1















#define VK_KHR_16BIT_STORAGE_EXTENSION_NAME "VK_KHR_16bit_storage"










@@ -6149,6 +6164,34 @@ typedef struct VkPhysicalDeviceDriverPropertiesKHR {



























































#define VK_KHR_shader_float_controls 1













#define VK_KHR_SHADER_FLOAT_CONTROLS_SPEC_VERSION 1













#define VK_KHR_SHADER_FLOAT_CONTROLS_EXTENSION_NAME "VK_KHR_shader_float_controls"



























typedef struct VkPhysicalDeviceFloatControlsPropertiesKHR {













    VkStructureType    sType;













    void*              pNext;













    VkBool32           separateDenormSettings;













    VkBool32           separateRoundingModeSettings;













    VkBool32           shaderSignedZeroInfNanPreserveFloat16;













    VkBool32           shaderSignedZeroInfNanPreserveFloat32;













    VkBool32           shaderSignedZeroInfNanPreserveFloat64;













    VkBool32           shaderDenormPreserveFloat16;













    VkBool32           shaderDenormPreserveFloat32;













    VkBool32           shaderDenormPreserveFloat64;













    VkBool32           shaderDenormFlushToZeroFloat16;













    VkBool32           shaderDenormFlushToZeroFloat32;













    VkBool32           shaderDenormFlushToZeroFloat64;













    VkBool32           shaderRoundingModeRTEFloat16;













    VkBool32           shaderRoundingModeRTEFloat32;













    VkBool32           shaderRoundingModeRTEFloat64;













    VkBool32           shaderRoundingModeRTZFloat16;













    VkBool32           shaderRoundingModeRTZFloat32;













    VkBool32           shaderRoundingModeRTZFloat64;













} VkPhysicalDeviceFloatControlsPropertiesKHR;

























































#define VK_KHR_swapchain_mutable_format 1















#define VK_KHR_SWAPCHAIN_MUTABLE_FORMAT_SPEC_VERSION 1















#define VK_KHR_SWAPCHAIN_MUTABLE_FORMAT_EXTENSION_NAME "VK_KHR_swapchain_mutable_format"










@@ -7475,11 +7518,11 @@ typedef struct VkDebugUtilsMessengerCallbackDataEXT {













    int32_t                                      messageIdNumber;















    const char*                                  pMessage;















    uint32_t                                     queueLabelCount;













    VkDebugUtilsLabelEXT*                        pQueueLabels;













    const VkDebugUtilsLabelEXT*                  pQueueLabels;















    uint32_t                                     cmdBufLabelCount;













    VkDebugUtilsLabelEXT*                        pCmdBufLabels;













    const VkDebugUtilsLabelEXT*                  pCmdBufLabels;















    uint32_t                                     objectCount;













    VkDebugUtilsObjectNameInfoEXT*               pObjects;













    const VkDebugUtilsObjectNameInfoEXT*         pObjects;















} VkDebugUtilsMessengerCallbackDataEXT;































typedef VkBool32 (VKAPI_PTR *PFN_vkDebugUtilsMessengerCallbackEXT)(