Skip to content

Handle VkPipelineCreateFlags2 in disasm. #304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
doitsujin wants to merge 1 commit into
base: master
Choose a base branch
from
+25 −6
Open

Handle VkPipelineCreateFlags2 in disasm. #304

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 25 additions & 6 deletions cli/fossilize_disasm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,8 +369,8 @@ struct DisasmReplayer : StateCreatorInterface
if (device)
{
if (device->has_pipeline_stats())
const_cast<VkComputePipelineCreateInfo *>(create_info)->flags |=
VK_PIPELINE_CREATE_CAPTURE_STATISTICS_BIT_KHR | VK_PIPELINE_CREATE_CAPTURE_INTERNAL_REPRESENTATIONS_BIT_KHR;
add_pipeline_flags(create_info,
VK_PIPELINE_CREATE_2_CAPTURE_STATISTICS_BIT_KHR | VK_PIPELINE_CREATE_2_CAPTURE_INTERNAL_REPRESENTATIONS_BIT_KHR);

LOGI("Creating compute pipeline %0" PRIX64 "\n", hash);
if (vkCreateComputePipelines(device->get_device(), pipeline_cache, 1, create_info, nullptr, pipeline) !=
Expand Down Expand Up @@ -401,8 +401,8 @@ struct DisasmReplayer : StateCreatorInterface
if (device)
{
if (device->has_pipeline_stats())
const_cast<VkGraphicsPipelineCreateInfo *>(create_info)->flags |=
VK_PIPELINE_CREATE_CAPTURE_STATISTICS_BIT_KHR | VK_PIPELINE_CREATE_CAPTURE_INTERNAL_REPRESENTATIONS_BIT_KHR;
add_pipeline_flags(create_info,
VK_PIPELINE_CREATE_2_CAPTURE_STATISTICS_BIT_KHR | VK_PIPELINE_CREATE_2_CAPTURE_INTERNAL_REPRESENTATIONS_BIT_KHR);

LOGI("Creating graphics pipeline %0" PRIX64 "\n", hash);
if (vkCreateGraphicsPipelines(device->get_device(), pipeline_cache, 1, create_info, nullptr, pipeline) !=
Expand Down Expand Up @@ -434,8 +434,8 @@ struct DisasmReplayer : StateCreatorInterface
{
if (device->has_pipeline_stats())
{
const_cast<VkRayTracingPipelineCreateInfoKHR *>(create_info)->flags |=
VK_PIPELINE_CREATE_CAPTURE_STATISTICS_BIT_KHR | VK_PIPELINE_CREATE_CAPTURE_INTERNAL_REPRESENTATIONS_BIT_KHR;
add_pipeline_flags(create_info,
VK_PIPELINE_CREATE_2_CAPTURE_STATISTICS_BIT_KHR | VK_PIPELINE_CREATE_2_CAPTURE_INTERNAL_REPRESENTATIONS_BIT_KHR);
}

LOGI("Creating raytracing pipeline %0" PRIX64 "\n", hash);
Expand Down Expand Up @@ -482,6 +482,25 @@ struct DisasmReplayer : StateCreatorInterface
!filter_raytracing.empty() || !filter_modules.empty();
}

template<typename T>
static void add_pipeline_flags(const T* create_info, VkPipelineCreateFlags2 flags)
{
auto next = reinterpret_cast<const VkBaseInStructure *>(create_info->pNext);

while (next->sType != VK_STRUCTURE_TYPE_PIPELINE_CREATE_FLAGS_2_CREATE_INFO)
next = next->pNext;

if (next)
{
auto flags2_info = reinterpret_cast<const VkPipelineCreateFlags2CreateInfo *>(next);
const_cast<VkPipelineCreateFlags2CreateInfo *>(flags2_info)->flags |= flags;
}
else
{
const_cast<T *>(create_info)->flags |= VkPipelineCreateFlags(flags);
}
}

VulkanDevice *device;

vector<const VkSamplerCreateInfo *> sampler_infos;
Expand Down