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.318 LANGUAGES C)
project(VULKAN_LOADER VERSION 1.4.319 LANGUAGES C)

option(CODE_COVERAGE "Enable Code Coverage" OFF)
if (CODE_COVERAGE)
Expand Down
15 changes: 15 additions & 0 deletions loader/generated/vk_layer_dispatch_table.h
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,10 @@ typedef struct VkLayerInstanceDispatchTable_ {
// ---- VK_NV_cooperative_vector extension commands
PFN_vkGetPhysicalDeviceCooperativeVectorPropertiesNV GetPhysicalDeviceCooperativeVectorPropertiesNV;

// ---- VK_ARM_data_graph extension commands
PFN_vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM GetPhysicalDeviceQueueFamilyDataGraphPropertiesARM;
PFN_vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM GetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM;

// ---- VK_OHOS_surface extension commands
#if defined(VK_USE_PLATFORM_OHOS)
PFN_vkCreateSurfaceOHOS CreateSurfaceOHOS;
Expand Down Expand Up @@ -1211,6 +1215,17 @@ typedef struct VkLayerDispatchTable_ {
PFN_vkGetLatencyTimingsNV GetLatencyTimingsNV;
PFN_vkQueueNotifyOutOfBandNV QueueNotifyOutOfBandNV;

// ---- VK_ARM_data_graph extension commands
PFN_vkCreateDataGraphPipelinesARM CreateDataGraphPipelinesARM;
PFN_vkCreateDataGraphPipelineSessionARM CreateDataGraphPipelineSessionARM;
PFN_vkGetDataGraphPipelineSessionBindPointRequirementsARM GetDataGraphPipelineSessionBindPointRequirementsARM;
PFN_vkGetDataGraphPipelineSessionMemoryRequirementsARM GetDataGraphPipelineSessionMemoryRequirementsARM;
PFN_vkBindDataGraphPipelineSessionMemoryARM BindDataGraphPipelineSessionMemoryARM;
PFN_vkDestroyDataGraphPipelineSessionARM DestroyDataGraphPipelineSessionARM;
PFN_vkCmdDispatchDataGraphARM CmdDispatchDataGraphARM;
PFN_vkGetDataGraphPipelineAvailablePropertiesARM GetDataGraphPipelineAvailablePropertiesARM;
PFN_vkGetDataGraphPipelinePropertiesARM GetDataGraphPipelinePropertiesARM;

// ---- VK_EXT_attachment_feedback_loop_dynamic_state extension commands
PFN_vkCmdSetAttachmentFeedbackLoopEnableEXT CmdSetAttachmentFeedbackLoopEnableEXT;

Expand Down
283 changes: 283 additions & 0 deletions loader/generated/vk_loader_extensions.c

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions loader/generated/vk_loader_extensions.h
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,10 @@ struct loader_icd_term_dispatch {
// ---- VK_NV_cooperative_vector extension commands
PFN_vkGetPhysicalDeviceCooperativeVectorPropertiesNV GetPhysicalDeviceCooperativeVectorPropertiesNV;

// ---- VK_ARM_data_graph extension commands
PFN_vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM GetPhysicalDeviceQueueFamilyDataGraphPropertiesARM;
PFN_vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM GetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM;

// ---- VK_OHOS_surface extension commands
#if defined(VK_USE_PLATFORM_OHOS)
PFN_vkCreateSurfaceOHOS CreateSurfaceOHOS;
Expand Down
12 changes: 8 additions & 4 deletions loader/generated/vk_object_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,11 @@ typedef enum VulkanObjectType {
kVulkanObjectTypeTensorViewARM = 51,
kVulkanObjectTypeOpticalFlowSessionNV = 52,
kVulkanObjectTypeShaderEXT = 53,
kVulkanObjectTypeExternalComputeQueueNV = 54,
kVulkanObjectTypeIndirectExecutionSetEXT = 55,
kVulkanObjectTypeIndirectCommandsLayoutEXT = 56,
kVulkanObjectTypeMax = 57,
kVulkanObjectTypeDataGraphPipelineSessionARM = 54,
kVulkanObjectTypeExternalComputeQueueNV = 55,
kVulkanObjectTypeIndirectExecutionSetEXT = 56,
kVulkanObjectTypeIndirectCommandsLayoutEXT = 57,
kVulkanObjectTypeMax = 58,
// Aliases for backwards compatibilty of "promoted" types
kVulkanObjectTypeSamplerYcbcrConversionKHR = kVulkanObjectTypeSamplerYcbcrConversion,
kVulkanObjectTypeDescriptorUpdateTemplateKHR = kVulkanObjectTypeDescriptorUpdateTemplate,
Expand Down Expand Up @@ -158,6 +159,7 @@ static const char * const object_string[kVulkanObjectTypeMax] = {
"TensorViewARM",
"OpticalFlowSessionNV",
"ShaderEXT",
"DataGraphPipelineSessionARM",
"ExternalComputeQueueNV",
"IndirectExecutionSetEXT",
"IndirectCommandsLayoutEXT",
Expand Down Expand Up @@ -219,6 +221,7 @@ const VkDebugReportObjectTypeEXT get_debug_report_enum[] = {
VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, // kVulkanObjectTypeTensorViewARM
VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, // kVulkanObjectTypeOpticalFlowSessionNV
VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, // kVulkanObjectTypeShaderEXT
VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, // kVulkanObjectTypeDataGraphPipelineSessionARM
VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, // kVulkanObjectTypeExternalComputeQueueNV
VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, // kVulkanObjectTypeIndirectExecutionSetEXT
VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, // kVulkanObjectTypeIndirectCommandsLayoutEXT
Expand Down Expand Up @@ -280,6 +283,7 @@ const VkObjectType get_object_type_enum[] = {
VK_OBJECT_TYPE_TENSOR_VIEW_ARM, // kVulkanObjectTypeTensorViewARM
VK_OBJECT_TYPE_OPTICAL_FLOW_SESSION_NV, // kVulkanObjectTypeOpticalFlowSessionNV
VK_OBJECT_TYPE_SHADER_EXT, // kVulkanObjectTypeShaderEXT
VK_OBJECT_TYPE_DATA_GRAPH_PIPELINE_SESSION_ARM, // kVulkanObjectTypeDataGraphPipelineSessionARM
VK_OBJECT_TYPE_EXTERNAL_COMPUTE_QUEUE_NV, // kVulkanObjectTypeExternalComputeQueueNV
VK_OBJECT_TYPE_INDIRECT_EXECUTION_SET_EXT, // kVulkanObjectTypeIndirectExecutionSetEXT
VK_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_EXT, // kVulkanObjectTypeIndirectCommandsLayoutEXT
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, 318, 0
#define VER_FILE_DESCRIPTION_STR "1.4.318.Dev Build"
#define VER_FILE_VERSION 1, 4, 319, 0
#define VER_FILE_DESCRIPTION_STR "1.4.319.Dev Build"
#define VER_FILE_VERSION_STR "Vulkan Loader - Dev Build"
#define VER_COPYRIGHT_STR "Copyright (C) 2015-2025"

Expand Down
3 changes: 0 additions & 3 deletions scripts/generate_source.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,6 @@ def RunGenerators(api: str, registry: str, directory: str, styleFile: str, targe
# Parse the specified registry XML into an ElementTree object
tree = ElementTree.parse(registry)

# Filter out extensions that are not on the API list
[exts.remove(e) for exts in tree.findall('extensions') for e in exts.findall('extension') if (sup := e.get('supported')) is not None and all(api not in sup.split(',') for api in apiList)]

# Load the XML tree into the registry object
reg.loadElementTree(tree)

Expand Down
2 changes: 1 addition & 1 deletion 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.318"
"commit": "v1.4.319"
},
{
"name": "googletest",
Expand Down
11 changes: 11 additions & 0 deletions tests/framework/layer/generated/vk_dispatch_table_helper.h
Original file line number Diff line number Diff line change
Expand Up @@ -693,6 +693,15 @@ static inline void layer_init_device_dispatch_table(VkDevice device, VkLayerDisp
table->SetLatencyMarkerNV = (PFN_vkSetLatencyMarkerNV)gpa(device, "vkSetLatencyMarkerNV");
table->GetLatencyTimingsNV = (PFN_vkGetLatencyTimingsNV)gpa(device, "vkGetLatencyTimingsNV");
table->QueueNotifyOutOfBandNV = (PFN_vkQueueNotifyOutOfBandNV)gpa(device, "vkQueueNotifyOutOfBandNV");
table->CreateDataGraphPipelinesARM = (PFN_vkCreateDataGraphPipelinesARM)gpa(device, "vkCreateDataGraphPipelinesARM");
table->CreateDataGraphPipelineSessionARM = (PFN_vkCreateDataGraphPipelineSessionARM)gpa(device, "vkCreateDataGraphPipelineSessionARM");
table->GetDataGraphPipelineSessionBindPointRequirementsARM = (PFN_vkGetDataGraphPipelineSessionBindPointRequirementsARM)gpa(device, "vkGetDataGraphPipelineSessionBindPointRequirementsARM");
table->GetDataGraphPipelineSessionMemoryRequirementsARM = (PFN_vkGetDataGraphPipelineSessionMemoryRequirementsARM)gpa(device, "vkGetDataGraphPipelineSessionMemoryRequirementsARM");
table->BindDataGraphPipelineSessionMemoryARM = (PFN_vkBindDataGraphPipelineSessionMemoryARM)gpa(device, "vkBindDataGraphPipelineSessionMemoryARM");
table->DestroyDataGraphPipelineSessionARM = (PFN_vkDestroyDataGraphPipelineSessionARM)gpa(device, "vkDestroyDataGraphPipelineSessionARM");
table->CmdDispatchDataGraphARM = (PFN_vkCmdDispatchDataGraphARM)gpa(device, "vkCmdDispatchDataGraphARM");
table->GetDataGraphPipelineAvailablePropertiesARM = (PFN_vkGetDataGraphPipelineAvailablePropertiesARM)gpa(device, "vkGetDataGraphPipelineAvailablePropertiesARM");
table->GetDataGraphPipelinePropertiesARM = (PFN_vkGetDataGraphPipelinePropertiesARM)gpa(device, "vkGetDataGraphPipelinePropertiesARM");
table->CmdSetAttachmentFeedbackLoopEnableEXT = (PFN_vkCmdSetAttachmentFeedbackLoopEnableEXT)gpa(device, "vkCmdSetAttachmentFeedbackLoopEnableEXT");
#if defined(VK_USE_PLATFORM_SCREEN_QNX)
table->GetScreenBufferPropertiesQNX = (PFN_vkGetScreenBufferPropertiesQNX)gpa(device, "vkGetScreenBufferPropertiesQNX");
Expand Down Expand Up @@ -913,6 +922,8 @@ static inline void layer_init_instance_dispatch_table(VkInstance instance, VkLay
table->GetPhysicalDeviceExternalTensorPropertiesARM = (PFN_vkGetPhysicalDeviceExternalTensorPropertiesARM)gpa(instance, "vkGetPhysicalDeviceExternalTensorPropertiesARM");
table->GetPhysicalDeviceOpticalFlowImageFormatsNV = (PFN_vkGetPhysicalDeviceOpticalFlowImageFormatsNV)gpa(instance, "vkGetPhysicalDeviceOpticalFlowImageFormatsNV");
table->GetPhysicalDeviceCooperativeVectorPropertiesNV = (PFN_vkGetPhysicalDeviceCooperativeVectorPropertiesNV)gpa(instance, "vkGetPhysicalDeviceCooperativeVectorPropertiesNV");
table->GetPhysicalDeviceQueueFamilyDataGraphPropertiesARM = (PFN_vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM)gpa(instance, "vkGetPhysicalDeviceQueueFamilyDataGraphPropertiesARM");
table->GetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM = (PFN_vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM)gpa(instance, "vkGetPhysicalDeviceQueueFamilyDataGraphProcessingEnginePropertiesARM");
#if defined(VK_USE_PLATFORM_OHOS)
table->CreateSurfaceOHOS = (PFN_vkCreateSurfaceOHOS)gpa(instance, "vkCreateSurfaceOHOS");
#endif // VK_USE_PLATFORM_OHOS
Expand Down