Report and display descriptor buffer state in pipeline view

This commit is contained in:
baldurk committed 2025-07-30 22:10:25 +01:00
1 parent 29242c2f31
commit 799a9a8452
6 files changed
+301 -16

No files matched your search

+1
View File
@@ -433,6 +433,7 @@ TEMPLATE_ARRAY_INSTANTIATE(rdcarray, DescriptorLogicalLocation)
TEMPLATE_ARRAY_INSTANTIATE(rdcarray, UsedDescriptor)
TEMPLATE_NAMESPACE_ARRAY_INSTANTIATE(rdcarray, VKPipe, DynamicOffset)
TEMPLATE_NAMESPACE_ARRAY_INSTANTIATE(rdcarray, VKPipe, DescriptorSet)
TEMPLATE_NAMESPACE_ARRAY_INSTANTIATE(rdcarray, VKPipe, DescriptorBuffer)
TEMPLATE_NAMESPACE_ARRAY_INSTANTIATE(rdcarray, VKPipe, ImageData)
TEMPLATE_NAMESPACE_ARRAY_INSTANTIATE(rdcarray, VKPipe, ImageLayout)
TEMPLATE_NAMESPACE_ARRAY_INSTANTIATE(rdcarray, VKPipe, RenderArea)
@@ -374,10 +374,12 @@ VulkanPipelineStateViewer::VulkanPipelineStateViewer(ICaptureContext &ctx,
RDHeaderView *header = new RDHeaderView(Qt::Horizontal, this);
desc->setHeader(header);
desc->setColumns({tr("Index"), tr("Layout"), tr("Bound Set"), tr("Go")});
header->setColumnStretchHints({-1, 4, 4, -1});
// Buffer / Set
desc->setColumns({tr("Index"), tr("Layout"), tr("Buffer"), tr("Buffer Offset"),
tr("Set Offset"), tr("Type"), tr("Go")});
header->setColumnStretchHints({-1, 4, 4, 2, 2, 2, -1});
desc->setHoverIconColumn(3, action, action_hover);
desc->setHoverIconColumn(6, action, action_hover);
desc->setClearSelectionOnFocusLoss(true);
desc->setInstantTooltips(true);
@@ -1736,14 +1738,94 @@ void VulkanPipelineStateViewer::setShaderState(const VKPipe::Pipeline &pipe,
.arg(ToQStr(pipe.pipelineFragmentLayoutResourceId)));
}
descSets->clear();
bool descBuf = false;
for(uint32_t i = 0; i < pipe.descriptorSets.size(); i++)
{
RDTreeWidgetItem *item =
new RDTreeWidgetItem({i, pipe.descriptorSets[i].layoutResourceId,
pipe.descriptorSets[i].descriptorSetResourceId, QString()});
item->setTag(i);
descSets->addTopLevelItem(item);
if(pipe.descriptorSets[i].descriptorBufferIndex >= 0)
{
descBuf = true;
break;
}
}
if(descBuf)
{
descSets->setHeaderText(2, tr(" Buffer"));
descSets->header()->showSection(3); // buffer offset
descSets->header()->showSection(4); // set offset
descSets->header()->showSection(5); // type
}
else
{
descSets->setHeaderText(2, tr("Set"));
descSets->header()->hideSection(3); // buffer offset
descSets->header()->hideSection(4); // set offset
descSets->header()->hideSection(5); // type
}
descSets->clear();
if(descBuf)
{
for(uint32_t i = 0; i < pipe.descriptorSets.size(); i++)
{
RDTreeWidgetItem *item = new RDTreeWidgetItem(
{i, pipe.descriptorSets[i].layoutResourceId, QString(), QString(),
qulonglong(pipe.descriptorSets[i].descriptorBufferByteOffset), QString(), QString()});
item->setTag(i);
if(pipe.descriptorSets[i].descriptorBufferEmbeddedSamplers)
{
item->setText(2, tr("Embedded Samplers"));
item->setText(4, QString());
item->setText(5, tr("Immutable Samplers"));
}
else if(pipe.descriptorSets[i].pushDescriptor)
{
item->setText(2, tr("Bufferless"));
for(size_t b = 0; b < pipe.descriptorBuffers.size(); b++)
if(pipe.descriptorBuffers[b].pushBuffer != ResourceId())
item->setText(2, ToQStr(pipe.descriptorBuffers[b].pushBuffer));
item->setText(4, QString());
item->setText(5, tr("Push Descriptors"));
}
else if(pipe.descriptorSets[i].descriptorBufferIndex < 0 ||
pipe.descriptorSets[i].descriptorBufferIndex >= pipe.descriptorBuffers.count())
{
setEmptyRow(item);
}
else
{
const VKPipe::DescriptorBuffer &buf =
pipe.descriptorBuffers[pipe.descriptorSets[i].descriptorBufferIndex];
item->setText(2, buf.buffer);
item->setText(3, qulonglong(buf.offset));
QString type = tr("None");
if(buf.resourceBuffer && buf.samplerBuffer)
type = tr("Resources+Samplers");
else if(buf.resourceBuffer)
type = tr("Resources");
else if(buf.samplerBuffer)
type = tr("Samplers");
item->setText(5, type);
}
descSets->addTopLevelItem(item);
}
}
else
{
for(uint32_t i = 0; i < pipe.descriptorSets.size(); i++)
{
RDTreeWidgetItem *item = new RDTreeWidgetItem({i, pipe.descriptorSets[i].layoutResourceId,
pipe.descriptorSets[i].descriptorSetResourceId,
QString(), QString(), QString(), QString()});
item->setTag(i);
descSets->addTopLevelItem(item);
}
}
}
@@ -3178,11 +3260,31 @@ void VulkanPipelineStateViewer::descSet_itemActivated(RDTreeWidgetItem *item, in
stage->stage == ShaderStage::Compute ? m_Ctx.CurVulkanPipelineState()->compute.descriptorSets
: m_Ctx.CurVulkanPipelineState()->graphics.descriptorSets;
const rdcarray<VKPipe::DescriptorBuffer> &descBufs =
stage->stage == ShaderStage::Compute
? m_Ctx.CurVulkanPipelineState()->compute.descriptorBuffers
: m_Ctx.CurVulkanPipelineState()->graphics.descriptorBuffers;
if(index < descSets.count())
{
IDescriptorViewer *viewer = m_Ctx.ViewDescriptorStore(descSets[index].descriptorSetResourceId);
if(descSets[index].descriptorBufferIndex >= 0)
{
if(descSets[index].descriptorBufferIndex < descBufs.count())
{
IBufferViewer *viewer =
m_Ctx.ViewBuffer(descBufs[descSets[index].descriptorBufferIndex].offset +
descSets[index].descriptorBufferByteOffset,
0, descBufs[descSets[index].descriptorBufferIndex].buffer);
m_Ctx.AddDockWindow(viewer->Widget(), DockReference::AddTo, this);
m_Ctx.AddDockWindow(viewer->Widget(), DockReference::AddTo, this);
}
}
else
{
IDescriptorViewer *viewer = m_Ctx.ViewDescriptorStore(descSets[index].descriptorSetResourceId);
m_Ctx.AddDockWindow(viewer->Widget(), DockReference::AddTo, this);
}
}
}
+103 -1
View File
@@ -85,10 +85,19 @@ struct DescriptorSet
return pushDescriptor < o.pushDescriptor;
return false;
}
DOCUMENT("The :class:`ResourceId` of the descriptor set layout that matches this set.");
ResourceId layoutResourceId;
DOCUMENT("The :class:`ResourceId` of the descriptor set object.");
DOCUMENT(R"(The :class:`ResourceId` of the descriptor set object, if a real descriptor set is bound.
.. note::
If using descriptor buffers this value may be unset, see :data:`descriptorBufferIndex`.
:type: ResourceId
)");
ResourceId descriptorSetResourceId;
DOCUMENT("Indicates if this is a virtual 'push' descriptor set.");
bool pushDescriptor = false;
@@ -101,6 +110,92 @@ of their descriptors.
:type: List[VKDynamicOffset]
)");
rdcarray<DynamicOffset> dynamicOffsets;
DOCUMENT(R"(The index of the descriptor buffer to be used, or ``-1`` if no descriptor buffer is used.
:type: int
)");
int32_t descriptorBufferIndex = -1;
DOCUMENT(R"(The byte offset from the start of the descriptor buffer at index :data:`descriptorBufferIndex` where this set's data is.
:type: int
)");
uint64_t descriptorBufferByteOffset = 0;
DOCUMENT(R"(Indicates if this is a virtual descriptor set for binding embedded immutable samplers.
:type: bool
)");
bool descriptorBufferEmbeddedSamplers = false;
};
DOCUMENT("A single descriptor buffer binding.");
struct DescriptorBuffer
{
DOCUMENT("");
DescriptorBuffer() = default;
DescriptorBuffer(const DescriptorBuffer &) = default;
DescriptorBuffer &operator=(const DescriptorBuffer &) = default;
bool operator==(const DescriptorBuffer &o) const
{
return buffer == o.buffer && offset == o.offset && pushDescriptor == o.pushDescriptor &&
pushBuffer == o.pushBuffer && resourceBuffer == o.resourceBuffer &&
samplerBuffer == o.samplerBuffer;
}
bool operator<(const DescriptorBuffer &o) const
{
if(!(buffer == o.buffer))
return buffer < o.buffer;
if(!(offset == o.offset))
return offset < o.offset;
if(!(pushDescriptor == o.pushDescriptor))
return pushDescriptor < o.pushDescriptor;
if(!(pushBuffer == o.pushBuffer))
return pushBuffer < o.pushBuffer;
if(!(resourceBuffer == o.resourceBuffer))
return resourceBuffer < o.resourceBuffer;
if(!(samplerBuffer == o.samplerBuffer))
return samplerBuffer < o.samplerBuffer;
return false;
}
DOCUMENT(R"(The :class:`ResourceId` of the buffer object being bound.
:type: ResourceId
)");
ResourceId buffer;
DOCUMENT(R"(The offset in bytes from the base of the buffer object to the start of the bound region.
:type: int
)");
uint64_t offset = 0;
DOCUMENT(R"(Indicates if this is the 'push' descriptor buffer.
:type: bool
)");
bool pushDescriptor = false;
DOCUMENT(R"(For push descriptors where a buffer is required, the :class:`ResourceId` of the push buffer object.
:type: ResourceId
)");
ResourceId pushBuffer;
DOCUMENT(R"(Indicates if this buffer can contain resources (buffers and images).
:type: bool
)");
bool resourceBuffer = false;
DOCUMENT(R"(Indicates if this buffer can contain samplers.
:type: bool
)");
bool samplerBuffer = false;
};
DOCUMENT("Describes the object and descriptor set bindings of a Vulkan pipeline object.");
@@ -133,6 +228,12 @@ When not using pipeline libraries, this will be identical to :data:`pipelinePreR
:type: List[VKDescriptorSet]
)");
rdcarray<DescriptorSet> descriptorSets;
DOCUMENT(R"(The bound descriptor buffers.
:type: List[VKDescriptorBuffer]
)");
rdcarray<DescriptorBuffer> descriptorBuffers;
};
DOCUMENT("Describes the Vulkan index buffer binding.")
@@ -1189,6 +1290,7 @@ struct State
DECLARE_REFLECTION_STRUCT(VKPipe::DynamicOffset);
DECLARE_REFLECTION_STRUCT(VKPipe::DescriptorSet);
DECLARE_REFLECTION_STRUCT(VKPipe::DescriptorBuffer);
DECLARE_REFLECTION_STRUCT(VKPipe::Pipeline);
DECLARE_REFLECTION_STRUCT(VKPipe::IndexBuffer);
DECLARE_REFLECTION_STRUCT(VKPipe::InputAssembly);
+60 -1
View File
@@ -2108,6 +2108,7 @@ void VulkanReplay::SavePipelineState(uint32_t eventId)
destSet.dynamicOffsets.clear();
// this could be either an unbound set, or descriptor buffers (which can't use dynamic offsets anyway)
if(sourceSet == ResourceId())
continue;
@@ -2145,6 +2146,7 @@ void VulkanReplay::SavePipelineState(uint32_t eventId)
}
}
// store the sets and descriptor buffers themselves
{
rdcarray<VKPipe::DescriptorSet> *dsts[] = {
&ret.graphics.descriptorSets,
@@ -2164,9 +2166,46 @@ void VulkanReplay::SavePipelineState(uint32_t eventId)
{
for(size_t i = 0; i < srcs[p]->size(); i++)
{
ResourceId sourceSet = (*srcs[p])[i].descSet;
const VulkanStatePipeline::DescriptorAndOffsets &setBindingInfo = (*srcs[p])[i];
VKPipe::DescriptorSet &destSet = (*dsts[p])[i];
if(setBindingInfo.descBufferIdx != ~0U)
{
destSet.descriptorSetResourceId = ResourceId();
destSet.pushDescriptor = false;
destSet.layoutResourceId =
rm->GetOriginalID(c.m_PipelineLayout[setBindingInfo.pipeLayout].descSetLayouts[i]);
destSet.dynamicOffsets.clear();
destSet.descriptorBufferIndex = (int)setBindingInfo.descBufferIdx;
destSet.descriptorBufferByteOffset = setBindingInfo.descBufferOffset;
destSet.descriptorBufferEmbeddedSamplers = false;
continue;
}
else if(setBindingInfo.descBufferEmbeddedSamplers)
{
destSet.descriptorSetResourceId = ResourceId();
destSet.pushDescriptor = false;
destSet.layoutResourceId =
rm->GetOriginalID(c.m_PipelineLayout[setBindingInfo.pipeLayout].descSetLayouts[i]);
destSet.dynamicOffsets.clear();
destSet.descriptorBufferIndex = -1;
destSet.descriptorBufferByteOffset = 0;
destSet.descriptorBufferEmbeddedSamplers = true;
continue;
}
ResourceId sourceSet = setBindingInfo.descSet;
destSet.descriptorBufferIndex = -1;
destSet.descriptorBufferByteOffset = 0;
destSet.descriptorBufferEmbeddedSamplers = false;
if(sourceSet == ResourceId())
{
destSet.descriptorSetResourceId = ResourceId();
@@ -2184,6 +2223,26 @@ void VulkanReplay::SavePipelineState(uint32_t eventId)
destSet.layoutResourceId = rm->GetOriginalID(layoutId);
}
}
ret.compute.descriptorBuffers.resize(state.descBufs.size());
for(size_t i = 0; i < state.descBufs.size(); i++)
{
ret.compute.descriptorBuffers[i].resourceBuffer =
(state.descBufs[i].usage & VK_BUFFER_USAGE_RESOURCE_DESCRIPTOR_BUFFER_BIT_EXT) != 0;
ret.compute.descriptorBuffers[i].samplerBuffer =
(state.descBufs[i].usage & VK_BUFFER_USAGE_SAMPLER_DESCRIPTOR_BUFFER_BIT_EXT) != 0;
ret.compute.descriptorBuffers[i].pushDescriptor =
(state.descBufs[i].usage & VK_BUFFER_USAGE_PUSH_DESCRIPTORS_DESCRIPTOR_BUFFER_BIT_EXT) != 0;
ret.compute.descriptorBuffers[i].pushBuffer = rm->GetOriginalID(state.descBufs[i].pushBuffer);
ResourceId id;
m_pDriver->GetResIDFromAddr(state.descBufs[i].address, id,
ret.compute.descriptorBuffers[i].offset);
ret.compute.descriptorBuffers[i].buffer = rm->GetOriginalID(id);
}
// these are not actually pipeline specific but for organisation/ease we store them there
ret.graphics.descriptorBuffers = ret.compute.descriptorBuffers;
}
// image layouts
@@ -203,6 +203,7 @@ public:
ResourceId sourceSet = srcData.descSet;
const uint32_t *srcOffset = srcData.offsets.begin();
// this could be either an unbound set, or descriptor buffers (which can't use dynamic offsets anyway)
if(sourceSet == ResourceId())
continue;
+23 -3
View File
@@ -1924,6 +1924,21 @@ void DoSerialise(SerialiserType &ser, VKPipe::DynamicOffset &el)
SIZE_CHECK(16);
}
template <typename SerialiserType>
void DoSerialise(SerialiserType &ser, VKPipe::DescriptorBuffer &el)
{
SERIALISE_MEMBER(buffer);
SERIALISE_MEMBER(offset);
SERIALISE_MEMBER(pushDescriptor);
SERIALISE_MEMBER(pushBuffer);
SERIALISE_MEMBER(resourceBuffer);
SERIALISE_MEMBER(samplerBuffer);
SIZE_CHECK(40);
}
template <typename SerialiserType>
void DoSerialise(SerialiserType &ser, VKPipe::DescriptorSet &el)
{
@@ -1933,7 +1948,11 @@ void DoSerialise(SerialiserType &ser, VKPipe::DescriptorSet &el)
SERIALISE_MEMBER(dynamicOffsets);
SIZE_CHECK(48);
SERIALISE_MEMBER(descriptorBufferIndex);
SERIALISE_MEMBER(descriptorBufferByteOffset);
SERIALISE_MEMBER(descriptorBufferEmbeddedSamplers);
SIZE_CHECK(72);
}
template <typename SerialiserType>
@@ -1946,8 +1965,9 @@ void DoSerialise(SerialiserType &ser, VKPipe::Pipeline &el)
SERIALISE_MEMBER(flags);
SERIALISE_MEMBER(descriptorSets);
SERIALISE_MEMBER(descriptorBuffers);
SIZE_CHECK(64);
SIZE_CHECK(88);
}
template <typename SerialiserType>
@@ -2297,7 +2317,7 @@ void DoSerialise(SerialiserType &ser, VKPipe::State &el)
SERIALISE_MEMBER(conditionalRendering);
SIZE_CHECK(1880);
SIZE_CHECK(1928);
}
#pragma endregion Vulkan pipeline state