lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-06 10:00:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle inlined shader modules created for compute PSOs. Closes #2826

Browse Source
This commit is contained in:
baldurk
2023-01-19 17:09:51 +00:00
parent 653028fa0d
commit 0042f6dfd9
1 changed files with 47 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/wrappers/vk_shader_funcs.cpp
+47 -4
View File
@@ -761,6 +761,8 @@ bool WrappedVulkan::Serialise_vkCreateComputePipelines(SerialiserType &ser, VkDe
VkResult ret = ObjDisp(device)->CreateComputePipelines(Unwrap(device), Unwrap(pipelineCache), 1,
unwrapped, NULL, &pipe);
AddResource(Pipeline, ResourceType::PipelineState, "Compute Pipeline");
if(ret != VK_SUCCESS)
{
SET_ERROR_RESULT(m_FailedReplayResult, ResultCode::APIReplayFailed,
@@ -787,11 +789,50 @@ bool WrappedVulkan::Serialise_vkCreateComputePipelines(SerialiserType &ser, VkDe
live = GetResourceManager()->WrapResource(Unwrap(device), pipe);
GetResourceManager()->AddLiveResource(Pipeline, pipe);
m_CreationInfo.m_Pipeline[live].Init(GetResourceManager(), m_CreationInfo, live, &CreateInfo);
VkPipelineShaderStageCreateInfo shadInstantiated = CreateInfo.stage;
// search for inline shader, and create shader module so we have objects to pull
// out for recreating the compute pipeline (and to replace for shader editing)
if(shadInstantiated.module == VK_NULL_HANDLE)
{
const VkShaderModuleCreateInfo *inlineShad =
(const VkShaderModuleCreateInfo *)FindNextStruct(
&shadInstantiated, VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO);
const VkDebugUtilsObjectNameInfoEXT *shadName =
(const VkDebugUtilsObjectNameInfoEXT *)FindNextStruct(
&shadInstantiated, VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT);
if(inlineShad)
{
vkCreateShaderModule(device, inlineShad, NULL, &shadInstantiated.module);
// this will be a replay ID, there is no equivalent original ID
ResourceId shadId = GetResID(shadInstantiated.module);
AddResource(shadId, ResourceType::Shader, "Shader Module");
DerivedResource(device, shadId);
DerivedResource(pipe, shadId);
if(shadName)
GetReplay()->GetResourceDesc(shadId).SetCustomName(shadName->pObjectName);
else
GetReplay()->GetResourceDesc(shadId).name =
GetReplay()->GetResourceDesc(Pipeline).name + " shader";
}
else
{
RDCERR("NULL module (entry %s) with no linked module create info",
shadInstantiated.pName);
}
}
VkComputePipelineCreateInfo shadInstantiatedInfo = CreateInfo;
shadInstantiatedInfo.stage = shadInstantiated;
m_CreationInfo.m_Pipeline[live].Init(GetResourceManager(), m_CreationInfo, live,
&shadInstantiatedInfo);
}
}
AddResource(Pipeline, ResourceType::PipelineState, "Compute Pipeline");
DerivedResource(device, Pipeline);
if(origCache != VK_NULL_HANDLE)
DerivedResource(origCache, Pipeline);
@@ -801,7 +842,8 @@ bool WrappedVulkan::Serialise_vkCreateComputePipelines(SerialiserType &ser, VkDe
DerivedResource(CreateInfo.basePipelineHandle, Pipeline);
}
DerivedResource(CreateInfo.layout, Pipeline);
DerivedResource(CreateInfo.stage.module, Pipeline);
if(CreateInfo.stage.module != VK_NULL_HANDLE)
DerivedResource(CreateInfo.stage.module, Pipeline);
}
return true;
@@ -882,7 +924,8 @@ VkResult WrappedVulkan::vkCreateComputePipelines(VkDevice device, VkPipelineCach
record->AddParent(layoutrecord);
VkResourceRecord *modulerecord = GetRecord(pCreateInfos[i].stage.module);
record->AddParent(modulerecord);
if(modulerecord)
record->AddParent(modulerecord);
}
else
{