Skip to content

Commit 307cb05

Browse files
mikes-lunargmikes-lunarg
committed
build: Update to header 1.4.337
1 parent 61c4e74 commit 307cb05

File tree

7 files changed

+154
-81
lines changed

7 files changed

+154
-81
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.336)
21+
project(Vulkan-Tools VERSION 1.4.337)
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.336"
5+
"api_version": "1.4.337"
66
}
77
}

‎icd/generated/function_declarations.h‎

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = {
371371
{"VK_EXT_device_memory_report", VK_EXT_DEVICE_MEMORY_REPORT_SPEC_VERSION},
372372
{"VK_EXT_robustness2", VK_EXT_ROBUSTNESS_2_SPEC_VERSION},
373373
{"VK_EXT_custom_border_color", VK_EXT_CUSTOM_BORDER_COLOR_SPEC_VERSION},
374+
{"VK_EXT_texture_compression_astc_3d", VK_EXT_TEXTURE_COMPRESSION_ASTC_3D_SPEC_VERSION},
374375
{"VK_GOOGLE_user_type", VK_GOOGLE_USER_TYPE_SPEC_VERSION},
375376
{"VK_NV_present_barrier", VK_NV_PRESENT_BARRIER_SPEC_VERSION},
376377
{"VK_EXT_private_data", VK_EXT_PRIVATE_DATA_SPEC_VERSION},
@@ -518,9 +519,6 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = {
518519
{"VK_MESA_image_alignment_control", VK_MESA_IMAGE_ALIGNMENT_CONTROL_SPEC_VERSION},
519520
{"VK_EXT_ray_tracing_invocation_reorder", VK_EXT_RAY_TRACING_INVOCATION_REORDER_SPEC_VERSION},
520521
{"VK_EXT_depth_clamp_control", VK_EXT_DEPTH_CLAMP_CONTROL_SPEC_VERSION},
521-
#ifdef VK_USE_PLATFORM_OHOS
522-
{"VK_OHOS_native_buffer", VK_OHOS_NATIVE_BUFFER_SPEC_VERSION},
523-
#endif
524522
{"VK_HUAWEI_hdr_vivid", VK_HUAWEI_HDR_VIVID_SPEC_VERSION},
525523
{"VK_NV_cooperative_matrix2", VK_NV_COOPERATIVE_MATRIX_2_SPEC_VERSION},
526524
{"VK_ARM_pipeline_opacity_micromap", VK_ARM_PIPELINE_OPACITY_MICROMAP_SPEC_VERSION},
@@ -539,6 +537,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = {
539537
{"VK_EXT_shader_64bit_indexing", VK_EXT_SHADER_64BIT_INDEXING_SPEC_VERSION},
540538
{"VK_EXT_custom_resolve", VK_EXT_CUSTOM_RESOLVE_SPEC_VERSION},
541539
{"VK_QCOM_data_graph_model", VK_QCOM_DATA_GRAPH_MODEL_SPEC_VERSION},
540+
{"VK_EXT_shader_long_vector", VK_EXT_SHADER_LONG_VECTOR_SPEC_VERSION},
542541
{"VK_SEC_pipeline_cache_incremental_mode", VK_SEC_PIPELINE_CACHE_INCREMENTAL_MODE_SPEC_VERSION},
543542
{"VK_EXT_shader_uniform_buffer_unsized_array", VK_EXT_SHADER_UNIFORM_BUFFER_UNSIZED_ARRAY_SPEC_VERSION},
544543
{"VK_NV_compute_occupancy_priority", VK_NV_COMPUTE_OCCUPANCY_PRIORITY_SPEC_VERSION},
@@ -2899,16 +2898,6 @@ static VKAPI_ATTR void VKAPI_CALL UpdateIndirectExecutionSetShaderEXT(
28992898

29002899
static VKAPI_ATTR VkResult VKAPI_CALL CreateSurfaceOHOS(VkInstance instance, const VkSurfaceCreateInfoOHOS* pCreateInfo,
29012900
const VkAllocationCallbacks* pAllocator, VkSurfaceKHR* pSurface);
2902-
2903-
static VKAPI_ATTR VkResult VKAPI_CALL GetSwapchainGrallocUsageOHOS(VkDevice device, VkFormat format, VkImageUsageFlags imageUsage,
2904-
uint64_t* grallocUsage);
2905-
2906-
static VKAPI_ATTR VkResult VKAPI_CALL AcquireImageOHOS(VkDevice device, VkImage image, int32_t nativeFenceFd, VkSemaphore semaphore,
2907-
VkFence fence);
2908-
2909-
static VKAPI_ATTR VkResult VKAPI_CALL QueueSignalReleaseImageOHOS(VkQueue queue, uint32_t waitSemaphoreCount,
2910-
const VkSemaphore* pWaitSemaphores, VkImage image,
2911-
int32_t* pNativeFenceFd);
29122901
#endif /* VK_USE_PLATFORM_OHOS */
29132902
static VKAPI_ATTR VkResult VKAPI_CALL GetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV(
29142903
VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkCooperativeMatrixFlexibleDimensionsPropertiesNV* pProperties);
@@ -3904,15 +3893,6 @@ static const std::unordered_map<std::string, void*> name_to_funcptr_map = {
39043893
{"vkUpdateIndirectExecutionSetShaderEXT", (void*)UpdateIndirectExecutionSetShaderEXT},
39053894
#ifdef VK_USE_PLATFORM_OHOS
39063895
{"vkCreateSurfaceOHOS", (void*)CreateSurfaceOHOS},
3907-
#endif
3908-
#ifdef VK_USE_PLATFORM_OHOS
3909-
{"vkGetSwapchainGrallocUsageOHOS", (void*)GetSwapchainGrallocUsageOHOS},
3910-
#endif
3911-
#ifdef VK_USE_PLATFORM_OHOS
3912-
{"vkAcquireImageOHOS", (void*)AcquireImageOHOS},
3913-
#endif
3914-
#ifdef VK_USE_PLATFORM_OHOS
3915-
{"vkQueueSignalReleaseImageOHOS", (void*)QueueSignalReleaseImageOHOS},
39163896
#endif
39173897
{"vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV",
39183898
(void*)GetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV},

‎icd/generated/function_definitions.h‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4368,22 +4368,6 @@ static VKAPI_ATTR VkResult VKAPI_CALL CreateSurfaceOHOS(VkInstance instance, con
43684368
*pSurface = (VkSurfaceKHR)global_unique_handle++;
43694369
return VK_SUCCESS;
43704370
}
4371-
static VKAPI_ATTR VkResult VKAPI_CALL GetSwapchainGrallocUsageOHOS(VkDevice device, VkFormat format, VkImageUsageFlags imageUsage,
4372-
uint64_t* grallocUsage) {
4373-
// Not a CREATE or DESTROY function
4374-
return VK_SUCCESS;
4375-
}
4376-
static VKAPI_ATTR VkResult VKAPI_CALL AcquireImageOHOS(VkDevice device, VkImage image, int32_t nativeFenceFd, VkSemaphore semaphore,
4377-
VkFence fence) {
4378-
// Not a CREATE or DESTROY function
4379-
return VK_SUCCESS;
4380-
}
4381-
static VKAPI_ATTR VkResult VKAPI_CALL QueueSignalReleaseImageOHOS(VkQueue queue, uint32_t waitSemaphoreCount,
4382-
const VkSemaphore* pWaitSemaphores, VkImage image,
4383-
int32_t* pNativeFenceFd) {
4384-
// Not a CREATE or DESTROY function
4385-
return VK_SUCCESS;
4386-
}
43874371
#endif /* VK_USE_PLATFORM_OHOS */
43884372
static VKAPI_ATTR VkResult VKAPI_CALL GetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV(
43894373
VkPhysicalDevice physicalDevice, uint32_t* pPropertyCount, VkCooperativeMatrixFlexibleDimensionsPropertiesNV* pProperties) {

‎icd/generated/vk_typemap_helper.h‎

Lines changed: 34 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -8176,6 +8176,18 @@ struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUSTOM_BORDER_COLOR_FEATURE
81768176
typedef VkPhysicalDeviceCustomBorderColorFeaturesEXT Type;
81778177
};
81788178

8179+
// Map type VkPhysicalDeviceTextureCompressionASTC3DFeaturesEXT to id
8180+
// VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_3D_FEATURES_EXT
8181+
template <>
8182+
struct LvlTypeMap<VkPhysicalDeviceTextureCompressionASTC3DFeaturesEXT> {
8183+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_3D_FEATURES_EXT;
8184+
};
8185+
8186+
template <>
8187+
struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TEXTURE_COMPRESSION_ASTC_3D_FEATURES_EXT> {
8188+
typedef VkPhysicalDeviceTextureCompressionASTC3DFeaturesEXT Type;
8189+
};
8190+
81798191
// Map type VkPhysicalDevicePresentBarrierFeaturesNV to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_BARRIER_FEATURES_NV
81808192
template <>
81818193
struct LvlTypeMap<VkPhysicalDevicePresentBarrierFeaturesNV> {
@@ -12364,45 +12376,6 @@ struct LvlSTypeMap<VK_STRUCTURE_TYPE_SURFACE_CREATE_INFO_OHOS> {
1236412376
typedef VkSurfaceCreateInfoOHOS Type;
1236512377
};
1236612378

12367-
#endif // VK_USE_PLATFORM_OHOS
12368-
#ifdef VK_USE_PLATFORM_OHOS
12369-
// Map type VkNativeBufferOHOS to id VK_STRUCTURE_TYPE_NATIVE_BUFFER_OHOS
12370-
template <>
12371-
struct LvlTypeMap<VkNativeBufferOHOS> {
12372-
static const VkStructureType kSType = VK_STRUCTURE_TYPE_NATIVE_BUFFER_OHOS;
12373-
};
12374-
12375-
template <>
12376-
struct LvlSTypeMap<VK_STRUCTURE_TYPE_NATIVE_BUFFER_OHOS> {
12377-
typedef VkNativeBufferOHOS Type;
12378-
};
12379-
12380-
#endif // VK_USE_PLATFORM_OHOS
12381-
#ifdef VK_USE_PLATFORM_OHOS
12382-
// Map type VkSwapchainImageCreateInfoOHOS to id VK_STRUCTURE_TYPE_SWAPCHAIN_IMAGE_CREATE_INFO_OHOS
12383-
template <>
12384-
struct LvlTypeMap<VkSwapchainImageCreateInfoOHOS> {
12385-
static const VkStructureType kSType = VK_STRUCTURE_TYPE_SWAPCHAIN_IMAGE_CREATE_INFO_OHOS;
12386-
};
12387-
12388-
template <>
12389-
struct LvlSTypeMap<VK_STRUCTURE_TYPE_SWAPCHAIN_IMAGE_CREATE_INFO_OHOS> {
12390-
typedef VkSwapchainImageCreateInfoOHOS Type;
12391-
};
12392-
12393-
#endif // VK_USE_PLATFORM_OHOS
12394-
#ifdef VK_USE_PLATFORM_OHOS
12395-
// Map type VkPhysicalDevicePresentationPropertiesOHOS to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENTATION_PROPERTIES_OHOS
12396-
template <>
12397-
struct LvlTypeMap<VkPhysicalDevicePresentationPropertiesOHOS> {
12398-
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENTATION_PROPERTIES_OHOS;
12399-
};
12400-
12401-
template <>
12402-
struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENTATION_PROPERTIES_OHOS> {
12403-
typedef VkPhysicalDevicePresentationPropertiesOHOS Type;
12404-
};
12405-
1240612379
#endif // VK_USE_PLATFORM_OHOS
1240712380
// Map type VkPhysicalDeviceHdrVividFeaturesHUAWEI to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_HDR_VIVID_FEATURES_HUAWEI
1240812381
template <>
@@ -12734,6 +12707,28 @@ struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DATA_GRAPH_MODEL_FEATURES_Q
1273412707
typedef VkPhysicalDeviceDataGraphModelFeaturesQCOM Type;
1273512708
};
1273612709

12710+
// Map type VkPhysicalDeviceShaderLongVectorFeaturesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_LONG_VECTOR_FEATURES_EXT
12711+
template <>
12712+
struct LvlTypeMap<VkPhysicalDeviceShaderLongVectorFeaturesEXT> {
12713+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_LONG_VECTOR_FEATURES_EXT;
12714+
};
12715+
12716+
template <>
12717+
struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_LONG_VECTOR_FEATURES_EXT> {
12718+
typedef VkPhysicalDeviceShaderLongVectorFeaturesEXT Type;
12719+
};
12720+
12721+
// Map type VkPhysicalDeviceShaderLongVectorPropertiesEXT to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_LONG_VECTOR_PROPERTIES_EXT
12722+
template <>
12723+
struct LvlTypeMap<VkPhysicalDeviceShaderLongVectorPropertiesEXT> {
12724+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_LONG_VECTOR_PROPERTIES_EXT;
12725+
};
12726+
12727+
template <>
12728+
struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_LONG_VECTOR_PROPERTIES_EXT> {
12729+
typedef VkPhysicalDeviceShaderLongVectorPropertiesEXT Type;
12730+
};
12731+
1273712732
// Map type VkPhysicalDevicePipelineCacheIncrementalModeFeaturesSEC to id
1273812733
// VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_CACHE_INCREMENTAL_MODE_FEATURES_SEC
1273912734
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.336"
10+
"commit": "v1.4.337"
1111
},
1212
{
1313
"name": "MoltenVK",
@@ -56,7 +56,7 @@
5656
"cmake_options": [
5757
"-DLOADER_USE_UNSAFE_FILE_SEARCH=ON"
5858
],
59-
"commit": "v1.4.336",
59+
"commit": "v1.4.337",
6060
"build_platforms": [
6161
"windows",
6262
"linux",

0 commit comments

Comments
 (0)