Skip to content

Commit

Permalink
Update headers to 1.3.261
Browse files Browse the repository at this point in the history 
Skip extension: VK_AMDX_shader_enqueue
Deal with KHR suffix's VkFlags64 for ToString
  • Loading branch information
@locke-lunarg
locke-lunarg committed Aug 14, 2023
1 parent 7a7d18d commit 55c1cdd
Show file tree
Hide file tree
Showing 37 changed files with 1,658 additions and 138 deletions.
2 changes: 1 addition & 1 deletion external/Vulkan-Headers
Submodule Vulkan-Headers updated 20 files
+10 −0 CODE_OF_CONDUCT.adoc
+0 −1 CODE_OF_CONDUCT.md
+106 −29 include/vulkan/vulkan.cppm
+381 −33 include/vulkan/vulkan.hpp
+113 −0 include/vulkan/vulkan_beta.h
+205 −17 include/vulkan/vulkan_core.h
+168 −22 include/vulkan/vulkan_enums.hpp
+16 −4 include/vulkan/vulkan_extension_inspection.hpp
+54 −0 include/vulkan/vulkan_format_traits.hpp
+452 −13 include/vulkan/vulkan_funcs.hpp
+207 −7 include/vulkan/vulkan_handles.hpp
+215 −32 include/vulkan/vulkan_hash.hpp
+367 −16 include/vulkan/vulkan_raii.hpp
+107 −11 include/vulkan/vulkan_static_assertions.hpp
+1,810 −244 include/vulkan/vulkan_structs.hpp
+246 −2 include/vulkan/vulkan_to_string.hpp
+2 −0 registry/genvk.py
+111 −50 registry/parse_dependency.py
+2,117 −229 registry/validusage.json
+459 −56 registry/vk.xml
4 changes: 4 additions & 0 deletions framework/format/api_call_id.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -695,6 +695,10 @@ enum ApiCallId : uint32_t
ApiCall_vkCmdUpdatePipelineIndirectBuffer = MakeApiCallId(ApiFamily_Vulkan, 0x12d5),
ApiCall_vkGetPipelineIndirectDeviceAddressNV = MakeApiCallId(ApiFamily_Vulkan, 0x12d6),
ApiCall_vkCmdUpdatePipelineIndirectBufferNV = MakeApiCallId(ApiFamily_Vulkan, 0x12d7),
ApiCall_vkCmdBindIndexBuffer2KHR = MakeApiCallId(ApiFamily_Vulkan, 0x12d8),
ApiCall_vkGetRenderingAreaGranularityKHR = MakeApiCallId(ApiFamily_Vulkan, 0x12d9),
ApiCall_vkGetDeviceImageSubresourceLayoutKHR = MakeApiCallId(ApiFamily_Vulkan, 0x12da),
ApiCall_vkGetImageSubresourceLayout2KHR = MakeApiCallId(ApiFamily_Vulkan, 0x12db),

ApiCall_VulkanLast,

