Skip to content

Commit 40565cb

Browse files
mikes-lunargmikes-lunarg
committed
build: Update to header 1.4.331
1 parent 7f63266 commit 40565cb

File tree

6 files changed

+172
-4
lines changed

6 files changed

+172
-4
lines changed

‎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.330)
21+
project(Vulkan-Tools VERSION 1.4.331)
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.330"
5+
"api_version": "1.4.331"
66
}
77
}

‎icd/generated/function_declarations.h‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -457,6 +457,9 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = {
457457
{"VK_EXT_image_compression_control_swapchain", VK_EXT_IMAGE_COMPRESSION_CONTROL_SWAPCHAIN_SPEC_VERSION},
458458
{"VK_QCOM_image_processing", VK_QCOM_IMAGE_PROCESSING_SPEC_VERSION},
459459
{"VK_EXT_nested_command_buffer", VK_EXT_NESTED_COMMAND_BUFFER_SPEC_VERSION},
460+
#ifdef VK_USE_PLATFORM_OHOS
461+
{"VK_OHOS_external_memory", VK_OHOS_EXTERNAL_MEMORY_SPEC_VERSION},
462+
#endif
460463
{"VK_EXT_external_memory_acquire_unmodified", VK_EXT_EXTERNAL_MEMORY_ACQUIRE_UNMODIFIED_SPEC_VERSION},
461464
{"VK_EXT_extended_dynamic_state3", VK_EXT_EXTENDED_DYNAMIC_STATE_3_SPEC_VERSION},
462465
{"VK_EXT_subpass_merge_feedback", VK_EXT_SUBPASS_MERGE_FEEDBACK_SPEC_VERSION},
@@ -522,6 +525,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = {
522525
#ifdef VK_USE_PLATFORM_METAL_EXT
523526
{"VK_EXT_external_memory_metal", VK_EXT_EXTERNAL_MEMORY_METAL_SPEC_VERSION},
524527
#endif
528+
{"VK_ARM_performance_counters_by_region", VK_ARM_PERFORMANCE_COUNTERS_BY_REGION_SPEC_VERSION},
525529
{"VK_EXT_vertex_attribute_robustness", VK_EXT_VERTEX_ATTRIBUTE_ROBUSTNESS_SPEC_VERSION},
526530
{"VK_ARM_format_pack", VK_ARM_FORMAT_PACK_SPEC_VERSION},
527531
{"VK_VALVE_fragment_density_map_layered", VK_VALVE_FRAGMENT_DENSITY_MAP_LAYERED_SPEC_VERSION},
@@ -4004,7 +4008,18 @@ static VKAPI_ATTR void VKAPI_CALL CmdUpdatePipelineIndirectBufferNV(
40044008
static VKAPI_ATTR VkDeviceAddress VKAPI_CALL GetPipelineIndirectDeviceAddressNV(
40054009
VkDevice device,
40064010
const VkPipelineIndirectDeviceAddressInfoNV* pInfo);
4011+
#ifdef VK_USE_PLATFORM_OHOS
4012+
4013+
static VKAPI_ATTR VkResult VKAPI_CALL GetNativeBufferPropertiesOHOS(
4014+
VkDevice device,
4015+
const struct OH_NativeBuffer* buffer,
4016+
VkNativeBufferPropertiesOHOS* pProperties);
40074017

4018+
static VKAPI_ATTR VkResult VKAPI_CALL GetMemoryNativeBufferOHOS(
4019+
VkDevice device,
4020+
const VkMemoryGetNativeBufferInfoOHOS* pInfo,
4021+
struct OH_NativeBuffer** pBuffer);
4022+
#endif /* VK_USE_PLATFORM_OHOS */
40084023
static VKAPI_ATTR void VKAPI_CALL CmdSetDepthClampEnableEXT(
40094024
VkCommandBuffer commandBuffer,
40104025
VkBool32 depthClampEnable);
@@ -4535,6 +4550,13 @@ static VKAPI_ATTR VkResult VKAPI_CALL GetMemoryMetalHandlePropertiesEXT(
45354550
const void* pHandle,
45364551
VkMemoryMetalHandlePropertiesEXT* pMemoryMetalHandleProperties);
45374552
#endif /* VK_USE_PLATFORM_METAL_EXT */
4553+
static VKAPI_ATTR VkResult VKAPI_CALL EnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM(
4554+
VkPhysicalDevice physicalDevice,
4555+
uint32_t queueFamilyIndex,
4556+
uint32_t* pCounterCount,
4557+
VkPerformanceCounterARM* pCounters,
4558+
VkPerformanceCounterDescriptionARM* pCounterDescriptions);
4559+
45384560
static VKAPI_ATTR void VKAPI_CALL CmdEndRendering2EXT(
45394561
VkCommandBuffer commandBuffer,
45404562
const VkRenderingEndInfoKHR* pRenderingEndInfo);
@@ -5454,6 +5476,12 @@ static const std::unordered_map<std::string, void*> name_to_funcptr_map = {
54545476
{"vkGetPipelineIndirectMemoryRequirementsNV", (void*)GetPipelineIndirectMemoryRequirementsNV},
54555477
{"vkCmdUpdatePipelineIndirectBufferNV", (void*)CmdUpdatePipelineIndirectBufferNV},
54565478
{"vkGetPipelineIndirectDeviceAddressNV", (void*)GetPipelineIndirectDeviceAddressNV},
5479+
#ifdef VK_USE_PLATFORM_OHOS
5480+
{"vkGetNativeBufferPropertiesOHOS", (void*)GetNativeBufferPropertiesOHOS},
5481+
#endif
5482+
#ifdef VK_USE_PLATFORM_OHOS
5483+
{"vkGetMemoryNativeBufferOHOS", (void*)GetMemoryNativeBufferOHOS},
5484+
#endif
54575485
{"vkCmdSetDepthClampEnableEXT", (void*)CmdSetDepthClampEnableEXT},
54585486
{"vkCmdSetPolygonModeEXT", (void*)CmdSetPolygonModeEXT},
54595487
{"vkCmdSetRasterizationSamplesEXT", (void*)CmdSetRasterizationSamplesEXT},
@@ -5572,6 +5600,7 @@ static const std::unordered_map<std::string, void*> name_to_funcptr_map = {
55725600
#ifdef VK_USE_PLATFORM_METAL_EXT
55735601
{"vkGetMemoryMetalHandlePropertiesEXT", (void*)GetMemoryMetalHandlePropertiesEXT},
55745602
#endif
5603+
{"vkEnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM", (void*)EnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM},
55755604
{"vkCmdEndRendering2EXT", (void*)CmdEndRendering2EXT},
55765605
{"vkCreateAccelerationStructureKHR", (void*)CreateAccelerationStructureKHR},
55775606
{"vkDestroyAccelerationStructureKHR", (void*)DestroyAccelerationStructureKHR},

‎icd/generated/function_definitions.h‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5950,6 +5950,24 @@ static VKAPI_ATTR VkDeviceAddress VKAPI_CALL GetPipelineIndirectDeviceAddressNV(
59505950
//Not a CREATE or DESTROY function
59515951
return VK_SUCCESS;
59525952
}
5953+
#ifdef VK_USE_PLATFORM_OHOS
5954+
static VKAPI_ATTR VkResult VKAPI_CALL GetNativeBufferPropertiesOHOS(
5955+
VkDevice device,
5956+
const struct OH_NativeBuffer* buffer,
5957+
VkNativeBufferPropertiesOHOS* pProperties)
5958+
{
5959+
//Not a CREATE or DESTROY function
5960+
return VK_SUCCESS;
5961+
}
5962+
static VKAPI_ATTR VkResult VKAPI_CALL GetMemoryNativeBufferOHOS(
5963+
VkDevice device,
5964+
const VkMemoryGetNativeBufferInfoOHOS* pInfo,
5965+
struct OH_NativeBuffer** pBuffer)
5966+
{
5967+
//Not a CREATE or DESTROY function
5968+
return VK_SUCCESS;
5969+
}
5970+
#endif /* VK_USE_PLATFORM_OHOS */
59535971
static VKAPI_ATTR void VKAPI_CALL CmdSetDepthClampEnableEXT(
59545972
VkCommandBuffer commandBuffer,
59555973
VkBool32 depthClampEnable)
@@ -6743,6 +6761,16 @@ static VKAPI_ATTR VkResult VKAPI_CALL GetMemoryMetalHandlePropertiesEXT(
67436761
return VK_SUCCESS;
67446762
}
67456763
#endif /* VK_USE_PLATFORM_METAL_EXT */
6764+
static VKAPI_ATTR VkResult VKAPI_CALL EnumeratePhysicalDeviceQueueFamilyPerformanceCountersByRegionARM(
6765+
VkPhysicalDevice physicalDevice,
6766+
uint32_t queueFamilyIndex,
6767+
uint32_t* pCounterCount,
6768+
VkPerformanceCounterARM* pCounters,
6769+
VkPerformanceCounterDescriptionARM* pCounterDescriptions)
6770+
{
6771+
//Not a CREATE or DESTROY function
6772+
return VK_SUCCESS;
6773+
}
67466774
static VKAPI_ATTR void VKAPI_CALL CmdEndRendering2EXT(
67476775
VkCommandBuffer commandBuffer,
67486776
const VkRenderingEndInfoKHR* pRenderingEndInfo)

‎icd/generated/vk_typemap_helper.h‎

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8193,6 +8193,72 @@ template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_NESTED_COMMAND_
81938193
typedef VkPhysicalDeviceNestedCommandBufferPropertiesEXT Type;
81948194
};
81958195

8196+
#ifdef VK_USE_PLATFORM_OHOS
8197+
// Map type VkNativeBufferUsageOHOS to id VK_STRUCTURE_TYPE_NATIVE_BUFFER_USAGE_OHOS
8198+
template <> struct LvlTypeMap<VkNativeBufferUsageOHOS> {
8199+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_NATIVE_BUFFER_USAGE_OHOS;
8200+
};
8201+
8202+
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_NATIVE_BUFFER_USAGE_OHOS> {
8203+
typedef VkNativeBufferUsageOHOS Type;
8204+
};
8205+
8206+
#endif // VK_USE_PLATFORM_OHOS
8207+
#ifdef VK_USE_PLATFORM_OHOS
8208+
// Map type VkNativeBufferPropertiesOHOS to id VK_STRUCTURE_TYPE_NATIVE_BUFFER_PROPERTIES_OHOS
8209+
template <> struct LvlTypeMap<VkNativeBufferPropertiesOHOS> {
8210+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_NATIVE_BUFFER_PROPERTIES_OHOS;
8211+
};
8212+
8213+
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_NATIVE_BUFFER_PROPERTIES_OHOS> {
8214+
typedef VkNativeBufferPropertiesOHOS Type;
8215+
};
8216+
8217+
#endif // VK_USE_PLATFORM_OHOS
8218+
#ifdef VK_USE_PLATFORM_OHOS
8219+
// Map type VkNativeBufferFormatPropertiesOHOS to id VK_STRUCTURE_TYPE_NATIVE_BUFFER_FORMAT_PROPERTIES_OHOS
8220+
template <> struct LvlTypeMap<VkNativeBufferFormatPropertiesOHOS> {
8221+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_NATIVE_BUFFER_FORMAT_PROPERTIES_OHOS;
8222+
};
8223+
8224+
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_NATIVE_BUFFER_FORMAT_PROPERTIES_OHOS> {
8225+
typedef VkNativeBufferFormatPropertiesOHOS Type;
8226+
};
8227+
8228+
#endif // VK_USE_PLATFORM_OHOS
8229+
#ifdef VK_USE_PLATFORM_OHOS
8230+
// Map type VkImportNativeBufferInfoOHOS to id VK_STRUCTURE_TYPE_IMPORT_NATIVE_BUFFER_INFO_OHOS
8231+
template <> struct LvlTypeMap<VkImportNativeBufferInfoOHOS> {
8232+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_IMPORT_NATIVE_BUFFER_INFO_OHOS;
8233+
};
8234+
8235+
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_IMPORT_NATIVE_BUFFER_INFO_OHOS> {
8236+
typedef VkImportNativeBufferInfoOHOS Type;
8237+
};
8238+
8239+
#endif // VK_USE_PLATFORM_OHOS
8240+
#ifdef VK_USE_PLATFORM_OHOS
8241+
// Map type VkMemoryGetNativeBufferInfoOHOS to id VK_STRUCTURE_TYPE_MEMORY_GET_NATIVE_BUFFER_INFO_OHOS
8242+
template <> struct LvlTypeMap<VkMemoryGetNativeBufferInfoOHOS> {
8243+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_MEMORY_GET_NATIVE_BUFFER_INFO_OHOS;
8244+
};
8245+
8246+
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_MEMORY_GET_NATIVE_BUFFER_INFO_OHOS> {
8247+
typedef VkMemoryGetNativeBufferInfoOHOS Type;
8248+
};
8249+
8250+
#endif // VK_USE_PLATFORM_OHOS
8251+
#ifdef VK_USE_PLATFORM_OHOS
8252+
// Map type VkExternalFormatOHOS to id VK_STRUCTURE_TYPE_EXTERNAL_FORMAT_OHOS
8253+
template <> struct LvlTypeMap<VkExternalFormatOHOS> {
8254+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_EXTERNAL_FORMAT_OHOS;
8255+
};
8256+
8257+
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_EXTERNAL_FORMAT_OHOS> {
8258+
typedef VkExternalFormatOHOS Type;
8259+
};
8260+
8261+
#endif // VK_USE_PLATFORM_OHOS
81968262
// Map type VkExternalMemoryAcquireUnmodifiedEXT to id VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_ACQUIRE_UNMODIFIED_EXT
81978263
template <> struct LvlTypeMap<VkExternalMemoryAcquireUnmodifiedEXT> {
81988264
static const VkStructureType kSType = VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_ACQUIRE_UNMODIFIED_EXT;
@@ -9937,6 +10003,51 @@ template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_MEMORY_GET_METAL_HANDLE_INFO_EX
993710003
};
993810004

993910005
#endif // VK_USE_PLATFORM_METAL_EXT
10006+
// Map type VkPhysicalDevicePerformanceCountersByRegionFeaturesARM to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PERFORMANCE_COUNTERS_BY_REGION_FEATURES_ARM
10007+
template <> struct LvlTypeMap<VkPhysicalDevicePerformanceCountersByRegionFeaturesARM> {
10008+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PERFORMANCE_COUNTERS_BY_REGION_FEATURES_ARM;
10009+
};
10010+
10011+
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PERFORMANCE_COUNTERS_BY_REGION_FEATURES_ARM> {
10012+
typedef VkPhysicalDevicePerformanceCountersByRegionFeaturesARM Type;
10013+
};
10014+
10015+
// Map type VkPhysicalDevicePerformanceCountersByRegionPropertiesARM to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PERFORMANCE_COUNTERS_BY_REGION_PROPERTIES_ARM
10016+
template <> struct LvlTypeMap<VkPhysicalDevicePerformanceCountersByRegionPropertiesARM> {
10017+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PERFORMANCE_COUNTERS_BY_REGION_PROPERTIES_ARM;
10018+
};
10019+
10020+
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PERFORMANCE_COUNTERS_BY_REGION_PROPERTIES_ARM> {
10021+
typedef VkPhysicalDevicePerformanceCountersByRegionPropertiesARM Type;
10022+
};
10023+
10024+
// Map type VkPerformanceCounterARM to id VK_STRUCTURE_TYPE_PERFORMANCE_COUNTER_ARM
10025+
template <> struct LvlTypeMap<VkPerformanceCounterARM> {
10026+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PERFORMANCE_COUNTER_ARM;
10027+
};
10028+
10029+
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PERFORMANCE_COUNTER_ARM> {
10030+
typedef VkPerformanceCounterARM Type;
10031+
};
10032+
10033+
// Map type VkPerformanceCounterDescriptionARM to id VK_STRUCTURE_TYPE_PERFORMANCE_COUNTER_DESCRIPTION_ARM
10034+
template <> struct LvlTypeMap<VkPerformanceCounterDescriptionARM> {
10035+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PERFORMANCE_COUNTER_DESCRIPTION_ARM;
10036+
};
10037+
10038+
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PERFORMANCE_COUNTER_DESCRIPTION_ARM> {
10039+
typedef VkPerformanceCounterDescriptionARM Type;
10040+
};
10041+
10042+
// Map type VkRenderPassPerformanceCountersByRegionBeginInfoARM to id VK_STRUCTURE_TYPE_RENDER_PASS_PERFORMANCE_COUNTERS_BY_REGION_BEGIN_INFO_ARM
10043+
template <> struct LvlTypeMap<VkRenderPassPerformanceCountersByRegionBeginInfoARM> {
10044+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_RENDER_PASS_PERFORMANCE_COUNTERS_BY_REGION_BEGIN_INFO_ARM;
10045+
};
10046+
10047+
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_RENDER_PASS_PERFORMANCE_COUNTERS_BY_REGION_BEGIN_INFO_ARM> {
10048+
typedef VkRenderPassPerformanceCountersByRegionBeginInfoARM Type;
10049+
};
10050+
994010051
// Map type VkPhysicalDeviceVertexAttributeRobustnessFeaturesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_ROBUSTNESS_FEATURES_EXT
994110052
template <> struct LvlTypeMap<VkPhysicalDeviceVertexAttributeRobustnessFeaturesEXT> {
994210053
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_ROBUSTNESS_FEATURES_EXT;

‎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.330"
10+
"commit": "v1.4.331"
1111
},
1212
{
1313
"name": "MoltenVK",
@@ -56,7 +56,7 @@
5656
"cmake_options": [
5757
"-DLOADER_USE_UNSAFE_FILE_SEARCH=ON"
5858
],
59-
"commit": "v1.4.330",
59+
"commit": "v1.4.331",
6060
"build_platforms": [
6161
"windows",
6262
"linux",

0 commit comments

Comments
 (0)