Skip to content

Add support for VK_EXT_shader_object to FetchShaderFeedback #3919

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

Merged
baldurk merged 1 commit into from
Oct 9, 2026
+200 −114
Merged

Add support for VK_EXT_shader_object to FetchShaderFeedback #3919

Show file tree
Hide file tree
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
152 changes: 98 additions & 54 deletions renderdoc/driver/vulkan/vk_debug.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2742,8 +2742,9 @@ void VulkanDebugManager::UnlockReadbackBuffer()
}

void VulkanReplay::AllocAndAddReservedDescriptors(
const VulkanStatePipeline &pipe, AddedDescriptorData &patchedBufferData,
bool vertexPatchedToCompute, const rdcarray<VkDescriptorSetLayoutBinding> &newBindings)
const VulkanRenderState &state, const VulkanStatePipeline &pipe,
AddedDescriptorData &patchedBufferData, bool vertexPatchedToCompute,
const rdcarray<VkDescriptorSetLayoutBinding> &newBindings)
{
VkDevice dev = m_Device;
VulkanCreationInfo &creationInfo = m_pDriver->m_CreationInfo;
Expand Down Expand Up @@ -2802,11 +2803,33 @@ void VulkanReplay::AllocAndAddReservedDescriptors(
// bitmask's type list is.
rdcarray<rdcpair<size_t, uint32_t>> mutableBitmaskArrayRange;

const bool compute = pipe.bindPoint == VK_PIPELINE_BIND_POINT_COMPUTE;

size_t descSetLayoutsSize = 0;

if(pipe.shaderObject)
{
for(uint32_t stage = 0; stage < NumShaderStages; stage++)
{
if(compute && (ShaderStage)stage != ShaderStage::Compute)
continue;
if(!compute && (ShaderStage)stage == ShaderStage::Compute)
continue;

descSetLayoutsSize =
RDCMAX(descSetLayoutsSize,
creationInfo.m_ShaderObject[state.shaderObjects[stage]].descSetLayouts.size());
}
}
else
{
descSetLayoutsSize = pipeInfo.descSetLayouts.size();
}

// populate mutable bitmasks. This loop is the same as the one below which is more commented
for(size_t i = 0; i < setLayouts.size(); i++)
for(size_t i = 0; i < RDCMIN(descSetLayoutsSize, pipe.descSets.size()); i++)
{
if(i < pipeInfo.descSetLayouts.size() && i < pipe.descSets.size() &&
pipe.descSets[i].pipeLayout != ResourceId())
if(pipe.descSets[i].pipeLayout != ResourceId())
{
const VulkanCreationInfo::PipelineLayout &pipelineLayoutInfo =
creationInfo.m_PipelineLayout[pipe.descSets[i].pipeLayout];
Expand All @@ -2819,6 +2842,9 @@ void VulkanReplay::AllocAndAddReservedDescriptors(

for(size_t b = 0; b < origLayout.bindings.size(); b++)
{
if(origLayout.bindings[b].layoutDescType != VK_DESCRIPTOR_TYPE_MUTABLE_EXT)
continue;

uint64_t mutableBitmask = origLayout.mutableBitmasks[b];

int bitmaskIdx = mutablePoolsizeBitmask.indexOf(mutableBitmask);
Expand Down Expand Up @@ -2873,7 +2899,7 @@ void VulkanReplay::AllocAndAddReservedDescriptors(
// if there are fewer sets bound than were declared in the pipeline layout, only process the
// bound sets (as otherwise we'd fail to copy from them). Assume the application knew what it
// was doing and the other sets are statically unused.
setLayouts.resize(RDCMIN(pipe.descSets.size(), pipeInfo.descSetLayouts.size()));
setLayouts.resize(RDCMIN(pipe.descSets.size(), descSetLayoutsSize));

size_t boundDescs = setLayouts.size();

Expand Down Expand Up @@ -3037,7 +3063,7 @@ void VulkanReplay::AllocAndAddReservedDescriptors(

// if the shader had no descriptor sets at all, i will be invalid, so just skip and add a set
// with only our own bindings.
if(i < pipeInfo.descSetLayouts.size() && i < pipe.descSets.size() &&
if(i < descSetLayoutsSize && i < pipe.descSets.size() &&
pipe.descSets[i].pipeLayout != ResourceId())
{
const VulkanCreationInfo::PipelineLayout &pipelineLayoutInfo =
Expand Down Expand Up @@ -3423,7 +3449,7 @@ VulkanReplay::AddedDescriptorData VulkanReplay::PrepareExtraBufferDescriptor(
{
// create a duplicate set of descriptor sets, all visible to compute, with bindings shifted to
// account for new ones we need. This also copies the existing bindings into the new sets
AllocAndAddReservedDescriptors(srcPipeState, ret, vertexPatchedToCompute, newBindings);
AllocAndAddReservedDescriptors(state, srcPipeState, ret, vertexPatchedToCompute, newBindings);

// if the pool failed due to limits, it will be NULL so bail now
if(ret.descpool == VK_NULL_HANDLE)
Expand Down Expand Up @@ -3550,6 +3576,13 @@ VulkanReplay::AddedDescriptorData VulkanReplay::PrepareExtraBufferDescriptor(
dstPipeState.descSets[i].pipeLayout = GetResID(ret.pipeLayout);
dstPipeState.descSets[i].descSet = GetResID(ret.descSets[i]);
}

// when no pipeline is bound, we rely on the pipeline layout used by last bound descriptor set
// to reconstruct correct descriptor set bindings (see BindDescriptorSetsWithoutPipeline and
// BindDescriptorSetsForShaders). Here our descriptor sets have been patched and all bound sets
// share a pipeline layout.
if(dstPipeState.shaderObject && !vertexPatchedToCompute)
dstPipeState.lastBoundDescSet = 0;
}
else if(ret.pipeLayout != VK_NULL_HANDLE)
{
Expand Down Expand Up @@ -3597,6 +3630,7 @@ void VulkanReplay::PrepareStateForPatchedShader(
}

VkPipeline pipe = VK_NULL_HANDLE;
rdcarray<VkShaderEXT> shaderObjs = {};
if(pipelineId != ResourceId() && compute)
{
const rdcarray<uint32_t> &origSpirv =
Expand Down Expand Up @@ -3700,64 +3734,71 @@ void VulkanReplay::PrepareStateForPatchedShader(

modifiedstate.graphics.pipeline = GetResID(pipe);
}

rdcarray<VkShaderEXT> shaderObjs;

for(uint32_t i = 0; i < NumShaderStages; i++)
else
{
ResourceId shadId = modifiedstate.shaderObjects[i];
if(shadId == ResourceId())
continue;
for(uint32_t i = 0; i < NumShaderStages; i++)
{
if(compute && (ShaderStage)i != ShaderStage::Compute)
continue;
else if(!compute && (ShaderStage)i == ShaderStage::Compute)
continue;

const rdcarray<uint32_t> &origSpirv = c.m_ShaderModule[shadId].spirv.GetSPIRV();
rdcarray<uint32_t> modSpirv;
ResourceId shadId = modifiedstate.shaderObjects[i];
if(shadId == ResourceId())
continue;

VkShaderEXT shad = VK_NULL_HANDLE;
VkShaderCreateInfoEXT shadCreateinfo = {};
m_pDriver->GetShaderCache()->MakeShaderObjectInfo(shadCreateinfo, shadId);
const rdcarray<uint32_t> &origSpirv = c.m_ShaderModule[shadId].spirv.GetSPIRV();
rdcarray<uint32_t> modSpirv;

bool patched = stagePatchCallback(patchedBufferdata, shadCreateinfo.stage, shadCreateinfo.pName,
origSpirv, modSpirv, shadCreateinfo.pSpecializationInfo);
VkShaderEXT shad = VK_NULL_HANDLE;
VkShaderCreateInfoEXT shadCreateinfo = {};
m_pDriver->GetShaderCache()->MakeShaderObjectInfo(shadCreateinfo, shadId);

if(patched)
{
shadCreateinfo.pCode = modSpirv.data();
shadCreateinfo.codeSize = modSpirv.size() * sizeof(uint32_t);
}
else if(IsBinding(m_StorageMode))
{
modSpirv = origSpirv;
bool patched = stagePatchCallback(patchedBufferdata, shadCreateinfo.stage, shadCreateinfo.pName,
origSpirv, modSpirv, shadCreateinfo.pSpecializationInfo);

// if we're stealing a binding point, we need to patch all other shaders
rdcspv::Editor editor(modSpirv);
if(patched)
{
shadCreateinfo.pCode = modSpirv.data();
shadCreateinfo.codeSize = modSpirv.size() * sizeof(uint32_t);
}
else if(IsBinding(m_StorageMode))
{
modSpirv = origSpirv;

editor.Prepare();
editor.SetBufferStorageMode(m_StorageMode);
// if we're stealing a binding point, we need to patch all other shaders
{
rdcspv::Editor editor(modSpirv);

editor.OffsetBindingsToMatchReservation(patchedBufferdata.numNewBindings);
editor.Prepare();
editor.SetBufferStorageMode(m_StorageMode);

shadCreateinfo.pCode = modSpirv.data();
shadCreateinfo.codeSize = modSpirv.size() * sizeof(uint32_t);
}
else
{
shadCreateinfo.pCode = origSpirv.data();
shadCreateinfo.codeSize = origSpirv.size() * sizeof(uint32_t);
}
editor.OffsetBindingsToMatchReservation(patchedBufferdata.numNewBindings);
}

// if we're stealing a binding point, all shaders need updated descriptor sets
if(IsBinding(m_StorageMode))
{
shadCreateinfo.setLayoutCount = (uint32_t)patchedBufferdata.setLayouts.size();
shadCreateinfo.pSetLayouts = patchedBufferdata.setLayouts.data();
}
shadCreateinfo.pCode = modSpirv.data();
shadCreateinfo.codeSize = modSpirv.size() * sizeof(uint32_t);
}
else
{
shadCreateinfo.pCode = origSpirv.data();
shadCreateinfo.codeSize = origSpirv.size() * sizeof(uint32_t);
}

vkr = m_pDriver->vkCreateShadersEXT(dev, 1, &shadCreateinfo, NULL, &shad);
CHECK_VKR(m_pDriver, vkr);
// if we're stealing a binding point, all shaders need updated descriptor sets
if(IsBinding(m_StorageMode))
{
shadCreateinfo.setLayoutCount = (uint32_t)patchedBufferdata.setLayouts.size();
shadCreateinfo.pSetLayouts = patchedBufferdata.setLayouts.data();
}

shaderObjs.push_back(shad);
vkr = m_pDriver->vkCreateShadersEXT(dev, 1, &shadCreateinfo, NULL, &shad);
CHECK_VKR(m_pDriver, vkr);

modifiedstate.shaderObjects[i] = GetResID(shad);
shaderObjs.push_back(shad);

modifiedstate.shaderObjects[i] = GetResID(shad);
}
}

modifiedstate.subpassContents = VK_SUBPASS_CONTENTS_INLINE;
Expand Down Expand Up @@ -3813,7 +3854,10 @@ bool VulkanReplay::RunFeedbackAction(VkDeviceSize bufferSize, const ActionDescri

if(action->flags & ActionFlags::Dispatch)
{
modifiedstate.BindPipeline(m_pDriver, cmd, VulkanRenderState::BindCompute, true);
if(modifiedstate.compute.shaderObject)
modifiedstate.BindShaderObjects(m_pDriver, cmd, VulkanRenderState::BindCompute);
else
modifiedstate.BindPipeline(m_pDriver, cmd, VulkanRenderState::BindCompute, true);

ObjDisp(cmd)->CmdDispatch(Unwrap(cmd), action->dispatchDimension[0],
action->dispatchDimension[1], action->dispatchDimension[2]);
Expand Down
2 changes: 1 addition & 1 deletion renderdoc/driver/vulkan/vk_replay.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ class VulkanReplay : public IReplayDriver
const rdcfixedarray<uint32_t, 3> &groupid,
const rdcfixedarray<uint32_t, 3> &threadid);

void AllocAndAddReservedDescriptors(const VulkanStatePipeline &pipe,
void AllocAndAddReservedDescriptors(const VulkanRenderState &state, const VulkanStatePipeline &pipe,
AddedDescriptorData &patchedBufferData,
bool vertexPatchedToCompute,
const rdcarray<VkDescriptorSetLayoutBinding> &newBindings);
Expand Down
Loading
Loading