Expand Down
16 changes: 16 additions & 0 deletions framework/generated/generated_decode_pnext_struct.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -774,6 +774,22 @@ size_t DecodePNextStruct(const uint8_t* parameter_buffer, size_t buffer_size, P
(*pNext) = DecodeAllocator::Allocate<PNextTypedNode<Decoded_VkPhysicalDeviceRayTracingMaintenance1FeaturesKHR>>();
bytes_read = (*pNext)->Decode(parameter_buffer, buffer_size);
break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_FEATURES_KHR:
(*pNext) = DecodeAllocator::Allocate<PNextTypedNode<Decoded_VkPhysicalDeviceMaintenance5FeaturesKHR>>();
bytes_read = (*pNext)->Decode(parameter_buffer, buffer_size);
break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_PROPERTIES_KHR:
(*pNext) = DecodeAllocator::Allocate<PNextTypedNode<Decoded_VkPhysicalDeviceMaintenance5PropertiesKHR>>();
bytes_read = (*pNext)->Decode(parameter_buffer, buffer_size);
break;
case VK_STRUCTURE_TYPE_PIPELINE_CREATE_FLAGS_2_CREATE_INFO_KHR:
(*pNext) = DecodeAllocator::Allocate<PNextTypedNode<Decoded_VkPipelineCreateFlags2CreateInfoKHR>>();
bytes_read = (*pNext)->Decode(parameter_buffer, buffer_size);
break;
case VK_STRUCTURE_TYPE_BUFFER_USAGE_FLAGS_2_CREATE_INFO_KHR:
(*pNext) = DecodeAllocator::Allocate<PNextTypedNode<Decoded_VkBufferUsageFlags2CreateInfoKHR>>();
bytes_read = (*pNext)->Decode(parameter_buffer, buffer_size);
break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_POSITION_FETCH_FEATURES_KHR:
(*pNext) = DecodeAllocator::Allocate<PNextTypedNode<Decoded_VkPhysicalDeviceRayTracingPositionFetchFeaturesKHR>>();
bytes_read = (*pNext)->Decode(parameter_buffer, buffer_size);
Expand Down
12 changes: 12 additions & 0 deletions framework/generated/generated_encode_pnext_struct.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -602,6 +602,18 @@ void EncodePNextStruct(ParameterEncoder* encoder, const void* value)
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_MAINTENANCE_1_FEATURES_KHR:
EncodeStructPtr(encoder, reinterpret_cast<const VkPhysicalDeviceRayTracingMaintenance1FeaturesKHR*>(base));
break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_FEATURES_KHR:
EncodeStructPtr(encoder, reinterpret_cast<const VkPhysicalDeviceMaintenance5FeaturesKHR*>(base));
break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MAINTENANCE_5_PROPERTIES_KHR:
EncodeStructPtr(encoder, reinterpret_cast<const VkPhysicalDeviceMaintenance5PropertiesKHR*>(base));
break;
case VK_STRUCTURE_TYPE_PIPELINE_CREATE_FLAGS_2_CREATE_INFO_KHR:
EncodeStructPtr(encoder, reinterpret_cast<const VkPipelineCreateFlags2CreateInfoKHR*>(base));
break;
case VK_STRUCTURE_TYPE_BUFFER_USAGE_FLAGS_2_CREATE_INFO_KHR:
EncodeStructPtr(encoder, reinterpret_cast<const VkBufferUsageFlags2CreateInfoKHR*>(base));
break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_POSITION_FETCH_FEATURES_KHR:
EncodeStructPtr(encoder, reinterpret_cast<const VkPhysicalDeviceRayTracingPositionFetchFeaturesKHR*>(base));
break;
Expand Down
4 changes: 4 additions & 0 deletions framework/generated/generated_layer_func_table.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,10 @@ const std::unordered_map<std::string, PFN_vkVoidFunction> func_table = {
{ "vkGetDeviceBufferMemoryRequirementsKHR", reinterpret_cast<PFN_vkVoidFunction>(encode::GetDeviceBufferMemoryRequirementsKHR) },
{ "vkGetDeviceImageMemoryRequirementsKHR", reinterpret_cast<PFN_vkVoidFunction>(encode::GetDeviceImageMemoryRequirementsKHR) },
{ "vkGetDeviceImageSparseMemoryRequirementsKHR", reinterpret_cast<PFN_vkVoidFunction>(encode::GetDeviceImageSparseMemoryRequirementsKHR) },
{ "vkCmdBindIndexBuffer2KHR", reinterpret_cast<PFN_vkVoidFunction>(encode::CmdBindIndexBuffer2KHR) },
{ "vkGetRenderingAreaGranularityKHR", reinterpret_cast<PFN_vkVoidFunction>(encode::GetRenderingAreaGranularityKHR) },
{ "vkGetDeviceImageSubresourceLayoutKHR", reinterpret_cast<PFN_vkVoidFunction>(encode::GetDeviceImageSubresourceLayoutKHR) },
{ "vkGetImageSubresourceLayout2KHR", reinterpret_cast<PFN_vkVoidFunction>(encode::GetImageSubresourceLayout2KHR) },
{ "vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR", reinterpret_cast<PFN_vkVoidFunction>(encode::GetPhysicalDeviceCooperativeMatrixPropertiesKHR) },
{ "vkCreateDebugReportCallbackEXT", reinterpret_cast<PFN_vkVoidFunction>(encode::CreateDebugReportCallbackEXT) },
{ "vkDestroyDebugReportCallbackEXT", reinterpret_cast<PFN_vkVoidFunction>(encode::DestroyDebugReportCallbackEXT) },
Expand Down
145 changes: 143 additions & 2 deletions framework/generated/generated_vulkan_api_call_encoders.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13349,6 +13349,147 @@ VKAPI_ATTR void VKAPI_CALL GetDeviceImageSparseMemoryRequirementsKHR(
CustomEncoderPostCall<format::ApiCallId::ApiCall_vkGetDeviceImageSparseMemoryRequirementsKHR>::Dispatch(VulkanCaptureManager::Get(), device, pInfo, pSparseMemoryRequirementCount, pSparseMemoryRequirements);
}

VKAPI_ATTR void VKAPI_CALL CmdBindIndexBuffer2KHR(
VkCommandBuffer commandBuffer,
VkBuffer buffer,
VkDeviceSize offset,
VkDeviceSize size,
VkIndexType indexType)
{
auto force_command_serialization = VulkanCaptureManager::Get()->GetForceCommandSerialization();
std::shared_lock<CaptureManager::ApiCallMutexT> shared_api_call_lock;
std::unique_lock<CaptureManager::ApiCallMutexT> exclusive_api_call_lock;
if (force_command_serialization)
{
exclusive_api_call_lock = VulkanCaptureManager::AcquireExclusiveApiCallLock();
}
else
{
shared_api_call_lock = VulkanCaptureManager::AcquireSharedApiCallLock();
}

CustomEncoderPreCall<format::ApiCallId::ApiCall_vkCmdBindIndexBuffer2KHR>::Dispatch(VulkanCaptureManager::Get(), commandBuffer, buffer, offset, size, indexType);

auto encoder = VulkanCaptureManager::Get()->BeginTrackedApiCallCapture(format::ApiCallId::ApiCall_vkCmdBindIndexBuffer2KHR);
if (encoder)
{
encoder->EncodeHandleValue<CommandBufferWrapper>(commandBuffer);
encoder->EncodeHandleValue<BufferWrapper>(buffer);
encoder->EncodeVkDeviceSizeValue(offset);
encoder->EncodeVkDeviceSizeValue(size);
encoder->EncodeEnumValue(indexType);
VulkanCaptureManager::Get()->EndCommandApiCallCapture(commandBuffer, TrackCmdBindIndexBuffer2KHRHandles, buffer);
}

GetDeviceTable(commandBuffer)->CmdBindIndexBuffer2KHR(commandBuffer, buffer, offset, size, indexType);

CustomEncoderPostCall<format::ApiCallId::ApiCall_vkCmdBindIndexBuffer2KHR>::Dispatch(VulkanCaptureManager::Get(), commandBuffer, buffer, offset, size, indexType);
}

VKAPI_ATTR void VKAPI_CALL GetRenderingAreaGranularityKHR(
VkDevice device,
const VkRenderingAreaInfoKHR* pRenderingAreaInfo,
VkExtent2D* pGranularity)
{
auto force_command_serialization = VulkanCaptureManager::Get()->GetForceCommandSerialization();
std::shared_lock<CaptureManager::ApiCallMutexT> shared_api_call_lock;
std::unique_lock<CaptureManager::ApiCallMutexT> exclusive_api_call_lock;
if (force_command_serialization)
{
exclusive_api_call_lock = VulkanCaptureManager::AcquireExclusiveApiCallLock();
}
else
{
shared_api_call_lock = VulkanCaptureManager::AcquireSharedApiCallLock();
}

CustomEncoderPreCall<format::ApiCallId::ApiCall_vkGetRenderingAreaGranularityKHR>::Dispatch(VulkanCaptureManager::Get(), device, pRenderingAreaInfo, pGranularity);

GetDeviceTable(device)->GetRenderingAreaGranularityKHR(device, pRenderingAreaInfo, pGranularity);

auto encoder = VulkanCaptureManager::Get()->BeginApiCallCapture(format::ApiCallId::ApiCall_vkGetRenderingAreaGranularityKHR);
if (encoder)
{
encoder->EncodeHandleValue<DeviceWrapper>(device);
EncodeStructPtr(encoder, pRenderingAreaInfo);
EncodeStructPtr(encoder, pGranularity);
VulkanCaptureManager::Get()->EndApiCallCapture();
}

CustomEncoderPostCall<format::ApiCallId::ApiCall_vkGetRenderingAreaGranularityKHR>::Dispatch(VulkanCaptureManager::Get(), device, pRenderingAreaInfo, pGranularity);
}

VKAPI_ATTR void VKAPI_CALL GetDeviceImageSubresourceLayoutKHR(
VkDevice device,
const VkDeviceImageSubresourceInfoKHR* pInfo,
VkSubresourceLayout2KHR* pLayout)
{
auto force_command_serialization = VulkanCaptureManager::Get()->GetForceCommandSerialization();
std::shared_lock<CaptureManager::ApiCallMutexT> shared_api_call_lock;
std::unique_lock<CaptureManager::ApiCallMutexT> exclusive_api_call_lock;
if (force_command_serialization)
{
exclusive_api_call_lock = VulkanCaptureManager::AcquireExclusiveApiCallLock();
}
else
{
shared_api_call_lock = VulkanCaptureManager::AcquireSharedApiCallLock();
}

CustomEncoderPreCall<format::ApiCallId::ApiCall_vkGetDeviceImageSubresourceLayoutKHR>::Dispatch(VulkanCaptureManager::Get(), device, pInfo, pLayout);

auto handle_unwrap_memory = VulkanCaptureManager::Get()->GetHandleUnwrapMemory();
const VkDeviceImageSubresourceInfoKHR* pInfo_unwrapped = UnwrapStructPtrHandles(pInfo, handle_unwrap_memory);

GetDeviceTable(device)->GetDeviceImageSubresourceLayoutKHR(device, pInfo_unwrapped, pLayout);

auto encoder = VulkanCaptureManager::Get()->BeginApiCallCapture(format::ApiCallId::ApiCall_vkGetDeviceImageSubresourceLayoutKHR);
if (encoder)
{
encoder->EncodeHandleValue<DeviceWrapper>(device);
EncodeStructPtr(encoder, pInfo);
EncodeStructPtr(encoder, pLayout);
VulkanCaptureManager::Get()->EndApiCallCapture();
}

CustomEncoderPostCall<format::ApiCallId::ApiCall_vkGetDeviceImageSubresourceLayoutKHR>::Dispatch(VulkanCaptureManager::Get(), device, pInfo, pLayout);
}

VKAPI_ATTR void VKAPI_CALL GetImageSubresourceLayout2KHR(
VkDevice device,
VkImage image,
const VkImageSubresource2KHR* pSubresource,
VkSubresourceLayout2KHR* pLayout)
{
auto force_command_serialization = VulkanCaptureManager::Get()->GetForceCommandSerialization();
std::shared_lock<CaptureManager::ApiCallMutexT> shared_api_call_lock;
std::unique_lock<CaptureManager::ApiCallMutexT> exclusive_api_call_lock;
if (force_command_serialization)
{
exclusive_api_call_lock = VulkanCaptureManager::AcquireExclusiveApiCallLock();
}
else
{
shared_api_call_lock = VulkanCaptureManager::AcquireSharedApiCallLock();
}

CustomEncoderPreCall<format::ApiCallId::ApiCall_vkGetImageSubresourceLayout2KHR>::Dispatch(VulkanCaptureManager::Get(), device, image, pSubresource, pLayout);

GetDeviceTable(device)->GetImageSubresourceLayout2KHR(device, image, pSubresource, pLayout);

auto encoder = VulkanCaptureManager::Get()->BeginApiCallCapture(format::ApiCallId::ApiCall_vkGetImageSubresourceLayout2KHR);
if (encoder)
{
encoder->EncodeHandleValue<DeviceWrapper>(device);
encoder->EncodeHandleValue<ImageWrapper>(image);
EncodeStructPtr(encoder, pSubresource);
EncodeStructPtr(encoder, pLayout);
VulkanCaptureManager::Get()->EndApiCallCapture();
}

CustomEncoderPostCall<format::ApiCallId::ApiCall_vkGetImageSubresourceLayout2KHR>::Dispatch(VulkanCaptureManager::Get(), device, image, pSubresource, pLayout);
}

VKAPI_ATTR VkResult VKAPI_CALL GetPhysicalDeviceCooperativeMatrixPropertiesKHR(
VkPhysicalDevice physicalDevice,
uint32_t* pPropertyCount,
Expand Down Expand Up @@ -18281,8 +18422,8 @@ VKAPI_ATTR VkResult VKAPI_CALL TransitionImageLayoutEXT(
VKAPI_ATTR void VKAPI_CALL GetImageSubresourceLayout2EXT(
VkDevice device,
VkImage image,
const VkImageSubresource2EXT* pSubresource,
VkSubresourceLayout2EXT* pLayout)
const VkImageSubresource2KHR* pSubresource,
VkSubresourceLayout2KHR* pLayout)
{
auto force_command_serialization = VulkanCaptureManager::Get()->GetForceCommandSerialization();
std::shared_lock<CaptureManager::ApiCallMutexT> shared_api_call_lock;
Expand Down
27 changes: 25 additions & 2 deletions framework/generated/generated_vulkan_api_call_encoders.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1917,6 +1917,29 @@ VKAPI_ATTR void VKAPI_CALL GetDeviceImageSparseMemoryRequirementsKHR(
uint32_t* pSparseMemoryRequirementCount,
VkSparseImageMemoryRequirements2* pSparseMemoryRequirements);

VKAPI_ATTR void VKAPI_CALL CmdBindIndexBuffer2KHR(
VkCommandBuffer commandBuffer,
VkBuffer buffer,
VkDeviceSize offset,
VkDeviceSize size,
VkIndexType indexType);

VKAPI_ATTR void VKAPI_CALL GetRenderingAreaGranularityKHR(
VkDevice device,
const VkRenderingAreaInfoKHR* pRenderingAreaInfo,
VkExtent2D* pGranularity);

VKAPI_ATTR void VKAPI_CALL GetDeviceImageSubresourceLayoutKHR(
VkDevice device,
const VkDeviceImageSubresourceInfoKHR* pInfo,
VkSubresourceLayout2KHR* pLayout);

VKAPI_ATTR void VKAPI_CALL GetImageSubresourceLayout2KHR(
VkDevice device,
VkImage image,
const VkImageSubresource2KHR* pSubresource,
VkSubresourceLayout2KHR* pLayout);

VKAPI_ATTR VkResult VKAPI_CALL GetPhysicalDeviceCooperativeMatrixPropertiesKHR(
VkPhysicalDevice physicalDevice,
uint32_t* pPropertyCount,
Expand Down Expand Up @@ -2625,8 +2648,8 @@ VKAPI_ATTR VkResult VKAPI_CALL TransitionImageLayoutEXT(
VKAPI_ATTR void VKAPI_CALL GetImageSubresourceLayout2EXT(
VkDevice device,
VkImage image,
const VkImageSubresource2EXT* pSubresource,
VkSubresourceLayout2EXT* pLayout);
const VkImageSubresource2KHR* pSubresource,
VkSubresourceLayout2KHR* pLayout);

VKAPI_ATTR VkResult VKAPI_CALL ReleaseSwapchainImagesEXT(
VkDevice device,
Expand Down
7 changes: 7 additions & 0 deletions framework/generated/generated_vulkan_command_buffer_util.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -974,6 +974,13 @@ void TrackCmdResolveImage2KHRHandles(CommandBufferWrapper* wrapper, const VkReso
}
}

void TrackCmdBindIndexBuffer2KHRHandles(CommandBufferWrapper* wrapper, VkBuffer buffer)
{
assert(wrapper != nullptr);

if(buffer != VK_NULL_HANDLE) wrapper->command_handles[CommandHandleType::BufferHandle].insert(GetWrappedId<BufferWrapper>(buffer));
}

void TrackCmdBindTransformFeedbackBuffersEXTHandles(CommandBufferWrapper* wrapper, uint32_t bindingCount, const VkBuffer* pBuffers)
{
assert(wrapper != nullptr);
Expand Down
2 changes: 2 additions & 0 deletions framework/generated/generated_vulkan_command_buffer_util.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,8 @@ void TrackCmdBlitImage2KHRHandles(CommandBufferWrapper* wrapper, const VkBlitIma

void TrackCmdResolveImage2KHRHandles(CommandBufferWrapper* wrapper, const VkResolveImageInfo2* pResolveImageInfo);

void TrackCmdBindIndexBuffer2KHRHandles(CommandBufferWrapper* wrapper, VkBuffer buffer);

void TrackCmdBindTransformFeedbackBuffersEXTHandles(CommandBufferWrapper* wrapper, uint32_t bindingCount, const VkBuffer* pBuffers);

void TrackCmdBeginTransformFeedbackEXTHandles(CommandBufferWrapper* wrapper, uint32_t counterBufferCount, const VkBuffer* pCounterBuffers);
Expand Down
Loading

0 comments on commit 55c1cdd

Please sign in to comment.