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

Commit 9943197b authored by Jesse Hall's avatar Jesse Hall
Browse files

vulkan: update Vulkan headers to 1.0.41 

Includes some header reordering in generated code due to a new version
of clang-format.

Test: mmm frameworks/native/vulkan
Merged-In: I40372758fb7214a627ab686d8a3de6bf9beae205
Change-Id: Iaf9548776d3462fcd9bcc236be6966ecce265565
parent 08e2f482

vulkan/api/vulkan.api

+3 −21
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 39

define VERSION_PATCH 41



// API limits

define VK_MAX_PHYSICAL_DEVICE_NAME_SIZE 256
@@ -90,7 +90,7 @@ define NULL_HANDLE 0 
@extension("VK_ANDROID_native_buffer") define VK_ANDROID_NATIVE_BUFFER_NAME             "VK_ANDROID_native_buffer"



// 12

@extension("VK_EXT_debug_report") define VK_EXT_DEBUG_REPORT_SPEC_VERSION       4

@extension("VK_EXT_debug_report") define VK_EXT_DEBUG_REPORT_SPEC_VERSION       5

@extension("VK_EXT_debug_report") define VK_EXT_DEBUG_REPORT_NAME               "VK_EXT_debug_report"



// 13
@@ -118,7 +118,7 @@ define NULL_HANDLE 0 
@extension("VK_AMD_shader_explicit_vertex_parameter") define VK_AMD_SHADER_EXPLICIT_VERTEX_PARAMETER_EXTENSION_NAME "VK_AMD_shader_explicit_vertex_parameter"



// 23

@extension("VK_EXT_debug_marker") define VK_EXT_DEBUG_MARKER_SPEC_VERSION       3

@extension("VK_EXT_debug_marker") define VK_EXT_DEBUG_MARKER_SPEC_VERSION       4

@extension("VK_EXT_debug_marker") define VK_EXT_DEBUG_MARKER_NAME               "VK_EXT_debug_marker"



// 26
@@ -213,10 +213,6 @@ 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"



// 105

@extension("VK_EXT_swapchain_colorspace") define VK_EXT_SWAPCHAIN_COLORSPACE_SPEC_VERSION 1

@extension("VK_EXT_swapchain_colorspace") define VK_EXT_SWAPCHAIN_COLORSPACE_COUNTER_EXTENSION_NAME "VK_EXT_swapchain_colorspace"



/////////////

//  Types  //

/////////////
@@ -947,20 +943,6 @@ enum VkPresentModeKHR { 
@extension("VK_KHR_surface")

enum VkColorSpaceKHR {

    VK_COLORSPACE_SRGB_NONLINEAR_KHR                        = 0x00000000,



    //@extension("VK_EXT_swapchain_colorspace")

    VK_COLOR_SPACE_DISPLAY_P3_LINEAR_EXT                    = 1000104001,

    VK_COLOR_SPACE_DISPLAY_P3_NONLINEAR_EXT                 = 1000104002,

    VK_COLOR_SPACE_SCRGB_LINEAR_EXT                         = 1000104003,

    VK_COLOR_SPACE_SCRGB_NONLINEAR_EXT                      = 1000104004,

    VK_COLOR_SPACE_DCI_P3_LINEAR_EXT                        = 1000104005,

    VK_COLOR_SPACE_DCI_P3_NONLINEAR_EXT                     = 1000104006,

    VK_COLOR_SPACE_BT709_LINEAR_EXT                         = 1000104007,

    VK_COLOR_SPACE_BT709_NONLINEAR_EXT                      = 1000104008,

    VK_COLOR_SPACE_BT2020_LINEAR_EXT                        = 1000104009,

    VK_COLOR_SPACE_BT2020_NONLINEAR_EXT                     = 1000104010,

    VK_COLOR_SPACE_ADOBERGB_LINEAR_EXT                      = 1000104011,

    VK_COLOR_SPACE_ADOBERGB_NONLINEAR_EXT                   = 1000104012,

}



@extension("VK_EXT_debug_report")

vulkan/include/vulkan/vulkan.h

+3 −20
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 39

#define VK_HEADER_VERSION 41





#define VK_NULL_HANDLE 0
@@ -3225,18 +3225,6 @@ VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkSurfaceKHR) 


