Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 43940a1

Browse files
locke-lunarglocke-lunarg
committedMar 7, 2024·
Fix rebase error
These changes is because of Vulkan Headers update.
1 parent 240cd86 commit 43940a1

8 files changed

+431
-49
lines changed
 

‎external/Vulkan-Headers

Submodule Vulkan-Headers updated 24 files

‎framework/generated/generated_vulkan_consumer.h

+16
Original file line numberDiff line numberDiff line change
@@ -2218,6 +2218,16 @@ class VulkanConsumer : public VulkanConsumerBase
22182218
StructPointerDecoder<Decoded_VkExtent2D>* pFragmentSize,
22192219
PointerDecoder<VkFragmentShadingRateCombinerOpKHR>* combinerOps) {}
22202220

2221+
virtual void Process_vkCmdSetRenderingAttachmentLocationsKHR(
2222+
const ApiCallInfo& call_info,
2223+
format::HandleId commandBuffer,
2224+
StructPointerDecoder<Decoded_VkRenderingAttachmentLocationInfoKHR>* pLocationInfo) {}
2225+
2226+
virtual void Process_vkCmdSetRenderingInputAttachmentIndicesKHR(
2227+
const ApiCallInfo& call_info,
2228+
format::HandleId commandBuffer,
2229+
StructPointerDecoder<Decoded_VkRenderingInputAttachmentIndexInfoKHR>* pLocationInfo) {}
2230+
22212231
virtual void Process_vkWaitForPresentKHR(
22222232
const ApiCallInfo& call_info,
22232233
VkResult returnValue,
@@ -2474,6 +2484,12 @@ class VulkanConsumer : public VulkanConsumerBase
24742484
PointerDecoder<uint32_t>* pPropertyCount,
24752485
StructPointerDecoder<Decoded_VkCooperativeMatrixPropertiesKHR>* pProperties) {}
24762486

