Skip to content

Commit

Permalink
Update Vulkan headers to 1.3.290 (#1624)
Browse files Browse the repository at this point in the history
  • Loading branch information
@nickdriscoll-lunarg
nickdriscoll-lunarg authored Jul 12, 2024
1 parent 58b31d9 commit 64f7c1c
Show file tree
Hide file tree
Showing 34 changed files with 1,658 additions and 44 deletions.
2 changes: 1 addition & 1 deletion external/Vulkan-Headers
Submodule Vulkan-Headers updated 27 files
+25 −6 .github/workflows/ci.yml
+33 −9 CMakeLists.txt
+108 −0 Makefile.release
+46 −1 include/vulkan/vulkan.cppm
+265 −123 include/vulkan/vulkan.hpp
+147 −9 include/vulkan/vulkan_core.h
+167 −71 include/vulkan/vulkan_enums.hpp
+31 −11 include/vulkan/vulkan_extension_inspection.hpp
+44 −11 include/vulkan/vulkan_funcs.hpp
+287 −56 include/vulkan/vulkan_handles.hpp
+245 −63 include/vulkan/vulkan_hash.hpp
+20 −14 include/vulkan/vulkan_raii.hpp
+161 −0 include/vulkan/vulkan_static_assertions.hpp
+6,229 −5,404 include/vulkan/vulkan_structs.hpp
+34 −5 include/vulkan/vulkan_to_string.hpp
+1 −1 registry/apiconventions.py
+4 −4 registry/cgenerator.py
+5 −5 registry/generator.py
+1 −1 registry/parse_dependency.py
+45 −4 registry/reg.py
+8 −3 registry/spec_tools/conventions.py
+1 −0 registry/spec_tools/util.py
+2 −2 registry/stripAPI.py
+2,413 −5,825 registry/validusage.json
+376 −102 registry/vk.xml
+1 −1 registry/vkconventions.py
+1 −1 tests/CMakeLists.txt
44 changes: 44 additions & 0 deletions framework/generated/generated_decode_pnext_struct.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1011,6 +1011,26 @@ size_t DecodePNextStruct(const uint8_t* parameter_buffer, size_t buffer_size, P
(*pNext) = DecodeAllocator::Allocate<PNextTypedNode<Decoded_VkBindMemoryStatusKHR>>();
bytes_read = (*pNext)->Decode(parameter_buffer, buffer_size);
break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_RELAXED_EXTENDED_INSTRUCTION_FEATURES_KHR:
(*pNext) = DecodeAllocator::Allocate<PNextTypedNode<Decoded_VkPhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR>>();
bytes_read = (*pNext)->Decode(parameter_buffer, buffer_size);
break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_7_FEATURES_KHR:
(*pNext) = DecodeAllocator::Allocate<PNextTypedNode<Decoded_VkPhysicalDeviceMaintenance7FeaturesKHR>>();
bytes_read = (*pNext)->Decode(parameter_buffer, buffer_size);
break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_7_PROPERTIES_KHR:
(*pNext) = DecodeAllocator::Allocate<PNextTypedNode<Decoded_VkPhysicalDeviceMaintenance7PropertiesKHR>>();
bytes_read = (*pNext)->Decode(parameter_buffer, buffer_size);
break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LAYERED_API_PROPERTIES_LIST_KHR:
(*pNext) = DecodeAllocator::Allocate<PNextTypedNode<Decoded_VkPhysicalDeviceLayeredApiPropertiesListKHR>>();
bytes_read = (*pNext)->Decode(parameter_buffer, buffer_size);
break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LAYERED_API_VULKAN_PROPERTIES_KHR:
(*pNext) = DecodeAllocator::Allocate<PNextTypedNode<Decoded_VkPhysicalDeviceLayeredApiVulkanPropertiesKHR>>();
bytes_read = (*pNext)->Decode(parameter_buffer, buffer_size);
break;
case VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT:
(*pNext) = DecodeAllocator::Allocate<PNextTypedNode<Decoded_VkDebugReportCallbackCreateInfoEXT>>();
bytes_read = (*pNext)->Decode(parameter_buffer, buffer_size);
Expand Down Expand Up @@ -2095,6 +2115,14 @@ size_t DecodePNextStruct(const uint8_t* parameter_buffer, size_t buffer_size, P
(*pNext) = DecodeAllocator::Allocate<PNextTypedNode<Decoded_VkPhysicalDeviceExtendedSparseAddressSpacePropertiesNV>>();
bytes_read = (*pNext)->Decode(parameter_buffer, buffer_size);
break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LEGACY_VERTEX_ATTRIBUTES_FEATURES_EXT:
(*pNext) = DecodeAllocator::Allocate<PNextTypedNode<Decoded_VkPhysicalDeviceLegacyVertexAttributesFeaturesEXT>>();
bytes_read = (*pNext)->Decode(parameter_buffer, buffer_size);
break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LEGACY_VERTEX_ATTRIBUTES_PROPERTIES_EXT:
(*pNext) = DecodeAllocator::Allocate<PNextTypedNode<Decoded_VkPhysicalDeviceLegacyVertexAttributesPropertiesEXT>>();
bytes_read = (*pNext)->Decode(parameter_buffer, buffer_size);
break;
case VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT:
(*pNext) = DecodeAllocator::Allocate<PNextTypedNode<Decoded_VkLayerSettingsCreateInfoEXT>>();
bytes_read = (*pNext)->Decode(parameter_buffer, buffer_size);
Expand Down Expand Up @@ -2195,10 +2223,26 @@ size_t DecodePNextStruct(const uint8_t* parameter_buffer, size_t buffer_size, P
(*pNext) = DecodeAllocator::Allocate<PNextTypedNode<Decoded_VkPhysicalDeviceShaderAtomicFloat16VectorFeaturesNV>>();
bytes_read = (*pNext)->Decode(parameter_buffer, buffer_size);
break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_REPLICATED_COMPOSITES_FEATURES_EXT:
(*pNext) = DecodeAllocator::Allocate<PNextTypedNode<Decoded_VkPhysicalDeviceShaderReplicatedCompositesFeaturesEXT>>();
bytes_read = (*pNext)->Decode(parameter_buffer, buffer_size);
break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_VALIDATION_FEATURES_NV:
(*pNext) = DecodeAllocator::Allocate<PNextTypedNode<Decoded_VkPhysicalDeviceRayTracingValidationFeaturesNV>>();
bytes_read = (*pNext)->Decode(parameter_buffer, buffer_size);
break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ALIGNMENT_CONTROL_FEATURES_MESA:
(*pNext) = DecodeAllocator::Allocate<PNextTypedNode<Decoded_VkPhysicalDeviceImageAlignmentControlFeaturesMESA>>();
bytes_read = (*pNext)->Decode(parameter_buffer, buffer_size);
break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ALIGNMENT_CONTROL_PROPERTIES_MESA:
(*pNext) = DecodeAllocator::Allocate<PNextTypedNode<Decoded_VkPhysicalDeviceImageAlignmentControlPropertiesMESA>>();
bytes_read = (*pNext)->Decode(parameter_buffer, buffer_size);
break;
case VK_STRUCTURE_TYPE_IMAGE_ALIGNMENT_CONTROL_CREATE_INFO_MESA:
(*pNext) = DecodeAllocator::Allocate<PNextTypedNode<Decoded_VkImageAlignmentControlCreateInfoMESA>>();
bytes_read = (*pNext)->Decode(parameter_buffer, buffer_size);
break;
case VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_ACCELERATION_STRUCTURE_KHR:
(*pNext) = DecodeAllocator::Allocate<PNextTypedNode<Decoded_VkWriteDescriptorSetAccelerationStructureKHR>>();
bytes_read = (*pNext)->Decode(parameter_buffer, buffer_size);
Expand Down
33 changes: 33 additions & 0 deletions framework/generated/generated_encode_pnext_struct.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -780,6 +780,21 @@ void EncodePNextStruct(ParameterEncoder* encoder, const void* value)
case VK_STRUCTURE_TYPE_BIND_MEMORY_STATUS_KHR:
EncodeStructPtr(encoder, reinterpret_cast<const VkBindMemoryStatusKHR*>(base));
break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_RELAXED_EXTENDED_INSTRUCTION_FEATURES_KHR:
EncodeStructPtr(encoder, reinterpret_cast<const VkPhysicalDeviceShaderRelaxedExtendedInstructionFeaturesKHR*>(base));
break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_7_FEATURES_KHR:
EncodeStructPtr(encoder, reinterpret_cast<const VkPhysicalDeviceMaintenance7FeaturesKHR*>(base));
break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_7_PROPERTIES_KHR:
EncodeStructPtr(encoder, reinterpret_cast<const VkPhysicalDeviceMaintenance7PropertiesKHR*>(base));
break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LAYERED_API_PROPERTIES_LIST_KHR:
EncodeStructPtr(encoder, reinterpret_cast<const VkPhysicalDeviceLayeredApiPropertiesListKHR*>(base));
break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LAYERED_API_VULKAN_PROPERTIES_KHR:
EncodeStructPtr(encoder, reinterpret_cast<const VkPhysicalDeviceLayeredApiVulkanPropertiesKHR*>(base));
break;
case VK_STRUCTURE_TYPE_DEBUG_REPORT_CALLBACK_CREATE_INFO_EXT:
EncodeStructPtr(encoder, reinterpret_cast<const VkDebugReportCallbackCreateInfoEXT*>(base));
break;
Expand Down Expand Up @@ -1593,6 +1608,12 @@ void EncodePNextStruct(ParameterEncoder* encoder, const void* value)
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_SPARSE_ADDRESS_SPACE_PROPERTIES_NV:
EncodeStructPtr(encoder, reinterpret_cast<const VkPhysicalDeviceExtendedSparseAddressSpacePropertiesNV*>(base));
break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LEGACY_VERTEX_ATTRIBUTES_FEATURES_EXT:
EncodeStructPtr(encoder, reinterpret_cast<const VkPhysicalDeviceLegacyVertexAttributesFeaturesEXT*>(base));
break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LEGACY_VERTEX_ATTRIBUTES_PROPERTIES_EXT:
EncodeStructPtr(encoder, reinterpret_cast<const VkPhysicalDeviceLegacyVertexAttributesPropertiesEXT*>(base));
break;
case VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT:
EncodeStructPtr(encoder, reinterpret_cast<const VkLayerSettingsCreateInfoEXT*>(base));
break;
Expand Down Expand Up @@ -1668,9 +1689,21 @@ void EncodePNextStruct(ParameterEncoder* encoder, const void* value)
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_FLOAT16_VECTOR_FEATURES_NV:
EncodeStructPtr(encoder, reinterpret_cast<const VkPhysicalDeviceShaderAtomicFloat16VectorFeaturesNV*>(base));
break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_REPLICATED_COMPOSITES_FEATURES_EXT:
EncodeStructPtr(encoder, reinterpret_cast<const VkPhysicalDeviceShaderReplicatedCompositesFeaturesEXT*>(base));
break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_VALIDATION_FEATURES_NV:
EncodeStructPtr(encoder, reinterpret_cast<const VkPhysicalDeviceRayTracingValidationFeaturesNV*>(base));
break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ALIGNMENT_CONTROL_FEATURES_MESA:
EncodeStructPtr(encoder, reinterpret_cast<const VkPhysicalDeviceImageAlignmentControlFeaturesMESA*>(base));
break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_ALIGNMENT_CONTROL_PROPERTIES_MESA:
EncodeStructPtr(encoder, reinterpret_cast<const VkPhysicalDeviceImageAlignmentControlPropertiesMESA*>(base));
break;
case VK_STRUCTURE_TYPE_IMAGE_ALIGNMENT_CONTROL_CREATE_INFO_MESA:
EncodeStructPtr(encoder, reinterpret_cast<const VkImageAlignmentControlCreateInfoMESA*>(base));
break;
case VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_ACCELERATION_STRUCTURE_KHR:
EncodeStructPtr(encoder, reinterpret_cast<const VkWriteDescriptorSetAccelerationStructureKHR*>(base));
break;
Expand Down
10 changes: 5 additions & 5 deletions framework/generated/generated_vulkan_api_call_encoders.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12728,7 +12728,7 @@ VKAPI_ATTR void VKAPI_CALL CmdSetRenderingAttachmentLocationsKHR(

VKAPI_ATTR void VKAPI_CALL CmdSetRenderingInputAttachmentIndicesKHR(
VkCommandBuffer commandBuffer,
const VkRenderingInputAttachmentIndexInfoKHR* pLocationInfo)
const VkRenderingInputAttachmentIndexInfoKHR* pInputAttachmentIndexInfo)
{
VulkanCaptureManager* manager = VulkanCaptureManager::Get();
GFXRECON_ASSERT(manager != nullptr);
Expand All @@ -12744,19 +12744,19 @@ VKAPI_ATTR void VKAPI_CALL CmdSetRenderingInputAttachmentIndicesKHR(
shared_api_call_lock = VulkanCaptureManager::AcquireSharedApiCallLock();
}

CustomEncoderPreCall<format::ApiCallId::ApiCall_vkCmdSetRenderingInputAttachmentIndicesKHR>::Dispatch(manager, commandBuffer, pLocationInfo);
CustomEncoderPreCall<format::ApiCallId::ApiCall_vkCmdSetRenderingInputAttachmentIndicesKHR>::Dispatch(manager, commandBuffer, pInputAttachmentIndexInfo);

auto encoder = manager->BeginTrackedApiCallCapture(format::ApiCallId::ApiCall_vkCmdSetRenderingInputAttachmentIndicesKHR);
if (encoder)
{
encoder->EncodeVulkanHandleValue<vulkan_wrappers::CommandBufferWrapper>(commandBuffer);
EncodeStructPtr(encoder, pLocationInfo);
EncodeStructPtr(encoder, pInputAttachmentIndexInfo);
manager->EndCommandApiCallCapture(commandBuffer);
}

vulkan_wrappers::GetDeviceTable(commandBuffer)->CmdSetRenderingInputAttachmentIndicesKHR(commandBuffer, pLocationInfo);
vulkan_wrappers::GetDeviceTable(commandBuffer)->CmdSetRenderingInputAttachmentIndicesKHR(commandBuffer, pInputAttachmentIndexInfo);

CustomEncoderPostCall<format::ApiCallId::ApiCall_vkCmdSetRenderingInputAttachmentIndicesKHR>::Dispatch(manager, commandBuffer, pLocationInfo);
CustomEncoderPostCall<format::ApiCallId::ApiCall_vkCmdSetRenderingInputAttachmentIndicesKHR>::Dispatch(manager, commandBuffer, pInputAttachmentIndexInfo);
}

VKAPI_ATTR VkResult VKAPI_CALL WaitForPresentKHR(
Expand Down
2 changes: 1 addition & 1 deletion framework/generated/generated_vulkan_api_call_encoders.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1753,7 +1753,7 @@ VKAPI_ATTR void VKAPI_CALL CmdSetRenderingAttachmentLocationsKHR(

VKAPI_ATTR void VKAPI_CALL CmdSetRenderingInputAttachmentIndicesKHR(
VkCommandBuffer commandBuffer,
const VkRenderingInputAttachmentIndexInfoKHR* pLocationInfo);
const VkRenderingInputAttachmentIndexInfoKHR* pInputAttachmentIndexInfo);

VKAPI_ATTR VkResult VKAPI_CALL WaitForPresentKHR(
VkDevice device,
Expand Down
2 changes: 1 addition & 1 deletion framework/generated/generated_vulkan_consumer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2226,7 +2226,7 @@ class VulkanConsumer : public VulkanConsumerBase
virtual void Process_vkCmdSetRenderingInputAttachmentIndicesKHR(
const ApiCallInfo& call_info,
format::HandleId commandBuffer,
StructPointerDecoder<Decoded_VkRenderingInputAttachmentIndexInfoKHR>* pLocationInfo) {}
StructPointerDecoder<Decoded_VkRenderingInputAttachmentIndexInfoKHR>* pInputAttachmentIndexInfo) {}

virtual void Process_vkWaitForPresentKHR(
const ApiCallInfo& call_info,
Expand Down
16 changes: 8 additions & 8 deletions framework/generated/generated_vulkan_cpp_consumer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7480,21 +7480,21 @@ void VulkanCppConsumer::Process_vkCmdSetRenderingAttachmentLocationsKHR(
void VulkanCppConsumer::Process_vkCmdSetRenderingInputAttachmentIndicesKHR(
const ApiCallInfo& call_info,
format::HandleId commandBuffer,
StructPointerDecoder<Decoded_VkRenderingInputAttachmentIndexInfoKHR>* pLocationInfo)
StructPointerDecoder<Decoded_VkRenderingInputAttachmentIndexInfoKHR>* pInputAttachmentIndexInfo)
{
FILE* file = GetFrameFile();
fprintf(file, "\t{\n");
std::stringstream stream_plocation_info;
std::string plocation_info_struct = GenerateStruct_VkRenderingInputAttachmentIndexInfoKHR(stream_plocation_info,
pLocationInfo->GetPointer(),
pLocationInfo->GetMetaStructPointer(),
*this);
fprintf(file, "%s", stream_plocation_info.str().c_str());
std::stringstream stream_pinput_attachment_index_info;
std::string pinput_attachment_index_info_struct = GenerateStruct_VkRenderingInputAttachmentIndexInfoKHR(stream_pinput_attachment_index_info,
pInputAttachmentIndexInfo->GetPointer(),
pInputAttachmentIndexInfo->GetMetaStructPointer(),
*this);
fprintf(file, "%s", stream_pinput_attachment_index_info.str().c_str());
pfn_loader_.AddMethodName("vkCmdSetRenderingInputAttachmentIndicesKHR");
fprintf(file,
"\t\tloaded_vkCmdSetRenderingInputAttachmentIndicesKHR(%s, &%s);\n",
this->GetHandle(commandBuffer).c_str(),
plocation_info_struct.c_str());
pinput_attachment_index_info_struct.c_str());
fprintf(file, "\t}\n");
Post_APICall(format::ApiCallId::ApiCall_vkCmdSetRenderingInputAttachmentIndicesKHR);
}
Expand Down
2 changes: 1 addition & 1 deletion framework/generated/generated_vulkan_cpp_consumer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2182,7 +2182,7 @@ class VulkanCppConsumer : public VulkanCppConsumerBase
virtual void Process_vkCmdSetRenderingInputAttachmentIndicesKHR(
const ApiCallInfo& call_info,
format::HandleId commandBuffer,
StructPointerDecoder<Decoded_VkRenderingInputAttachmentIndexInfoKHR>* pLocationInfo) override;
StructPointerDecoder<Decoded_VkRenderingInputAttachmentIndexInfoKHR>* pInputAttachmentIndexInfo) override;
virtual void Process_vkWaitForPresentKHR(
const ApiCallInfo& call_info,
VkResult returnValue,
Expand Down
Loading

0 comments on commit 64f7c1c

Please sign in to comment.