typedef enum VkColorSpaceKHR {

    VK_COLOR_SPACE_SRGB_NONLINEAR_KHR = 0,

    VK_COLOR_SPACE_DISPLAY_P3_LINEAR_EXT = 1000104001,

    VK_COLOR_SPACE_DISPLAY_P3_NONLINEAR_EXT = 1000104002,

    VK_COLOR_SPACE_SCRGB_LINEAR_EXT = 1000104003,

    VK_COLOR_SPACE_SCRGB_NONLINEAR_EXT = 1000104004,

    VK_COLOR_SPACE_DCI_P3_LINEAR_EXT = 1000104005,

    VK_COLOR_SPACE_DCI_P3_NONLINEAR_EXT = 1000104006,

    VK_COLOR_SPACE_BT709_LINEAR_EXT = 1000104007,

    VK_COLOR_SPACE_BT709_NONLINEAR_EXT = 1000104008,

    VK_COLOR_SPACE_BT2020_LINEAR_EXT = 1000104009,

    VK_COLOR_SPACE_BT2020_NONLINEAR_EXT = 1000104010,

    VK_COLOR_SPACE_ADOBERGB_LINEAR_EXT = 1000104011,

    VK_COLOR_SPACE_ADOBERGB_NONLINEAR_EXT = 1000104012,

    VK_COLOR_SPACE_BEGIN_RANGE_KHR = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR,

    VK_COLOR_SPACE_END_RANGE_KHR = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR,

    VK_COLOR_SPACE_RANGE_SIZE_KHR = (VK_COLOR_SPACE_SRGB_NONLINEAR_KHR - VK_COLOR_SPACE_SRGB_NONLINEAR_KHR + 1),
@@ -3905,7 +3893,7 @@ VKAPI_ATTR void VKAPI_CALL vkTrimCommandPoolKHR( 
#define VK_EXT_debug_report 1

VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDebugReportCallbackEXT)



#define VK_EXT_DEBUG_REPORT_SPEC_VERSION  4

#define VK_EXT_DEBUG_REPORT_SPEC_VERSION  5

#define VK_EXT_DEBUG_REPORT_EXTENSION_NAME "VK_EXT_debug_report"

#define VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT
@@ -4060,7 +4048,7 @@ typedef struct VkPipelineRasterizationStateRasterizationOrderAMD { 




#define VK_EXT_debug_marker 1

#define VK_EXT_DEBUG_MARKER_SPEC_VERSION  3

#define VK_EXT_DEBUG_MARKER_SPEC_VERSION  4

#define VK_EXT_DEBUG_MARKER_EXTENSION_NAME "VK_EXT_debug_marker"



typedef struct VkDebugMarkerObjectNameInfoEXT {
@@ -4751,11 +4739,6 @@ VKAPI_ATTR VkResult VKAPI_CALL vkGetSwapchainCounterEXT( 
    uint64_t*                                   pCounterValue);

#endif



#define VK_EXT_swapchain_colorspace 1

#define VK_SWAPCHAIN_COLOR_SPACE_SPEC_VERSION 1

#define VK_SWAPCHAIN_COLOR_SPACE_EXTENSION_NAME "VK_EXT_swapchain_colorspace"





#ifdef __cplusplus

}

#endif

vulkan/libvulkan/api_gen.h

+1 −1
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 
#ifndef LIBVULKAN_API_GEN_H

#define LIBVULKAN_API_GEN_H



#include <bitset>

#include <vulkan/vulkan.h>

#include <bitset>

#include "driver_gen.h"



namespace vulkan {

vulkan/libvulkan/driver_gen.h

+2 −2
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ 
#ifndef LIBVULKAN_DRIVER_GEN_H

#define LIBVULKAN_DRIVER_GEN_H



#include <bitset>

#include <vulkan/vulkan.h>

#include <vulkan/vk_android_native_buffer.h>

#include <vulkan/vulkan.h>

#include <bitset>



namespace vulkan {

namespace driver {

vulkan/nulldrv/null_driver_gen.cpp

+1 −1
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 


// WARNING: This file is generated. See ../README.md for instructions.



#include "null_driver_gen.h"

#include <algorithm>

#include "null_driver_gen.h"



using namespace null_driver;