lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-26 08:26:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve Vulkan byte range descriptions

Browse Source 
Renames the "cont.d" column in the Pipeline State window to
"Additional". This is a less confusing title then the contraction.

Adds a "(VK_WHOLE_SIZE)" annotation after the range if VK_WHOLE_SIZE
was used, and an "(empty view)" annotation if the range is empty.
These annotations are intended to help diagnose incorrectly filled
buffer descriptors.
This commit is contained in:
Wade Brainerd
2019-03-27 04:32:29 -07:00
committed by Baldur Karlsson
parent cc0069e72f
commit aed614a6aa
2 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp
+31 -31
View File
@@ -224,7 +224,7 @@ VulkanPipelineStateViewer::VulkanPipelineStateViewer(ICaptureContext &ctx,
res->setHeader(header);
res->setColumns({QString(), tr("Set"), tr("Binding"), tr("Type"), tr("Resource"),
tr("Contents"), tr("cont.d"), tr("Go")});
tr("Contents"), tr("Additional"), tr("Go")});
header->setColumnStretchHints({-1, -1, 2, 2, 2, 4, 4, -1});
res->setHoverIconColumn(7, action, action_hover);
@@ -579,6 +579,29 @@ bool VulkanPipelineStateViewer::showNode(bool usedSlot, bool filledSlot)
return false;
}
QString VulkanPipelineStateViewer::formatByteRange(const BufferDescription *buf,
const VKPipe::BindingElement *descriptorBind)
{
if(buf == NULL || descriptorBind == NULL)
return lit("-");
if(descriptorBind->byteSize == 0)
{
return tr("%1 - %2 (empty view)").arg(descriptorBind->byteOffset).arg(descriptorBind->byteOffset);
}
else if(descriptorBind->byteSize == UINT64_MAX)
{
return QFormatStr("%1 - %2 (VK_WHOLE_SIZE)")
.arg(descriptorBind->byteOffset)
.arg(descriptorBind->byteOffset + (buf->length - descriptorBind->byteOffset));
}
else
{
return QFormatStr("%1 - %2")
.arg(descriptorBind->byteOffset)
.arg(descriptorBind->byteOffset + descriptorBind->byteSize);
}
}
const VKPipe::Shader *VulkanPipelineStateViewer::stageForSender(QWidget *widget)
{
if(!m_Ctx.IsCaptureLoaded())
@@ -1087,15 +1110,11 @@ void VulkanPipelineStateViewer::addResourceRow(ShaderReflection *shaderDetails,
}
else
{
QString range = lit("-");
if(descriptorBind != NULL)
range =
QFormatStr("Viewing bytes %1 - %2").arg(descriptorBind->byteOffset).arg(descriptorLen);
node = new RDTreeWidgetItem({
QString(), setname, slotname, ToQStr(bindType),
descriptorBind ? descriptorBind->resourceResourceId : ResourceId(),
tr("%1 bytes").arg(len), range, QString(),
tr("%1 bytes").arg(len),
QFormatStr("Viewing bytes %1").arg(formatByteRange(buf, descriptorBind)), QString(),
});
node->setTag(tag);
@@ -1109,14 +1128,10 @@ void VulkanPipelineStateViewer::addResourceRow(ShaderReflection *shaderDetails,
}
else if(bindType == BindType::ReadOnlyTBuffer || bindType == BindType::ReadWriteTBuffer)
{
QString range = lit("-");
if(descriptorBind != NULL)
range = QFormatStr("bytes %1 - %2").arg(descriptorBind->byteOffset).arg(descriptorLen);
node = new RDTreeWidgetItem({
QString(), setname, slotname, ToQStr(bindType),
descriptorBind ? descriptorBind->resourceResourceId : ResourceId(), format, range,
QString(),
descriptorBind ? descriptorBind->resourceResourceId : ResourceId(), format,
QFormatStr("bytes %1").arg(formatByteRange(buf, descriptorBind)), QString(),
});
node->setTag(tag);
@@ -1392,8 +1407,7 @@ void VulkanPipelineStateViewer::addConstantBlockRow(ShaderReflection *shaderDeta
if(buf && length == UINT64_MAX)
length = buf->length - descriptorBind->byteOffset;
vecrange =
QFormatStr("%1 - %2").arg(descriptorBind->byteOffset).arg(descriptorBind->byteOffset + length);
vecrange = formatByteRange(buf, descriptorBind);
}
QString sizestr;
@@ -2965,14 +2979,7 @@ void VulkanPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, const VKPipe::
a = 0;
format = lit("-");
uint64_t length = descriptorBind.byteSize;
if(length == UINT64_MAX)
length = buf->length - descriptorBind.byteOffset;
viewParams = tr("Byte Range: %1 - %2")
.arg(descriptorBind.byteOffset)
.arg(descriptorBind.byteOffset + length);
viewParams = tr("Byte Range: %1").arg(formatByteRange(buf, &descriptorBind));
}
if(bind.type != BindType::Sampler)
@@ -3079,14 +3086,7 @@ void VulkanPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, const VKPipe::
a = 0;
format = lit("-");
uint64_t length = descriptorBind.byteSize;
if(length == UINT64_MAX)
length = buf->length - descriptorBind.byteOffset;
viewParams = tr("Byte Range: %1 - %2")
.arg(descriptorBind.byteOffset)
.arg(descriptorBind.byteOffset + length);
viewParams = tr("Byte Range: %1").arg(formatByteRange(buf, &descriptorBind));
}
rows.push_back({setname, slotname, name, ToQStr(bind.type), (qulonglong)w, h, d, arr,
qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.h
+1
View File
@@ -104,6 +104,7 @@ private:
void setEmptyRow(RDTreeWidgetItem *node);
void highlightIABind(int slot);
QString formatByteRange(const BufferDescription *buf, const VKPipe::BindingElement *descriptorBind);
QString formatMembers(int indent, const QString &nameprefix, const rdcarray<ShaderConstant> &vars);
const VKPipe::Shader *stageForSender(QWidget *widget);