Skip to content

Commit 0736dfe

Browse files
christophe-lunargchristophe-lunarg
committed
build: Update Vulkan-Headers and VUL to 1.4.328
1 parent 081ca2c commit 0736dfe

19 files changed

Lines changed: 579 additions & 65 deletions

‎scripts/known_good.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
"cmake_options": [
1111
"-DVULKAN_HEADERS_ENABLE_MODULE=OFF"
1212
],
13-
"commit": "v1.4.326"
13+
"commit": "v1.4.328"
1414
},
1515
{
1616
"name": "Vulkan-Utility-Libraries",
1717
"url": "https://github.com/KhronosGroup/Vulkan-Utility-Libraries.git",
1818
"sub_dir": "Vulkan-Utility-Libraries",
1919
"build_dir": "Vulkan-Utility-Libraries/build",
2020
"install_dir": "Vulkan-Utility-Libraries/build/install",
21-
"commit": "v1.4.326",
21+
"commit": "v1.4.328",
2222
"deps": [
2323
{
2424
"var_name": "VULKAN_HEADERS_INSTALL_DIR",
@@ -32,7 +32,7 @@
3232
"sub_dir": "SPIRV-Headers",
3333
"build_dir": "SPIRV-Headers/build",
3434
"install_dir": "SPIRV-Headers/build/install",
35-
"commit": "2a611a970fdbc41ac2e3e328802aed9985352dca"
35+
"commit": "01e0577914a75a2569c846778c2f93aa8e6feddd"
3636
},
3737
{
3838
"name": "yaml-cpp",

‎src/generated/cdl_commands.cpp.inc‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1442,6 +1442,28 @@ void Context::PostCmdBindDescriptorBufferEmbeddedSamplers2EXT(
14421442
p_cmd->PostCmdBindDescriptorBufferEmbeddedSamplers2EXT(commandBuffer, pBindDescriptorBufferEmbeddedSamplersInfo);
14431443
}
14441444

1445+
void Context::PreCmdCopyMemoryIndirectKHR(VkCommandBuffer commandBuffer,
1446+
const VkCopyMemoryIndirectInfoKHR* pCopyMemoryIndirectInfo) {
1447+
auto p_cmd = crash_diagnostic_layer::GetCommandBuffer(commandBuffer);
1448+
p_cmd->PreCmdCopyMemoryIndirectKHR(commandBuffer, pCopyMemoryIndirectInfo);
1449+
}
1450+
void Context::PostCmdCopyMemoryIndirectKHR(VkCommandBuffer commandBuffer,
1451+
const VkCopyMemoryIndirectInfoKHR* pCopyMemoryIndirectInfo) {
1452+
auto p_cmd = crash_diagnostic_layer::GetCommandBuffer(commandBuffer);
1453+
p_cmd->PostCmdCopyMemoryIndirectKHR(commandBuffer, pCopyMemoryIndirectInfo);
1454+
}
1455+
1456+
void Context::PreCmdCopyMemoryToImageIndirectKHR(
1457+
VkCommandBuffer commandBuffer, const VkCopyMemoryToImageIndirectInfoKHR* pCopyMemoryToImageIndirectInfo) {
1458+
auto p_cmd = crash_diagnostic_layer::GetCommandBuffer(commandBuffer);
1459+
p_cmd->PreCmdCopyMemoryToImageIndirectKHR(commandBuffer, pCopyMemoryToImageIndirectInfo);
1460+
}
1461+
void Context::PostCmdCopyMemoryToImageIndirectKHR(
1462+
VkCommandBuffer commandBuffer, const VkCopyMemoryToImageIndirectInfoKHR* pCopyMemoryToImageIndirectInfo) {
1463+
auto p_cmd = crash_diagnostic_layer::GetCommandBuffer(commandBuffer);
1464+
p_cmd->PostCmdCopyMemoryToImageIndirectKHR(commandBuffer, pCopyMemoryToImageIndirectInfo);
1465+
}
1466+
14451467
void Context::PreCmdDebugMarkerBeginEXT(VkCommandBuffer commandBuffer, const VkDebugMarkerMarkerInfoEXT* pMarkerInfo) {
14461468
auto p_cmd = crash_diagnostic_layer::GetCommandBuffer(commandBuffer);
14471469
p_cmd->PreCmdDebugMarkerBeginEXT(commandBuffer, pMarkerInfo);

‎src/generated/cdl_commands.h.inc‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -630,6 +630,16 @@ void PostCmdBindDescriptorBufferEmbeddedSamplers2EXT(
630630
VkCommandBuffer commandBuffer,
631631
const VkBindDescriptorBufferEmbeddedSamplersInfoEXT* pBindDescriptorBufferEmbeddedSamplersInfo) override;
632632

633+
void PreCmdCopyMemoryIndirectKHR(VkCommandBuffer commandBuffer,
634+
const VkCopyMemoryIndirectInfoKHR* pCopyMemoryIndirectInfo) override;
635+
void PostCmdCopyMemoryIndirectKHR(VkCommandBuffer commandBuffer,
636+
const VkCopyMemoryIndirectInfoKHR* pCopyMemoryIndirectInfo) override;
637+
638+
void PreCmdCopyMemoryToImageIndirectKHR(
639+
VkCommandBuffer commandBuffer, const VkCopyMemoryToImageIndirectInfoKHR* pCopyMemoryToImageIndirectInfo) override;
640+
void PostCmdCopyMemoryToImageIndirectKHR(
641+
VkCommandBuffer commandBuffer, const VkCopyMemoryToImageIndirectInfoKHR* pCopyMemoryToImageIndirectInfo) override;
642+
633643
void PreCmdDebugMarkerBeginEXT(VkCommandBuffer commandBuffer, const VkDebugMarkerMarkerInfoEXT* pMarkerInfo) override;
634644
void PostCmdDebugMarkerBeginEXT(VkCommandBuffer commandBuffer, const VkDebugMarkerMarkerInfoEXT* pMarkerInfo) override;
635645

‎src/generated/command.cpp.inc‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1297,6 +1297,26 @@ void CommandBuffer::PostCmdBindDescriptorBufferEmbeddedSamplers2EXT(
12971297
if (instrument_all_commands_) WriteCommandEndCheckpoint(tracker_.GetCommands().back().id);
12981298
}
12991299

1300+
void CommandBuffer::PreCmdCopyMemoryIndirectKHR(VkCommandBuffer commandBuffer,
1301+
const VkCopyMemoryIndirectInfoKHR* pCopyMemoryIndirectInfo) {
1302+
tracker_.CmdCopyMemoryIndirectKHR(commandBuffer, pCopyMemoryIndirectInfo);
1303+
if (instrument_all_commands_) WriteCommandBeginCheckpoint(tracker_.GetCommands().back().id);
1304+
}
1305+
void CommandBuffer::PostCmdCopyMemoryIndirectKHR(VkCommandBuffer commandBuffer,
1306+
const VkCopyMemoryIndirectInfoKHR* pCopyMemoryIndirectInfo) {
1307+
if (instrument_all_commands_) WriteCommandEndCheckpoint(tracker_.GetCommands().back().id);
1308+
}
1309+
1310+
void CommandBuffer::PreCmdCopyMemoryToImageIndirectKHR(
1311+
VkCommandBuffer commandBuffer, const VkCopyMemoryToImageIndirectInfoKHR* pCopyMemoryToImageIndirectInfo) {
1312+
tracker_.CmdCopyMemoryToImageIndirectKHR(commandBuffer, pCopyMemoryToImageIndirectInfo);
1313+
if (instrument_all_commands_) WriteCommandBeginCheckpoint(tracker_.GetCommands().back().id);
1314+
}
1315+
void CommandBuffer::PostCmdCopyMemoryToImageIndirectKHR(
1316+
VkCommandBuffer commandBuffer, const VkCopyMemoryToImageIndirectInfoKHR* pCopyMemoryToImageIndirectInfo) {
1317+
if (instrument_all_commands_) WriteCommandEndCheckpoint(tracker_.GetCommands().back().id);
1318+
}
1319+
13001320
void CommandBuffer::PreCmdDebugMarkerBeginEXT(VkCommandBuffer commandBuffer,
13011321
const VkDebugMarkerMarkerInfoEXT* pMarkerInfo) {
13021322
tracker_.CmdDebugMarkerBeginEXT(commandBuffer, pMarkerInfo);

‎src/generated/command.h.inc‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -566,6 +566,16 @@ void PostCmdBindDescriptorBufferEmbeddedSamplers2EXT(
566566
VkCommandBuffer commandBuffer,
567567
const VkBindDescriptorBufferEmbeddedSamplersInfoEXT* pBindDescriptorBufferEmbeddedSamplersInfo);
568568

569+
void PreCmdCopyMemoryIndirectKHR(VkCommandBuffer commandBuffer,
570+
const VkCopyMemoryIndirectInfoKHR* pCopyMemoryIndirectInfo);
571+
void PostCmdCopyMemoryIndirectKHR(VkCommandBuffer commandBuffer,
572+
const VkCopyMemoryIndirectInfoKHR* pCopyMemoryIndirectInfo);
573+
574+
void PreCmdCopyMemoryToImageIndirectKHR(VkCommandBuffer commandBuffer,
575+
const VkCopyMemoryToImageIndirectInfoKHR* pCopyMemoryToImageIndirectInfo);
576+
void PostCmdCopyMemoryToImageIndirectKHR(VkCommandBuffer commandBuffer,
577+
const VkCopyMemoryToImageIndirectInfoKHR* pCopyMemoryToImageIndirectInfo);
578+
569579
void PreCmdDebugMarkerBeginEXT(VkCommandBuffer commandBuffer, const VkDebugMarkerMarkerInfoEXT* pMarkerInfo);
570580
void PostCmdDebugMarkerBeginEXT(VkCommandBuffer commandBuffer, const VkDebugMarkerMarkerInfoEXT* pMarkerInfo);
571581

‎src/generated/command_common.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,10 @@ const char *Command::GetCommandName(const Command &cmd) {
297297
return "vkCmdSetDescriptorBufferOffsets2EXT";
298298
case Command::Type::kCmdBindDescriptorBufferEmbeddedSamplers2EXT:
299299
return "vkCmdBindDescriptorBufferEmbeddedSamplers2EXT";
300+
case Command::Type::kCmdCopyMemoryIndirectKHR:
301+
return "vkCmdCopyMemoryIndirectKHR";
302+
case Command::Type::kCmdCopyMemoryToImageIndirectKHR:
303+
return "vkCmdCopyMemoryToImageIndirectKHR";
300304
case Command::Type::kCmdDebugMarkerBeginEXT:
301305
return "vkCmdDebugMarkerBeginEXT";
302306
case Command::Type::kCmdDebugMarkerEndEXT:

‎src/generated/command_common.h‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,8 @@ struct Command {
169169
kCmdPushDescriptorSetWithTemplate2KHR,
170170
kCmdSetDescriptorBufferOffsets2EXT,
171171
kCmdBindDescriptorBufferEmbeddedSamplers2EXT,
172+
kCmdCopyMemoryIndirectKHR,
173+
kCmdCopyMemoryToImageIndirectKHR,
172174
kCmdDebugMarkerBeginEXT,
173175
kCmdDebugMarkerEndEXT,
174176
kCmdDebugMarkerInsertEXT,
@@ -1191,6 +1193,16 @@ struct CmdBindDescriptorBufferEmbeddedSamplers2EXTArgs {
11911193
const VkBindDescriptorBufferEmbeddedSamplersInfoEXT* pBindDescriptorBufferEmbeddedSamplersInfo;
11921194
};
11931195

1196+
struct CmdCopyMemoryIndirectKHRArgs {
1197+
VkCommandBuffer commandBuffer;
1198+
const VkCopyMemoryIndirectInfoKHR* pCopyMemoryIndirectInfo;
1199+
};
1200+
1201+
struct CmdCopyMemoryToImageIndirectKHRArgs {
1202+
VkCommandBuffer commandBuffer;
1203+
const VkCopyMemoryToImageIndirectInfoKHR* pCopyMemoryToImageIndirectInfo;
1204+
};
1205+
11941206
struct CmdDebugMarkerBeginEXTArgs {
11951207
VkCommandBuffer commandBuffer;
11961208
const VkDebugMarkerMarkerInfoEXT* pMarkerInfo;

‎src/generated/command_printer.cpp‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2100,6 +2100,27 @@ void CommandPrinter::PrintCmdBindDescriptorBufferEmbeddedSamplers2EXTArgs(
21002100
}
21012101
}
21022102

2103+
void CommandPrinter::PrintCmdCopyMemoryIndirectKHRArgs(YAML::Emitter &os, const CmdCopyMemoryIndirectKHRArgs &args) {
2104+
os << YAML::Key << "pCopyMemoryIndirectInfo";
2105+
// pointer
2106+
if (args.pCopyMemoryIndirectInfo != nullptr) {
2107+
os << YAML::Value << *args.pCopyMemoryIndirectInfo;
2108+
} else {
2109+
os << YAML::Value << "nullptr";
2110+
}
2111+
}
2112+
2113+
void CommandPrinter::PrintCmdCopyMemoryToImageIndirectKHRArgs(YAML::Emitter &os,
2114+
const CmdCopyMemoryToImageIndirectKHRArgs &args) {
2115+
os << YAML::Key << "pCopyMemoryToImageIndirectInfo";
2116+
// pointer
2117+
if (args.pCopyMemoryToImageIndirectInfo != nullptr) {
2118+
os << YAML::Value << *args.pCopyMemoryToImageIndirectInfo;
2119+
} else {
2120+
os << YAML::Value << "nullptr";
2121+
}
2122+
}
2123+
21032124
void CommandPrinter::PrintCmdDebugMarkerBeginEXTArgs(YAML::Emitter &os, const CmdDebugMarkerBeginEXTArgs &args) {
21042125
os << YAML::Key << "pMarkerInfo";
21052126
// pointer
@@ -5366,6 +5387,20 @@ void CommandPrinter::PrintCommandParameters(YAML::Emitter &os, const Command &cm
53665387
}
53675388
break;
53685389

5390+
case Command::Type::kCmdCopyMemoryIndirectKHR:
5391+
if (cmd.parameters) {
5392+
auto args = reinterpret_cast<CmdCopyMemoryIndirectKHRArgs *>(cmd.parameters);
5393+
PrintCmdCopyMemoryIndirectKHRArgs(os, *args);
5394+
}
5395+
break;
5396+
5397+
case Command::Type::kCmdCopyMemoryToImageIndirectKHR:
5398+
if (cmd.parameters) {
5399+
auto args = reinterpret_cast<CmdCopyMemoryToImageIndirectKHRArgs *>(cmd.parameters);
5400+
PrintCmdCopyMemoryToImageIndirectKHRArgs(os, *args);
5401+
}
5402+
break;
5403+
53695404
case Command::Type::kCmdDebugMarkerBeginEXT:
53705405
if (cmd.parameters) {
53715406
auto args = reinterpret_cast<CmdDebugMarkerBeginEXTArgs *>(cmd.parameters);

‎src/generated/command_printer.h‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1025,6 +1025,13 @@ YAML::Emitter &operator<<(YAML::Emitter &os, const VkAttachmentFeedbackLoopInfoE
10251025
YAML::Emitter &operator<<(YAML::Emitter &os, const VkCalibratedTimestampInfoKHR &t);
10261026
YAML::Emitter &operator<<(YAML::Emitter &os, const VkSetDescriptorBufferOffsetsInfoEXT &t);
10271027
YAML::Emitter &operator<<(YAML::Emitter &os, const VkBindDescriptorBufferEmbeddedSamplersInfoEXT &t);
1028+
YAML::Emitter &operator<<(YAML::Emitter &os, const VkStridedDeviceAddressRangeKHR &t);
1029+
YAML::Emitter &operator<<(YAML::Emitter &os, const VkCopyMemoryIndirectCommandKHR &t);
1030+
YAML::Emitter &operator<<(YAML::Emitter &os, const VkCopyMemoryIndirectInfoKHR &t);
1031+
YAML::Emitter &operator<<(YAML::Emitter &os, const VkCopyMemoryToImageIndirectCommandKHR &t);
1032+
YAML::Emitter &operator<<(YAML::Emitter &os, const VkCopyMemoryToImageIndirectInfoKHR &t);
1033+
YAML::Emitter &operator<<(YAML::Emitter &os, const VkPhysicalDeviceCopyMemoryIndirectFeaturesKHR &t);
1034+
YAML::Emitter &operator<<(YAML::Emitter &os, const VkPhysicalDeviceCopyMemoryIndirectPropertiesKHR &t);
10281035
YAML::Emitter &operator<<(YAML::Emitter &os, const VkVideoEncodeIntraRefreshCapabilitiesKHR &t);
10291036
YAML::Emitter &operator<<(YAML::Emitter &os, const VkVideoEncodeSessionIntraRefreshCreateInfoKHR &t);
10301037
YAML::Emitter &operator<<(YAML::Emitter &os, const VkVideoEncodeIntraRefreshInfoKHR &t);
@@ -1532,6 +1539,10 @@ YAML::Emitter &operator<<(YAML::Emitter &os, const VkScreenSurfaceCreateInfoQNX
15321539
YAML::Emitter &operator<<(YAML::Emitter &os, const VkPhysicalDeviceColorWriteEnableFeaturesEXT &t);
15331540
YAML::Emitter &operator<<(YAML::Emitter &os, const VkPipelineColorWriteCreateInfoEXT &t);
15341541
YAML::Emitter &operator<<(YAML::Emitter &os, const VkPhysicalDevicePrimitivesGeneratedQueryFeaturesEXT &t);
1542+
YAML::Emitter &operator<<(YAML::Emitter &os, const VkPhysicalDeviceVideoEncodeRgbConversionFeaturesVALVE &t);
1543+
YAML::Emitter &operator<<(YAML::Emitter &os, const VkVideoEncodeRgbConversionCapabilitiesVALVE &t);
1544+
YAML::Emitter &operator<<(YAML::Emitter &os, const VkVideoEncodeProfileRgbConversionInfoVALVE &t);
1545+
YAML::Emitter &operator<<(YAML::Emitter &os, const VkVideoEncodeSessionRgbConversionCreateInfoVALVE &t);
15351546
YAML::Emitter &operator<<(YAML::Emitter &os, const VkPhysicalDeviceImageViewMinLodFeaturesEXT &t);
15361547
YAML::Emitter &operator<<(YAML::Emitter &os, const VkImageViewMinLodCreateInfoEXT &t);
15371548
YAML::Emitter &operator<<(YAML::Emitter &os, const VkPhysicalDeviceMultiDrawFeaturesEXT &t);
@@ -1587,10 +1598,7 @@ YAML::Emitter &operator<<(YAML::Emitter &os, const VkRenderPassStripeSubmitInfoA
15871598
YAML::Emitter &operator<<(YAML::Emitter &os, const VkPhysicalDeviceFragmentDensityMapOffsetFeaturesEXT &t);
15881599
YAML::Emitter &operator<<(YAML::Emitter &os, const VkPhysicalDeviceFragmentDensityMapOffsetPropertiesEXT &t);
15891600
YAML::Emitter &operator<<(YAML::Emitter &os, const VkRenderPassFragmentDensityMapOffsetEndInfoEXT &t);
1590-
YAML::Emitter &operator<<(YAML::Emitter &os, const VkCopyMemoryIndirectCommandNV &t);
1591-
YAML::Emitter &operator<<(YAML::Emitter &os, const VkCopyMemoryToImageIndirectCommandNV &t);
15921601
YAML::Emitter &operator<<(YAML::Emitter &os, const VkPhysicalDeviceCopyMemoryIndirectFeaturesNV &t);
1593-
YAML::Emitter &operator<<(YAML::Emitter &os, const VkPhysicalDeviceCopyMemoryIndirectPropertiesNV &t);
15941602
YAML::Emitter &operator<<(YAML::Emitter &os, const VkDecompressMemoryRegionNV &t);
15951603
YAML::Emitter &operator<<(YAML::Emitter &os, const VkPhysicalDeviceMemoryDecompressionFeaturesNV &t);
15961604
YAML::Emitter &operator<<(YAML::Emitter &os, const VkPhysicalDeviceMemoryDecompressionPropertiesNV &t);
@@ -2041,6 +2049,8 @@ class CommandPrinter {
20412049
const CmdSetDescriptorBufferOffsets2EXTArgs &args);
20422050
void PrintCmdBindDescriptorBufferEmbeddedSamplers2EXTArgs(
20432051
YAML::Emitter &os, const CmdBindDescriptorBufferEmbeddedSamplers2EXTArgs &args);
2052+
void PrintCmdCopyMemoryIndirectKHRArgs(YAML::Emitter &os, const CmdCopyMemoryIndirectKHRArgs &args);
2053+
void PrintCmdCopyMemoryToImageIndirectKHRArgs(YAML::Emitter &os, const CmdCopyMemoryToImageIndirectKHRArgs &args);
20442054
void PrintCmdDebugMarkerBeginEXTArgs(YAML::Emitter &os, const CmdDebugMarkerBeginEXTArgs &args);
20452055
void PrintCmdDebugMarkerEndEXTArgs(YAML::Emitter &os, const CmdDebugMarkerEndEXTArgs &args);
20462056
void PrintCmdDebugMarkerInsertEXTArgs(YAML::Emitter &os, const CmdDebugMarkerInsertEXTArgs &args);

0 commit comments

Comments
 (0)