Skip to content

Commit f766b30

Browse files
mikes-lunargcharles-lunarg
authored andcommitted
build: Update to header 1.4.323
- Fix a warning in cube.cpp due to resetFences becoming nodiscard
1 parent 36f2e75 commit f766b30

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

cube/cube.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -901,7 +901,8 @@ void Demo::draw() {
901901
}
902902

903903
// Only reset right before submitting so we can't deadlock on an un-signalled fence that has nothing submitted to it
904-
device.resetFences({current_submission.fence});
904+
auto reset_result = device.resetFences({current_submission.fence});
905+
VERIFY(reset_result == vk::Result::eSuccess);
905906

906907
// Wait for the image acquired semaphore to be signaled to ensure
907908
// that the image won't be rendered to until the presentation

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.322"
5+
"api_version": "1.4.323"
66
}
77
}

icd/generated/function_declarations.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ static const std::unordered_map<std::string, uint32_t> device_extension_map = {
432432
{"VK_EXT_shader_replicated_composites", 1},
433433
{"VK_EXT_shader_float8", 1},
434434
{"VK_NV_ray_tracing_validation", 1},
435-
{"VK_NV_cluster_acceleration_structure", 3},
435+
{"VK_NV_cluster_acceleration_structure", 4},
436436
{"VK_NV_partitioned_acceleration_structure", 1},
437437
{"VK_EXT_device_generated_commands", 1},
438438
{"VK_KHR_maintenance8", 1},

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

vulkaninfo/generated/vulkaninfo.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1219,6 +1219,7 @@ std::string VkResultString(VkResult value) {
12191219
case (VK_ERROR_FORMAT_NOT_SUPPORTED): return "ERROR_FORMAT_NOT_SUPPORTED";
12201220
case (VK_ERROR_FRAGMENTED_POOL): return "ERROR_FRAGMENTED_POOL";
12211221
case (VK_ERROR_UNKNOWN): return "ERROR_UNKNOWN";
1222+
case (VK_ERROR_VALIDATION_FAILED): return "ERROR_VALIDATION_FAILED";
12221223
case (VK_ERROR_OUT_OF_POOL_MEMORY): return "ERROR_OUT_OF_POOL_MEMORY";
12231224
case (VK_ERROR_INVALID_EXTERNAL_HANDLE): return "ERROR_INVALID_EXTERNAL_HANDLE";
12241225
case (VK_ERROR_FRAGMENTATION): return "ERROR_FRAGMENTATION";
@@ -1230,7 +1231,6 @@ std::string VkResultString(VkResult value) {
12301231
case (VK_SUBOPTIMAL_KHR): return "SUBOPTIMAL_KHR";
12311232
case (VK_ERROR_OUT_OF_DATE_KHR): return "ERROR_OUT_OF_DATE_KHR";
12321233
case (VK_ERROR_INCOMPATIBLE_DISPLAY_KHR): return "ERROR_INCOMPATIBLE_DISPLAY_KHR";
1233-
case (VK_ERROR_VALIDATION_FAILED_EXT): return "ERROR_VALIDATION_FAILED_EXT";
12341234
case (VK_ERROR_INVALID_SHADER_NV): return "ERROR_INVALID_SHADER_NV";
12351235
case (VK_ERROR_IMAGE_USAGE_NOT_SUPPORTED_KHR): return "ERROR_IMAGE_USAGE_NOT_SUPPORTED_KHR";
12361236
case (VK_ERROR_VIDEO_PICTURE_LAYOUT_NOT_SUPPORTED_KHR): return "ERROR_VIDEO_PICTURE_LAYOUT_NOT_SUPPORTED_KHR";

0 commit comments

Comments
 (0)