Skip to content

Commit 17c4154

Browse files
committed
build: Update to header 1.4.329
1 parent faf69f6 commit 17c4154

File tree

7 files changed

+32
-5
lines changed

7 files changed

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

icd/generated/function_declarations.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = {
224224
{"VK_KHR_shader_relaxed_extended_instruction", VK_KHR_SHADER_RELAXED_EXTENDED_INSTRUCTION_SPEC_VERSION},
225225
{"VK_KHR_maintenance7", VK_KHR_MAINTENANCE_7_SPEC_VERSION},
226226
{"VK_KHR_maintenance8", VK_KHR_MAINTENANCE_8_SPEC_VERSION},
227+
{"VK_KHR_shader_fma", VK_KHR_SHADER_FMA_SPEC_VERSION},
227228
{"VK_KHR_maintenance9", VK_KHR_MAINTENANCE_9_SPEC_VERSION},
228229
{"VK_KHR_video_maintenance2", VK_KHR_VIDEO_MAINTENANCE_2_SPEC_VERSION},
229230
{"VK_KHR_depth_clamp_zero_one", VK_KHR_DEPTH_CLAMP_ZERO_ONE_SPEC_VERSION},

icd/generated/vk_typemap_helper.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4586,6 +4586,15 @@ template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_8_F
45864586
typedef VkPhysicalDeviceMaintenance8FeaturesKHR Type;
45874587
};
45884588

