Add usage entries for discards. Closes #1951

This commit is contained in:
baldurk
2020-07-12 10:52:10 +01:00
parent 0d026a43d6
commit bc4a803605
10 changed files with 143 additions and 21 deletions
+11 -3
View File
@@ -998,6 +998,7 @@ QString ToQStr(const ResourceUsage usage, const GraphicsAPI apitype)
case ResourceUsage::Indirect: return lit("Indirect argument");
case ResourceUsage::Clear: return lit("Clear");
case ResourceUsage::Discard: return lit("Discard");
case ResourceUsage::GenMips: return lit("Generate Mips");
case ResourceUsage::Resolve: return lit("Resolve");
@@ -1056,6 +1057,7 @@ QString ToQStr(const ResourceUsage usage, const GraphicsAPI apitype)
case ResourceUsage::Indirect: return lit("Indirect argument");
case ResourceUsage::Clear: return lit("Clear");
case ResourceUsage::Discard: return lit("Discard");
case ResourceUsage::GenMips: return lit("Generate Mips");
case ResourceUsage::Resolve: return vk ? lit("Resolve") : lit("Framebuffer blit");
@@ -1247,7 +1249,6 @@ void CombineUsageEvents(ICaptureContext &ctx, const rdcarray<EventUsage> &usage,
{
start = end = u.eventId;
us = u.usage;
continue;
}
const DrawcallDescription *draw = ctx.GetDrawcall(u.eventId);
@@ -1288,8 +1289,15 @@ void CombineUsageEvents(ICaptureContext &ctx, const rdcarray<EventUsage> &usage,
if(distinct)
{
callback(start, end, us);
start = end = u.eventId;
us = u.usage;
if(end == u.eventId && us == u.usage)
{
start = 0;
}
else
{
start = end = u.eventId;
us = u.usage;
}
}
end = u.eventId;
+1 -1
View File
@@ -817,7 +817,7 @@ void TimelineBar::paintEvent(QPaintEvent *e)
{
pipranges[WriteUsage].push(pos, triRadius);
}
else if(use.usage == ResourceUsage::Clear)
else if(use.usage == ResourceUsage::Clear || use.usage == ResourceUsage::Discard)
{
pipranges[ClearUsage].push(pos, triRadius);
}