Skip to content

Commit ba211ea

Browse files
committed
build: Update to header 1.4.343
1 parent 362c28b commit ba211ea

7 files changed

Lines changed: 55 additions & 5 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
cmake_minimum_required(VERSION 3.22.1)
1919

2020
# The VERSION field is generated with the "--generated-version" flag in the generate_source.py script
21-
project(Vulkan-Tools VERSION 1.4.342)
21+
project(Vulkan-Tools VERSION 1.4.343)
2222

2323
# This variable enables downstream users to customize the target API
2424
# variant (e.g. Vulkan SC)

icd/VkICD_mock_icd.json.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"file_format_version": "1.0.1",
33
"ICD": {
44
"library_path": "@JSON_LIBRARY_PATH@",
5-
"api_version": "1.4.342"
5+
"api_version": "1.4.343"
66
}
77
}

icd/generated/function_declarations.h

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,9 @@ static const std::unordered_map<std::string, uint32_t> instance_extension_map =
101101
#ifdef VK_USE_PLATFORM_OHOS
102102
{"VK_OHOS_surface", VK_OHOS_SURFACE_SPEC_VERSION},
103103
#endif
104+
#ifdef VK_USE_PLATFORM_UBM_SEC
105+
{"VK_SEC_ubm_surface", VK_SEC_UBM_SURFACE_SPEC_VERSION},
106+
#endif
104107
};
105108
// Map of device extension name to version
106109
static const std::unordered_map<std::string, uint32_t> device_extension_map = {
@@ -2960,7 +2963,15 @@ static VKAPI_ATTR void VKAPI_CALL CmdBeginCustomResolveEXT(VkCommandBuffer comma
29602963

29612964
static VKAPI_ATTR void VKAPI_CALL CmdSetComputeOccupancyPriorityNV(VkCommandBuffer commandBuffer,
29622965
const VkComputeOccupancyPriorityParametersNV* pParameters);
2966+
#ifdef VK_USE_PLATFORM_UBM_SEC
2967+
2968+
static VKAPI_ATTR VkResult VKAPI_CALL CreateUbmSurfaceSEC(VkInstance instance, const VkUbmSurfaceCreateInfoSEC* pCreateInfo,
2969+
const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);
29632970

2971+
static VKAPI_ATTR VkBool32 VKAPI_CALL GetPhysicalDeviceUbmPresentationSupportSEC(VkPhysicalDevice physicalDevice,
2972+
uint32_t queueFamilyIndex,
2973+
struct ubm_device* ubm_device);
2974+
#endif /* VK_USE_PLATFORM_UBM_SEC */
29642975
static VKAPI_ATTR VkResult VKAPI_CALL CreateAccelerationStructureKHR(VkDevice device,
29652976
const VkAccelerationStructureCreateInfoKHR* pCreateInfo,
29662977
const VkAllocationCallbacks* pAllocator,
@@ -3955,6 +3966,12 @@ static const std::unordered_map<std::string, void*> name_to_funcptr_map = {
39553966
{"vkCmdEndRendering2EXT", (void*)CmdEndRendering2EXT},
39563967
{"vkCmdBeginCustomResolveEXT", (void*)CmdBeginCustomResolveEXT},
39573968
{"vkCmdSetComputeOccupancyPriorityNV", (void*)CmdSetComputeOccupancyPriorityNV},
3969+
#ifdef VK_USE_PLATFORM_UBM_SEC
3970+
{"vkCreateUbmSurfaceSEC", (void*)CreateUbmSurfaceSEC},
3971+
#endif
3972+
#ifdef VK_USE_PLATFORM_UBM_SEC
3973+
{"vkGetPhysicalDeviceUbmPresentationSupportSEC", (void*)GetPhysicalDeviceUbmPresentationSupportSEC},
3974+
#endif
39583975
{"vkCreateAccelerationStructureKHR", (void*)CreateAccelerationStructureKHR},
39593976
{"vkDestroyAccelerationStructureKHR", (void*)DestroyAccelerationStructureKHR},
39603977
{"vkCmdBuildAccelerationStructuresKHR", (void*)CmdBuildAccelerationStructuresKHR},

icd/generated/function_definitions.h

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4456,6 +4456,20 @@ static VKAPI_ATTR void VKAPI_CALL CmdSetComputeOccupancyPriorityNV(VkCommandBuff
44564456
const VkComputeOccupancyPriorityParametersNV* pParameters) {
44574457
// Not a CREATE or DESTROY function
44584458
}
4459+
#ifdef VK_USE_PLATFORM_UBM_SEC
4460+
static VKAPI_ATTR VkResult VKAPI_CALL CreateUbmSurfaceSEC(VkInstance instance, const VkUbmSurfaceCreateInfoSEC* pCreateInfo,
4461+
const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface) {
4462+
unique_lock_t lock(global_lock);
4463+
*pSurface = (VkSurfaceKHR)global_unique_handle++;
4464+
return VK_SUCCESS;
4465+
}
4466+
static VKAPI_ATTR VkBool32 VKAPI_CALL GetPhysicalDeviceUbmPresentationSupportSEC(VkPhysicalDevice physicalDevice,
4467+
uint32_t queueFamilyIndex,
4468+
struct ubm_device* ubm_device) {
4469+
// Not a CREATE or DESTROY function
4470+
return VK_SUCCESS;
4471+
}
4472+
#endif /* VK_USE_PLATFORM_UBM_SEC */
44594473
static VKAPI_ATTR VkResult VKAPI_CALL CreateAccelerationStructureKHR(VkDevice device,
44604474
const VkAccelerationStructureCreateInfoKHR* pCreateInfo,
44614475
const VkAllocationCallbacks* pAllocator,

icd/generated/vk_typemap_helper.h

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13012,6 +13012,19 @@ struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_PARTITIONED
1301213012
typedef VkPhysicalDeviceShaderSubgroupPartitionedFeaturesEXT Type;
1301313013
};
1301413014

13015+
#ifdef VK_USE_PLATFORM_UBM_SEC
13016+
// Map type VkUbmSurfaceCreateInfoSEC to id VK_STRUCTURE_TYPE_UBM_SURFACE_CREATE_INFO_SEC
13017+
template <>
13018+
struct LvlTypeMap<VkUbmSurfaceCreateInfoSEC> {
13019+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_UBM_SURFACE_CREATE_INFO_SEC;
13020+
};
13021+
13022+
template <>
13023+
struct LvlSTypeMap<VK_STRUCTURE_TYPE_UBM_SURFACE_CREATE_INFO_SEC> {
13024+
typedef VkUbmSurfaceCreateInfoSEC Type;
13025+
};
13026+
13027+
#endif // VK_USE_PLATFORM_UBM_SEC
1301513028
// Map type VkAccelerationStructureGeometryTrianglesDataKHR to id
1301613029
// VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_GEOMETRY_TRIANGLES_DATA_KHR
1301713030
template <>

scripts/known_good.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"sub_dir": "Vulkan-Headers",
88
"build_dir": "Vulkan-Headers/build",
99
"install_dir": "Vulkan-Headers/build/install",
10-
"commit": "v1.4.342"
10+
"commit": "v1.4.343"
1111
},
1212
{
1313
"name": "MoltenVK",
@@ -56,7 +56,7 @@
5656
"cmake_options": [
5757
"-DLOADER_USE_UNSAFE_FILE_SEARCH=ON"
5858
],
59-
"commit": "v1.4.342",
59+
"commit": "v1.4.343",
6060
"build_platforms": [
6161
"windows",
6262
"linux",

vulkaninfo/generated/vulkaninfo.hpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1750,6 +1750,12 @@ std::string VkFormatString(VkFormat value) {
17501750
return "FORMAT_ASTC_6x6x6_SFLOAT_BLOCK_EXT";
17511751
case (VK_FORMAT_R8_BOOL_ARM):
17521752
return "FORMAT_R8_BOOL_ARM";
1753+
case (VK_FORMAT_R16_SFLOAT_FPENCODING_BFLOAT16_ARM):
1754+
return "FORMAT_R16_SFLOAT_FPENCODING_BFLOAT16_ARM";
1755+
case (VK_FORMAT_R8_SFLOAT_FPENCODING_FLOAT8E4M3_ARM):
1756+
return "FORMAT_R8_SFLOAT_FPENCODING_FLOAT8E4M3_ARM";
1757+
case (VK_FORMAT_R8_SFLOAT_FPENCODING_FLOAT8E5M2_ARM):
1758+
return "FORMAT_R8_SFLOAT_FPENCODING_FLOAT8E5M2_ARM";
17531759
case (VK_FORMAT_R16G16_SFIXED5_NV):
17541760
return "FORMAT_R16G16_SFIXED5_NV";
17551761
case (VK_FORMAT_R10X6_UINT_PACK16_ARM):
@@ -12302,7 +12308,7 @@ auto format_ranges = std::array{
1230212308
FormatRange{0, VK_IMG_FORMAT_PVRTC_EXTENSION_NAME, static_cast<VkFormat>(1000054000), static_cast<VkFormat>(1000054007)},
1230312309
FormatRange{0, VK_EXT_TEXTURE_COMPRESSION_ASTC_3D_EXTENSION_NAME, static_cast<VkFormat>(1000288000),
1230412310
static_cast<VkFormat>(1000288029)},
12305-
FormatRange{0, VK_ARM_TENSORS_EXTENSION_NAME, static_cast<VkFormat>(1000460000), static_cast<VkFormat>(1000460000)},
12311+
FormatRange{0, VK_ARM_TENSORS_EXTENSION_NAME, static_cast<VkFormat>(1000460000), static_cast<VkFormat>(1000460003)},
1230612312
FormatRange{0, VK_NV_OPTICAL_FLOW_EXTENSION_NAME, static_cast<VkFormat>(1000464000), static_cast<VkFormat>(1000464000)},
1230712313
FormatRange{0, VK_ARM_FORMAT_PACK_EXTENSION_NAME, static_cast<VkFormat>(1000609000), static_cast<VkFormat>(1000609013)},
1230812314
};

0 commit comments

Comments
 (0)