Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# ~~~
cmake_minimum_required(VERSION 3.22.1)

project(VULKAN_LOADER VERSION 1.4.345 LANGUAGES C)
project(VULKAN_LOADER VERSION 1.4.346 LANGUAGES C)

option(CODE_COVERAGE "Enable Code Coverage" OFF)
if (CODE_COVERAGE)
Expand Down
24 changes: 24 additions & 0 deletions loader/generated/vk_layer_dispatch_table.h
Original file line number Diff line number Diff line change
Expand Up @@ -711,6 +711,30 @@ typedef struct VkLayerDispatchTable_ {
PFN_vkCmdWriteTimestamp2KHR CmdWriteTimestamp2KHR;
PFN_vkQueueSubmit2KHR QueueSubmit2KHR;

// ---- VK_KHR_device_address_commands extension commands
PFN_vkCmdBindIndexBuffer3KHR CmdBindIndexBuffer3KHR;
PFN_vkCmdBindVertexBuffers3KHR CmdBindVertexBuffers3KHR;
PFN_vkCmdDrawIndirect2KHR CmdDrawIndirect2KHR;
PFN_vkCmdDrawIndexedIndirect2KHR CmdDrawIndexedIndirect2KHR;
PFN_vkCmdDispatchIndirect2KHR CmdDispatchIndirect2KHR;
PFN_vkCmdCopyMemoryKHR CmdCopyMemoryKHR;
PFN_vkCmdCopyMemoryToImageKHR CmdCopyMemoryToImageKHR;
PFN_vkCmdCopyImageToMemoryKHR CmdCopyImageToMemoryKHR;
PFN_vkCmdUpdateMemoryKHR CmdUpdateMemoryKHR;
PFN_vkCmdFillMemoryKHR CmdFillMemoryKHR;
PFN_vkCmdCopyQueryPoolResultsToMemoryKHR CmdCopyQueryPoolResultsToMemoryKHR;
PFN_vkCmdDrawIndirectCount2KHR CmdDrawIndirectCount2KHR;
PFN_vkCmdDrawIndexedIndirectCount2KHR CmdDrawIndexedIndirectCount2KHR;
PFN_vkCmdBeginConditionalRendering2EXT CmdBeginConditionalRendering2EXT;
PFN_vkCmdBindTransformFeedbackBuffers2EXT CmdBindTransformFeedbackBuffers2EXT;
PFN_vkCmdBeginTransformFeedback2EXT CmdBeginTransformFeedback2EXT;
PFN_vkCmdEndTransformFeedback2EXT CmdEndTransformFeedback2EXT;
PFN_vkCmdDrawIndirectByteCount2EXT CmdDrawIndirectByteCount2EXT;
PFN_vkCmdDrawMeshTasksIndirect2EXT CmdDrawMeshTasksIndirect2EXT;
PFN_vkCmdDrawMeshTasksIndirectCount2EXT CmdDrawMeshTasksIndirectCount2EXT;
PFN_vkCmdWriteMarkerToMemoryAMD CmdWriteMarkerToMemoryAMD;
PFN_vkCreateAccelerationStructure2KHR CreateAccelerationStructure2KHR;

// ---- VK_KHR_copy_commands2 extension commands
PFN_vkCmdCopyBuffer2KHR CmdCopyBuffer2KHR;
PFN_vkCmdCopyImage2KHR CmdCopyImage2KHR;
Expand Down
451 changes: 451 additions & 0 deletions loader/generated/vk_loader_extensions.c

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions loader/generated/vk_object_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,19 +74,19 @@ typedef enum VulkanObjectType {
kVulkanObjectTypeVideoSessionKHR = 33,
kVulkanObjectTypeVideoSessionParametersKHR = 34,
kVulkanObjectTypeDeferredOperationKHR = 35,
kVulkanObjectTypePipelineBinaryKHR = 36,
kVulkanObjectTypeDebugReportCallbackEXT = 37,
kVulkanObjectTypeCuModuleNVX = 38,
kVulkanObjectTypeCuFunctionNVX = 39,
kVulkanObjectTypeDebugUtilsMessengerEXT = 40,
kVulkanObjectTypeTensorARM = 41,
kVulkanObjectTypeValidationCacheEXT = 42,
kVulkanObjectTypeAccelerationStructureNV = 43,
kVulkanObjectTypePerformanceConfigurationINTEL = 44,
kVulkanObjectTypeIndirectCommandsLayoutNV = 45,
kVulkanObjectTypeCudaModuleNV = 46,
kVulkanObjectTypeCudaFunctionNV = 47,
kVulkanObjectTypeAccelerationStructureKHR = 48,
kVulkanObjectTypeAccelerationStructureKHR = 36,
kVulkanObjectTypePipelineBinaryKHR = 37,
kVulkanObjectTypeDebugReportCallbackEXT = 38,
kVulkanObjectTypeCuModuleNVX = 39,
kVulkanObjectTypeCuFunctionNVX = 40,
kVulkanObjectTypeDebugUtilsMessengerEXT = 41,
kVulkanObjectTypeTensorARM = 42,
kVulkanObjectTypeValidationCacheEXT = 43,
kVulkanObjectTypeAccelerationStructureNV = 44,
kVulkanObjectTypePerformanceConfigurationINTEL = 45,
kVulkanObjectTypeIndirectCommandsLayoutNV = 46,
kVulkanObjectTypeCudaModuleNV = 47,
kVulkanObjectTypeCudaFunctionNV = 48,
kVulkanObjectTypeBufferCollectionFUCHSIA = 49,
kVulkanObjectTypeMicromapEXT = 50,
kVulkanObjectTypeTensorViewARM = 51,
Expand Down Expand Up @@ -142,6 +142,7 @@ static const char * const object_string[kVulkanObjectTypeMax] = {
"VideoSessionKHR",
"VideoSessionParametersKHR",
"DeferredOperationKHR",
"AccelerationStructureKHR",
"PipelineBinaryKHR",
"DebugReportCallbackEXT",
"CuModuleNVX",
Expand All @@ -154,7 +155,6 @@ static const char * const object_string[kVulkanObjectTypeMax] = {
"IndirectCommandsLayoutNV",
"CudaModuleNV",
"CudaFunctionNV",
"AccelerationStructureKHR",
"BufferCollectionFUCHSIA",
"MicromapEXT",
"TensorViewARM",
Expand Down Expand Up @@ -205,6 +205,7 @@ const VkDebugReportObjectTypeEXT get_debug_report_enum[] = {
VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, // kVulkanObjectTypeVideoSessionKHR
VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, // kVulkanObjectTypeVideoSessionParametersKHR
VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, // kVulkanObjectTypeDeferredOperationKHR
VK_DEBUG_REPORT_OBJECT_TYPE_ACCELERATION_STRUCTURE_KHR_EXT, // kVulkanObjectTypeAccelerationStructureKHR
VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, // kVulkanObjectTypePipelineBinaryKHR
VK_DEBUG_REPORT_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT_EXT, // kVulkanObjectTypeDebugReportCallbackEXT
VK_DEBUG_REPORT_OBJECT_TYPE_CU_MODULE_NVX_EXT, // kVulkanObjectTypeCuModuleNVX
Expand All @@ -217,7 +218,6 @@ const VkDebugReportObjectTypeEXT get_debug_report_enum[] = {
VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, // kVulkanObjectTypeIndirectCommandsLayoutNV
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
VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, // kVulkanObjectTypeTensorViewARM
Expand Down Expand Up @@ -268,6 +268,7 @@ const VkObjectType get_object_type_enum[] = {
VK_OBJECT_TYPE_VIDEO_SESSION_KHR, // kVulkanObjectTypeVideoSessionKHR
VK_OBJECT_TYPE_VIDEO_SESSION_PARAMETERS_KHR, // kVulkanObjectTypeVideoSessionParametersKHR
VK_OBJECT_TYPE_DEFERRED_OPERATION_KHR, // kVulkanObjectTypeDeferredOperationKHR
VK_OBJECT_TYPE_ACCELERATION_STRUCTURE_KHR, // kVulkanObjectTypeAccelerationStructureKHR
VK_OBJECT_TYPE_PIPELINE_BINARY_KHR, // kVulkanObjectTypePipelineBinaryKHR
VK_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT, // kVulkanObjectTypeDebugReportCallbackEXT
VK_OBJECT_TYPE_CU_MODULE_NVX, // kVulkanObjectTypeCuModuleNVX
Expand All @@ -280,7 +281,6 @@ const VkObjectType get_object_type_enum[] = {
VK_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_NV, // kVulkanObjectTypeIndirectCommandsLayoutNV
VK_OBJECT_TYPE_CUDA_MODULE_NV, // kVulkanObjectTypeCudaModuleNV
VK_OBJECT_TYPE_CUDA_FUNCTION_NV, // kVulkanObjectTypeCudaFunctionNV
VK_OBJECT_TYPE_ACCELERATION_STRUCTURE_KHR, // kVulkanObjectTypeAccelerationStructureKHR
VK_OBJECT_TYPE_BUFFER_COLLECTION_FUCHSIA, // kVulkanObjectTypeBufferCollectionFUCHSIA
VK_OBJECT_TYPE_MICROMAP_EXT, // kVulkanObjectTypeMicromapEXT
VK_OBJECT_TYPE_TENSOR_VIEW_ARM, // kVulkanObjectTypeTensorViewARM
Expand Down
4 changes: 2 additions & 2 deletions loader/loader.rc
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
#include "winres.h"

// All set through CMake
#define VER_FILE_VERSION 1, 4, 345, 0
#define VER_FILE_DESCRIPTION_STR "1.4.345.Dev Build"
#define VER_FILE_VERSION 1, 4, 346, 0
#define VER_FILE_DESCRIPTION_STR "1.4.346.Dev Build"
#define VER_FILE_VERSION_STR "Vulkan Loader - Dev Build"
#define VER_COPYRIGHT_STR "Copyright (C) 2015-2026"

Expand Down
4 changes: 2 additions & 2 deletions scripts/known_good.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"sub_dir": "Vulkan-Headers",
"build_dir": "Vulkan-Headers/build",
"install_dir": "Vulkan-Headers/build/install",
"commit": "v1.4.345"
"commit": "v1.4.346"
},
{
"name": "googletest",
Expand Down Expand Up @@ -42,4 +42,4 @@
"googletest": "GOOGLETEST_INSTALL_DIR",
"detours": "DETOURS_INSTALL_DIR"
}
}
}
22 changes: 22 additions & 0 deletions tests/framework/layer/generated/vk_dispatch_table_helper.h
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,28 @@ static inline void layer_init_device_dispatch_table(VkDevice device, VkLayerDisp
table->CmdPipelineBarrier2KHR = (PFN_vkCmdPipelineBarrier2KHR)gpa(device, "vkCmdPipelineBarrier2KHR");
table->CmdWriteTimestamp2KHR = (PFN_vkCmdWriteTimestamp2KHR)gpa(device, "vkCmdWriteTimestamp2KHR");
table->QueueSubmit2KHR = (PFN_vkQueueSubmit2KHR)gpa(device, "vkQueueSubmit2KHR");
table->CmdBindIndexBuffer3KHR = (PFN_vkCmdBindIndexBuffer3KHR)gpa(device, "vkCmdBindIndexBuffer3KHR");
table->CmdBindVertexBuffers3KHR = (PFN_vkCmdBindVertexBuffers3KHR)gpa(device, "vkCmdBindVertexBuffers3KHR");
table->CmdDrawIndirect2KHR = (PFN_vkCmdDrawIndirect2KHR)gpa(device, "vkCmdDrawIndirect2KHR");
table->CmdDrawIndexedIndirect2KHR = (PFN_vkCmdDrawIndexedIndirect2KHR)gpa(device, "vkCmdDrawIndexedIndirect2KHR");
table->CmdDispatchIndirect2KHR = (PFN_vkCmdDispatchIndirect2KHR)gpa(device, "vkCmdDispatchIndirect2KHR");
table->CmdCopyMemoryKHR = (PFN_vkCmdCopyMemoryKHR)gpa(device, "vkCmdCopyMemoryKHR");
table->CmdCopyMemoryToImageKHR = (PFN_vkCmdCopyMemoryToImageKHR)gpa(device, "vkCmdCopyMemoryToImageKHR");
table->CmdCopyImageToMemoryKHR = (PFN_vkCmdCopyImageToMemoryKHR)gpa(device, "vkCmdCopyImageToMemoryKHR");
table->CmdUpdateMemoryKHR = (PFN_vkCmdUpdateMemoryKHR)gpa(device, "vkCmdUpdateMemoryKHR");
table->CmdFillMemoryKHR = (PFN_vkCmdFillMemoryKHR)gpa(device, "vkCmdFillMemoryKHR");
table->CmdCopyQueryPoolResultsToMemoryKHR = (PFN_vkCmdCopyQueryPoolResultsToMemoryKHR)gpa(device, "vkCmdCopyQueryPoolResultsToMemoryKHR");
table->CmdDrawIndirectCount2KHR = (PFN_vkCmdDrawIndirectCount2KHR)gpa(device, "vkCmdDrawIndirectCount2KHR");
table->CmdDrawIndexedIndirectCount2KHR = (PFN_vkCmdDrawIndexedIndirectCount2KHR)gpa(device, "vkCmdDrawIndexedIndirectCount2KHR");
table->CmdBeginConditionalRendering2EXT = (PFN_vkCmdBeginConditionalRendering2EXT)gpa(device, "vkCmdBeginConditionalRendering2EXT");
table->CmdBindTransformFeedbackBuffers2EXT = (PFN_vkCmdBindTransformFeedbackBuffers2EXT)gpa(device, "vkCmdBindTransformFeedbackBuffers2EXT");
table->CmdBeginTransformFeedback2EXT = (PFN_vkCmdBeginTransformFeedback2EXT)gpa(device, "vkCmdBeginTransformFeedback2EXT");
table->CmdEndTransformFeedback2EXT = (PFN_vkCmdEndTransformFeedback2EXT)gpa(device, "vkCmdEndTransformFeedback2EXT");
table->CmdDrawIndirectByteCount2EXT = (PFN_vkCmdDrawIndirectByteCount2EXT)gpa(device, "vkCmdDrawIndirectByteCount2EXT");
table->CmdDrawMeshTasksIndirect2EXT = (PFN_vkCmdDrawMeshTasksIndirect2EXT)gpa(device, "vkCmdDrawMeshTasksIndirect2EXT");
table->CmdDrawMeshTasksIndirectCount2EXT = (PFN_vkCmdDrawMeshTasksIndirectCount2EXT)gpa(device, "vkCmdDrawMeshTasksIndirectCount2EXT");
table->CmdWriteMarkerToMemoryAMD = (PFN_vkCmdWriteMarkerToMemoryAMD)gpa(device, "vkCmdWriteMarkerToMemoryAMD");
table->CreateAccelerationStructure2KHR = (PFN_vkCreateAccelerationStructure2KHR)gpa(device, "vkCreateAccelerationStructure2KHR");
table->CmdCopyBuffer2KHR = (PFN_vkCmdCopyBuffer2KHR)gpa(device, "vkCmdCopyBuffer2KHR");
table->CmdCopyImage2KHR = (PFN_vkCmdCopyImage2KHR)gpa(device, "vkCmdCopyImage2KHR");
table->CmdCopyBufferToImage2KHR = (PFN_vkCmdCopyBufferToImage2KHR)gpa(device, "vkCmdCopyBufferToImage2KHR");
Expand Down
Loading