4589+
// Map type VkPhysicalDeviceShaderFmaFeaturesKHR to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FMA_FEATURES_KHR
4590+
template <> struct LvlTypeMap<VkPhysicalDeviceShaderFmaFeaturesKHR> {
4591+
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FMA_FEATURES_KHR;
4592+
};
4593+
4594+
template <> struct LvlSTypeMap<VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FMA_FEATURES_KHR> {
4595+
typedef VkPhysicalDeviceShaderFmaFeaturesKHR Type;
4596+
};
4597+
45894598
// Map type VkPhysicalDeviceMaintenance9FeaturesKHR to id VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_9_FEATURES_KHR
45904599
template <> struct LvlTypeMap<VkPhysicalDeviceMaintenance9FeaturesKHR> {
45914600
static const VkStructureType kSType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_9_FEATURES_KHR;

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

tests/icd/mock_icd_tests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ TEST_F(MockICD, CommandBufferOperations) {
240240
}
241241

242242
VkResult create_surface(VkInstance instance, VkSurfaceKHR& surface) {
243-
VkDisplaySurfaceCreateInfoKHR surf_create_info{};
243+
VkDisplaySurfaceCreateInfoKHR surf_create_info{VK_STRUCTURE_TYPE_DISPLAY_SURFACE_CREATE_INFO_KHR};
244244
return vkCreateDisplayPlaneSurfaceKHR(instance, &surf_create_info, nullptr, &surface);
245245
}
246246

vulkaninfo/generated/vulkaninfo.hpp

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4591,6 +4591,13 @@ void DumpVkPhysicalDeviceShaderFloatControls2Features(Printer &p, std::string na
45914591
p.SetMinKeyWidth(20);
45924592
p.PrintKeyBool("shaderFloatControls2", static_cast<bool>(obj.shaderFloatControls2));
45934593
}
4594+
void DumpVkPhysicalDeviceShaderFmaFeaturesKHR(Printer &p, std::string name, const VkPhysicalDeviceShaderFmaFeaturesKHR &obj) {
4595+
ObjectWrapper object{p, name};
4596+
p.SetMinKeyWidth(16);
4597+
p.PrintKeyBool("shaderFmaFloat16", static_cast<bool>(obj.shaderFmaFloat16));
4598+
p.PrintKeyBool("shaderFmaFloat32", static_cast<bool>(obj.shaderFmaFloat32));
4599+
p.PrintKeyBool("shaderFmaFloat64", static_cast<bool>(obj.shaderFmaFloat64));
4600+
}
45944601
void DumpVkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT(Printer &p, std::string name, const VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT &obj) {
45954602
ObjectWrapper object{p, name};
45964603
p.SetMinKeyWidth(23);
@@ -6604,6 +6611,7 @@ struct phys_device_features2_chain {
66046611
VkPhysicalDeviceShaderFloat16Int8Features PhysicalDeviceShaderFloat16Int8Features{};
66056612
VkPhysicalDeviceShaderFloat8FeaturesEXT PhysicalDeviceShaderFloat8FeaturesEXT{};
66066613
VkPhysicalDeviceShaderFloatControls2Features PhysicalDeviceShaderFloatControls2Features{};
6614+
VkPhysicalDeviceShaderFmaFeaturesKHR PhysicalDeviceShaderFmaFeaturesKHR{};
66076615
VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT PhysicalDeviceShaderImageAtomicInt64FeaturesEXT{};
66086616
VkPhysicalDeviceShaderIntegerDotProductFeatures PhysicalDeviceShaderIntegerDotProductFeatures{};
66096617
char VkPhysicalDeviceShaderIntegerDotProductFeatures_padding[64];
@@ -6766,6 +6774,7 @@ struct phys_device_features2_chain {
67666774
PhysicalDeviceShaderFloat16Int8Features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES;
67676775
PhysicalDeviceShaderFloat8FeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT8_FEATURES_EXT;
67686776
PhysicalDeviceShaderFloatControls2Features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT_CONTROLS_2_FEATURES;
6777+
PhysicalDeviceShaderFmaFeaturesKHR.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FMA_FEATURES_KHR;
67696778
PhysicalDeviceShaderImageAtomicInt64FeaturesEXT.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_IMAGE_ATOMIC_INT64_FEATURES_EXT;
67706779
PhysicalDeviceShaderIntegerDotProductFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES;
67716780
PhysicalDeviceShaderMaximalReconvergenceFeaturesKHR.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_MAXIMAL_RECONVERGENCE_FEATURES_KHR;
@@ -7082,6 +7091,8 @@ struct phys_device_features2_chain {
70827091
if ((gpu.CheckPhysicalDeviceExtensionIncluded(VK_KHR_SHADER_FLOAT_CONTROLS_2_EXTENSION_NAME))
70837092
&& (gpu.api_version < VK_API_VERSION_1_4 || show_promoted_structs))
70847093
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceShaderFloatControls2Features));
7094+
if (gpu.CheckPhysicalDeviceExtensionIncluded(VK_KHR_SHADER_FMA_EXTENSION_NAME))
7095+
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceShaderFmaFeaturesKHR));
70857096
if (gpu.CheckPhysicalDeviceExtensionIncluded(VK_EXT_SHADER_IMAGE_ATOMIC_INT64_EXTENSION_NAME))
70867097
chain_members.push_back(reinterpret_cast<VkBaseOutStructure*>(&PhysicalDeviceShaderImageAtomicInt64FeaturesEXT));
70877098
if ((gpu.CheckPhysicalDeviceExtensionIncluded(VK_KHR_SHADER_INTEGER_DOT_PRODUCT_EXTENSION_NAME))
@@ -8105,6 +8116,12 @@ void chain_iterator_phys_device_features2(Printer &p, AppGpu &gpu, bool show_pro
81058116
}
81068117
p.AddNewline();
81078118
}
8119+
if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FMA_FEATURES_KHR) {
8120+
const VkPhysicalDeviceShaderFmaFeaturesKHR* props = (const VkPhysicalDeviceShaderFmaFeaturesKHR*)structure;
8121+
const char* name = "VkPhysicalDeviceShaderFmaFeaturesKHR";
8122+
DumpVkPhysicalDeviceShaderFmaFeaturesKHR(p, name, *props);
8123+
p.AddNewline();
8124+
}
81088125
if (structure->sType == VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_IMAGE_ATOMIC_INT64_FEATURES_EXT) {
81098126
const VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT* props = (const VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT*)structure;
81108127
const char* name = "VkPhysicalDeviceShaderImageAtomicInt64FeaturesEXT";

0 commit comments

Comments
 (0)