From 494e87bb10868199afa6d4826c61c8afd4bd6454 Mon Sep 17 00:00:00 2001 From: Mike Schuchardt Date: Mon, 27 Nov 2023 11:21:35 -0800 Subject: [PATCH] build: Update to header 1.3.271 - Update known-good - Generate source --- CMakeLists.txt | 2 +- loader/generated/vk_loader_extensions.c | 3 +-- loader/generated/vk_object_types.h | 12 ++++++++++-- loader/loader.rc | 4 ++-- scripts/known_good.json | 2 +- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d53b2265..6ebb8804c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ # ~~~ cmake_minimum_required(VERSION 3.17.2) -project(VULKAN_LOADER VERSION 1.3.270) +project(VULKAN_LOADER VERSION 1.3.271) add_subdirectory(scripts) diff --git a/loader/generated/vk_loader_extensions.c b/loader/generated/vk_loader_extensions.c index 8a138a354..1bf60869f 100644 --- a/loader/generated/vk_loader_extensions.c +++ b/loader/generated/vk_loader_extensions.c @@ -9131,7 +9131,6 @@ VKAPI_ATTR void VKAPI_CALL SetLatencyMarkerNV( VKAPI_ATTR void VKAPI_CALL GetLatencyTimingsNV( VkDevice device, VkSwapchainKHR swapchain, - uint32_t* pTimingCount, VkGetLatencyMarkerInfoNV* pLatencyMarkerInfo) { const VkLayerDispatchTable *disp = loader_get_dispatch(device); if (NULL == disp) { @@ -9140,7 +9139,7 @@ VKAPI_ATTR void VKAPI_CALL GetLatencyTimingsNV( "[VUID-vkGetLatencyTimingsNV-device-parameter]"); abort(); /* Intentionally fail so user can correct issue. */ } - disp->GetLatencyTimingsNV(device, swapchain, pTimingCount, pLatencyMarkerInfo); + disp->GetLatencyTimingsNV(device, swapchain, pLatencyMarkerInfo); } VKAPI_ATTR void VKAPI_CALL QueueNotifyOutOfBandNV( diff --git a/loader/generated/vk_object_types.h b/loader/generated/vk_object_types.h index a120ea0a7..8480ec1a6 100644 --- a/loader/generated/vk_object_types.h +++ b/loader/generated/vk_object_types.h @@ -195,8 +195,8 @@ const VkDebugReportObjectTypeEXT get_debug_report_enum[] = { VK_DEBUG_REPORT_OBJECT_TYPE_ACCELERATION_STRUCTURE_NV_EXT, // kVulkanObjectTypeAccelerationStructureNV VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, // kVulkanObjectTypePerformanceConfigurationINTEL VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, // kVulkanObjectTypeIndirectCommandsLayoutNV - VK_DEBUG_REPORT_OBJECT_TYPE_CUDA_MODULE_NV, // kVulkanObjectTypeCudaModuleNV - VK_DEBUG_REPORT_OBJECT_TYPE_CUDA_FUNCTION_NV, // kVulkanObjectTypeCudaFunctionNV + VK_DEBUG_REPORT_OBJECT_TYPE_CUDA_MODULE_NV_EXT, // kVulkanObjectTypeCudaModuleNV + VK_DEBUG_REPORT_OBJECT_TYPE_CUDA_FUNCTION_NV_EXT, // kVulkanObjectTypeCudaFunctionNV VK_DEBUG_REPORT_OBJECT_TYPE_ACCELERATION_STRUCTURE_KHR_EXT, // kVulkanObjectTypeAccelerationStructureKHR VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_COLLECTION_FUCHSIA_EXT, // kVulkanObjectTypeBufferCollectionFUCHSIA VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, // kVulkanObjectTypeMicromapEXT @@ -343,6 +343,10 @@ static inline VkObjectType convertDebugReportObjectToCoreObject(VkDebugReportObj return VK_OBJECT_TYPE_VALIDATION_CACHE_EXT; } else if (debug_report_obj == VK_DEBUG_REPORT_OBJECT_TYPE_ACCELERATION_STRUCTURE_NV_EXT) { return VK_OBJECT_TYPE_ACCELERATION_STRUCTURE_NV; + } else if (debug_report_obj == VK_DEBUG_REPORT_OBJECT_TYPE_CUDA_MODULE_NV_EXT) { + return VK_OBJECT_TYPE_CUDA_MODULE_NV; + } else if (debug_report_obj == VK_DEBUG_REPORT_OBJECT_TYPE_CUDA_FUNCTION_NV_EXT) { + return VK_OBJECT_TYPE_CUDA_FUNCTION_NV; } else if (debug_report_obj == VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_COLLECTION_FUCHSIA_EXT) { return VK_OBJECT_TYPE_BUFFER_COLLECTION_FUCHSIA; } @@ -433,6 +437,10 @@ static inline VkDebugReportObjectTypeEXT convertCoreObjectToDebugReportObject(Vk return VK_DEBUG_REPORT_OBJECT_TYPE_VALIDATION_CACHE_EXT_EXT; } else if (core_report_obj == VK_OBJECT_TYPE_ACCELERATION_STRUCTURE_NV) { return VK_DEBUG_REPORT_OBJECT_TYPE_ACCELERATION_STRUCTURE_NV_EXT; + } else if (core_report_obj == VK_OBJECT_TYPE_CUDA_MODULE_NV) { + return VK_DEBUG_REPORT_OBJECT_TYPE_CUDA_MODULE_NV_EXT; + } else if (core_report_obj == VK_OBJECT_TYPE_CUDA_FUNCTION_NV) { + return VK_DEBUG_REPORT_OBJECT_TYPE_CUDA_FUNCTION_NV_EXT; } else if (core_report_obj == VK_OBJECT_TYPE_BUFFER_COLLECTION_FUCHSIA) { return VK_DEBUG_REPORT_OBJECT_TYPE_BUFFER_COLLECTION_FUCHSIA_EXT; } diff --git a/loader/loader.rc b/loader/loader.rc index e0e7575b6..50b80d60b 100644 --- a/loader/loader.rc +++ b/loader/loader.rc @@ -22,8 +22,8 @@ #include "winres.h" // All set through CMake -#define VER_FILE_VERSION 1, 3, 270, 0 -#define VER_FILE_DESCRIPTION_STR "1.3.270.Dev Build" +#define VER_FILE_VERSION 1, 3, 271, 0 +#define VER_FILE_DESCRIPTION_STR "1.3.271.Dev Build" #define VER_FILE_VERSION_STR "Vulkan Loader - Dev Build" #define VER_COPYRIGHT_STR "Copyright (C) 2015-2023" diff --git a/scripts/known_good.json b/scripts/known_good.json index f90332069..215c9355a 100644 --- a/scripts/known_good.json +++ b/scripts/known_good.json @@ -6,7 +6,7 @@ "sub_dir": "Vulkan-Headers", "build_dir": "Vulkan-Headers/build", "install_dir": "Vulkan-Headers/build/install", - "commit": "v1.3.270" + "commit": "v1.3.271" }, { "name": "googletest",