2487+
virtual void Process_vkCmdSetLineStippleKHR(
2488+
const ApiCallInfo& call_info,
2489+
format::HandleId commandBuffer,
2490+
uint32_t lineStippleFactor,
2491+
uint16_t lineStipplePattern) {}
2492+
24772493
virtual void Process_vkGetPhysicalDeviceCalibrateableTimeDomainsKHR(
24782494
const ApiCallInfo& call_info,
24792495
VkResult returnValue,

‎framework/generated/generated_vulkan_cpp_consumer.cpp

+67
Original file line numberDiff line numberDiff line change
@@ -8367,6 +8367,53 @@ void VulkanCppConsumer::Process_vkGetPhysicalDeviceFragmentShadingRatesKHR(
83678367
fprintf(file, "\t}\n");
83688368
Post_APICall(format::ApiCallId::ApiCall_vkGetPhysicalDeviceFragmentShadingRatesKHR);
83698369
}
8370+
void VulkanCppConsumer::Process_vkCmdSetRenderingAttachmentLocationsKHR(
8371+
const ApiCallInfo& call_info,
8372+
format::HandleId commandBuffer,
8373+
StructPointerDecoder<Decoded_VkRenderingAttachmentLocationInfoKHR>* pLocationInfo)
8374+
{
8375+
FILE* file = GetFrameFile();
8376+
fprintf(file, "\t{\n");
8377+
// commandBuffer
8378+
// pLocationInfo
8379+
std::stringstream stream_plocation_info;
8380+
std::string plocation_info_struct = GenerateStruct_VkRenderingAttachmentLocationInfoKHR(stream_plocation_info,
8381+
pLocationInfo->GetPointer(),
8382+
pLocationInfo->GetMetaStructPointer(),
8383+
*this);
8384+
fprintf(file, "%s", stream_plocation_info.str().c_str());
8385+
pfn_loader_.AddMethodName("vkCmdSetRenderingAttachmentLocationsKHR");
8386+
fprintf(file,
8387+
"\t\tloaded_vkCmdSetRenderingAttachmentLocationsKHR(%s, &%s);\n",
8388+
this->GetHandle(commandBuffer).c_str(),
8389+
plocation_info_struct.c_str());
8390+
fprintf(file, "\t}\n");
8391+
Post_APICall(format::ApiCallId::ApiCall_vkCmdSetRenderingAttachmentLocationsKHR);
8392+
}
8393+
8394+
void VulkanCppConsumer::Process_vkCmdSetRenderingInputAttachmentIndicesKHR(
8395+
const ApiCallInfo& call_info,
8396+
format::HandleId commandBuffer,
8397+
StructPointerDecoder<Decoded_VkRenderingInputAttachmentIndexInfoKHR>* pLocationInfo)
8398+
{
8399+
FILE* file = GetFrameFile();
8400+
fprintf(file, "\t{\n");
8401+
// commandBuffer
8402+
// pLocationInfo
8403+
std::stringstream stream_plocation_info;
8404+
std::string plocation_info_struct = GenerateStruct_VkRenderingInputAttachmentIndexInfoKHR(stream_plocation_info,
8405+
pLocationInfo->GetPointer(),
8406+
pLocationInfo->GetMetaStructPointer(),
8407+
*this);
8408+
fprintf(file, "%s", stream_plocation_info.str().c_str());
8409+
pfn_loader_.AddMethodName("vkCmdSetRenderingInputAttachmentIndicesKHR");
8410+
fprintf(file,
8411+
"\t\tloaded_vkCmdSetRenderingInputAttachmentIndicesKHR(%s, &%s);\n",
8412+
this->GetHandle(commandBuffer).c_str(),
8413+
plocation_info_struct.c_str());
8414+
fprintf(file, "\t}\n");
8415+
Post_APICall(format::ApiCallId::ApiCall_vkCmdSetRenderingInputAttachmentIndicesKHR);
8416+
}
83708417
void VulkanCppConsumer::Process_vkWaitForPresentKHR(
83718418
const ApiCallInfo& call_info,
83728419
VkResult returnValue,
@@ -9496,6 +9543,26 @@ void VulkanCppConsumer::Process_vkGetPhysicalDeviceCooperativeMatrixPropertiesKH
94969543
fprintf(file, "\t}\n");
94979544
Post_APICall(format::ApiCallId::ApiCall_vkGetPhysicalDeviceCooperativeMatrixPropertiesKHR);
94989545
}
9546+
void VulkanCppConsumer::Process_vkCmdSetLineStippleKHR(
9547+
const ApiCallInfo& call_info,
9548+
format::HandleId commandBuffer,
9549+
uint32_t lineStippleFactor,
9550+
uint16_t lineStipplePattern)
9551+
{
9552+
FILE* file = GetFrameFile();
9553+
fprintf(file, "\t{\n");
9554+
// commandBuffer
9555+
// lineStippleFactor
9556+
// lineStipplePattern
9557+
pfn_loader_.AddMethodName("vkCmdSetLineStippleKHR");
9558+
fprintf(file,
9559+
"\t\tloaded_vkCmdSetLineStippleKHR(%s, %u, %u);\n",
9560+
this->GetHandle(commandBuffer).c_str(),
9561+
lineStippleFactor,
9562+
lineStipplePattern);
9563+
fprintf(file, "\t}\n");
9564+
Post_APICall(format::ApiCallId::ApiCall_vkCmdSetLineStippleKHR);
9565+
}
94999566
void VulkanCppConsumer::Process_vkGetCalibratedTimestampsKHR(
95009567
const ApiCallInfo& call_info,
95019568
VkResult returnValue,

‎framework/generated/generated_vulkan_cpp_consumer.h

+14
Original file line numberDiff line numberDiff line change
@@ -2174,6 +2174,15 @@ class VulkanCppConsumer : public VulkanCppConsumerBase
21742174
format::HandleId physicalDevice,
21752175
PointerDecoder<uint32_t>* pFragmentShadingRateCount,
21762176
StructPointerDecoder<Decoded_VkPhysicalDeviceFragmentShadingRateKHR>* pFragmentShadingRates) override;
2177+
virtual void Process_vkCmdSetRenderingAttachmentLocationsKHR(
2178+
const ApiCallInfo& call_info,
2179+
format::HandleId commandBuffer,
2180+
StructPointerDecoder<Decoded_VkRenderingAttachmentLocationInfoKHR>* pLocationInfo) override;
2181+
2182+
virtual void Process_vkCmdSetRenderingInputAttachmentIndicesKHR(
2183+
const ApiCallInfo& call_info,
2184+
format::HandleId commandBuffer,
2185+
StructPointerDecoder<Decoded_VkRenderingInputAttachmentIndexInfoKHR>* pLocationInfo) override;
21772186
virtual void Process_vkWaitForPresentKHR(
21782187
const ApiCallInfo& call_info,
21792188
VkResult returnValue,
@@ -2418,6 +2427,11 @@ class VulkanCppConsumer : public VulkanCppConsumerBase
24182427
format::HandleId physicalDevice,
24192428
PointerDecoder<uint32_t>* pPropertyCount,
24202429
StructPointerDecoder<Decoded_VkCooperativeMatrixPropertiesKHR>* pProperties) override;
2430+
virtual void Process_vkCmdSetLineStippleKHR(
2431+
const ApiCallInfo& call_info,
2432+
format::HandleId commandBuffer,
2433+
uint32_t lineStippleFactor,
2434+
uint16_t lineStipplePattern) override;
24212435
virtual void Process_vkGetCalibratedTimestampsKHR(
24222436
const ApiCallInfo& call_info,
24232437
VkResult returnValue,

‎framework/generated/generated_vulkan_cpp_consumer_extension.cpp

+210-40
Large diffs are not rendered by default.

‎framework/generated/generated_vulkan_cpp_structs.h

+86-8
Large diffs are not rendered by default.

‎framework/generated/generated_vulkan_json_consumer.h

+16
Original file line numberDiff line numberDiff line change
@@ -2185,6 +2185,11 @@ class VulkanExportJsonConsumer : public VulkanExportJsonConsumerBase
21852185
StructPointerDecoder<Decoded_VkExtent2D>* pFragmentSize,
21862186
PointerDecoder<VkFragmentShadingRateCombinerOpKHR>* combinerOps) override;
21872187

2188+
virtual void Process_vkCmdSetRenderingAttachmentLocationsKHR(
2189+
const ApiCallInfo& call_info,
2190+
format::HandleId commandBuffer,
2191+
StructPointerDecoder<Decoded_VkRenderingAttachmentLocationInfoKHR>* pLocationInfo) override;
2192+
21882193
virtual void Process_vkCmdSetRenderingInputAttachmentIndicesKHR(
21892194
const ApiCallInfo& call_info,
21902195
format::HandleId commandBuffer,
@@ -2446,6 +2451,12 @@ class VulkanExportJsonConsumer : public VulkanExportJsonConsumerBase
24462451
PointerDecoder<uint32_t>* pPropertyCount,
24472452
StructPointerDecoder<Decoded_VkCooperativeMatrixPropertiesKHR>* pProperties) override;
24482453

2454+
virtual void Process_vkCmdSetLineStippleKHR(
2455+
const ApiCallInfo& call_info,
2456+
format::HandleId commandBuffer,
2457+
uint32_t lineStippleFactor,
2458+
uint16_t lineStipplePattern) override;
2459+
24492460
virtual void Process_vkGetPhysicalDeviceCalibrateableTimeDomainsKHR(
24502461
const ApiCallInfo& call_info,
24512462
VkResult returnValue,
@@ -3858,6 +3869,11 @@ class VulkanExportJsonConsumer : public VulkanExportJsonConsumerBase
38583869
uint32_t attachmentCount,
38593870
PointerDecoder<VkColorComponentFlags>* pColorWriteMasks) override;
38603871

3872+
virtual void Process_vkCmdSetTessellationDomainOriginEXT(
3873+
const ApiCallInfo& call_info,
3874+
format::HandleId commandBuffer,
3875+
VkTessellationDomainOrigin domainOrigin) override;
3876+
38613877
virtual void Process_vkCmdSetRasterizationStreamEXT(
38623878
const ApiCallInfo& call_info,
38633879
format::HandleId commandBuffer,

‎framework/generated/generated_vulkan_replay_consumer.h

+21
Original file line numberDiff line numberDiff line change
@@ -2218,6 +2218,16 @@ class VulkanReplayConsumer : public VulkanReplayConsumerBase
22182218
StructPointerDecoder<Decoded_VkExtent2D>* pFragmentSize,
22192219
PointerDecoder<VkFragmentShadingRateCombinerOpKHR>* combinerOps) override;
22202220

2221+
virtual void Process_vkCmdSetRenderingAttachmentLocationsKHR(
2222+
const ApiCallInfo& call_info,
2223+
format::HandleId commandBuffer,
2224+
StructPointerDecoder<Decoded_VkRenderingAttachmentLocationInfoKHR>* pLocationInfo) override;
2225+
2226+
virtual void Process_vkCmdSetRenderingInputAttachmentIndicesKHR(
2227+
const ApiCallInfo& call_info,
2228+
format::HandleId commandBuffer,
2229+
StructPointerDecoder<Decoded_VkRenderingInputAttachmentIndexInfoKHR>* pLocationInfo) override;
2230+
22212231
virtual void Process_vkWaitForPresentKHR(
22222232
const ApiCallInfo& call_info,
22232233
VkResult returnValue,
@@ -2474,6 +2484,12 @@ class VulkanReplayConsumer : public VulkanReplayConsumerBase
24742484
PointerDecoder<uint32_t>* pPropertyCount,
24752485
StructPointerDecoder<Decoded_VkCooperativeMatrixPropertiesKHR>* pProperties) override;
24762486

2487+
virtual void Process_vkCmdSetLineStippleKHR(
2488+
const ApiCallInfo& call_info,
2489+
format::HandleId commandBuffer,
2490+
uint32_t lineStippleFactor,
2491+
uint16_t lineStipplePattern) override;
2492+
24772493
virtual void Process_vkGetPhysicalDeviceCalibrateableTimeDomainsKHR(
24782494
const ApiCallInfo& call_info,
24792495
VkResult returnValue,
@@ -3886,6 +3902,11 @@ class VulkanReplayConsumer : public VulkanReplayConsumerBase
38863902
uint32_t attachmentCount,
38873903
PointerDecoder<VkColorComponentFlags>* pColorWriteMasks) override;
38883904

3905+
virtual void Process_vkCmdSetTessellationDomainOriginEXT(
3906+
const ApiCallInfo& call_info,
3907+
format::HandleId commandBuffer,
3908+
VkTessellationDomainOrigin domainOrigin) override;
3909+
38893910
virtual void Process_vkCmdSetRasterizationStreamEXT(
38903911
const ApiCallInfo& call_info,
38913912
format::HandleId commandBuffer,

0 commit comments

Comments
 (0)
Please sign in to comment.