mirror of
https://github.com/baldurk/renderdoc.git
synced 2026-11-14 01:41:10 +00:00
Rename 'draw' or 'drawcall' to action
* There's not a good accepted terminology for this kind of event, and for historical reasons 'drawcall' has been the accepted term, even though that can be quite confusing when a dispatch or a copy is a 'drawcall'. * This is particularly highlighted by the event browser filters where $draw() includes draws and dispatches, but $dispatch() only includes dispatches, it's hard to intuitively understand why $draw() matches all of these calls. * As a result we've defined the term 'action' to cover these types of events in the same way that we defined 'event' in the first place to mean a single atomic API call.
This commit is contained in:
283 files changed
+5374
-5320
No files matched your search
@@ -134,9 +134,9 @@ public:
|
||||
if(isEvent(parent))
|
||||
{
|
||||
const QList<PixelModification> &mods = getMods(parent);
|
||||
const DrawcallDescription *draw = m_Ctx.GetDrawcall(mods.front().eventId);
|
||||
const ActionDescription *action = m_Ctx.GetAction(mods.front().eventId);
|
||||
|
||||
if(draw && draw->flags & (DrawFlags::Clear | DrawFlags::PassBoundary))
|
||||
if(action && action->flags & (ActionFlags::Clear | ActionFlags::PassBoundary))
|
||||
return 0;
|
||||
|
||||
return mods.count();
|
||||
@@ -194,32 +194,32 @@ public:
|
||||
if(isEvent(index))
|
||||
{
|
||||
const QList<PixelModification> &mods = getMods(index);
|
||||
const DrawcallDescription *drawcall = m_Ctx.GetDrawcall(mods.front().eventId);
|
||||
if(!drawcall)
|
||||
const ActionDescription *action = m_Ctx.GetAction(mods.front().eventId);
|
||||
if(!action)
|
||||
return QVariant();
|
||||
|
||||
QString ret;
|
||||
QList<const DrawcallDescription *> drawstack;
|
||||
const DrawcallDescription *parent = drawcall->parent;
|
||||
QList<const ActionDescription *> actionstack;
|
||||
const ActionDescription *parent = action->parent;
|
||||
while(parent)
|
||||
{
|
||||
drawstack.push_back(parent);
|
||||
actionstack.push_back(parent);
|
||||
parent = parent->parent;
|
||||
}
|
||||
|
||||
if(!drawstack.isEmpty())
|
||||
if(!actionstack.isEmpty())
|
||||
{
|
||||
ret += lit("> ") + drawstack.back()->name;
|
||||
ret += lit("> ") + actionstack.back()->name;
|
||||
|
||||
if(drawstack.count() > 3)
|
||||
if(actionstack.count() > 3)
|
||||
ret += lit(" ...");
|
||||
|
||||
ret += lit("\n");
|
||||
|
||||
if(drawstack.count() > 2)
|
||||
ret += lit("> ") + drawstack[1]->name + lit("\n");
|
||||
if(drawstack.count() > 1)
|
||||
ret += lit("> ") + drawstack[0]->name + lit("\n");
|
||||
if(actionstack.count() > 2)
|
||||
ret += lit("> ") + actionstack[1]->name + lit("\n");
|
||||
if(actionstack.count() > 1)
|
||||
ret += lit("> ") + actionstack[0]->name + lit("\n");
|
||||
|
||||
ret += lit("\n");
|
||||
}
|
||||
@@ -231,7 +231,7 @@ public:
|
||||
{
|
||||
ret += tr("EID %1\n%2\nBound as UAV or copy - potential modification")
|
||||
.arg(mods.front().eventId)
|
||||
.arg(drawcall->name);
|
||||
.arg(action->name);
|
||||
|
||||
if(mods[0].preMod.col.uintValue == mods[0].postMod.col.uintValue)
|
||||
{
|
||||
@@ -249,7 +249,7 @@ public:
|
||||
|
||||
ret += tr("EID %1\n%2%3\n%4 Fragments touching pixel\n")
|
||||
.arg(mods.front().eventId)
|
||||
.arg(drawcall->name)
|
||||
.arg(action->name)
|
||||
.arg(failure)
|
||||
.arg(mods.count());
|
||||
}
|
||||
@@ -795,9 +795,9 @@ void PixelHistoryView::jumpToPrimitive(EventTag tag)
|
||||
|
||||
IBufferViewer *viewer = m_Ctx.GetMeshPreview();
|
||||
|
||||
const DrawcallDescription *draw = m_Ctx.CurDrawcall();
|
||||
const ActionDescription *action = m_Ctx.CurAction();
|
||||
|
||||
if(draw)
|
||||
if(action)
|
||||
{
|
||||
uint32_t vertIdx =
|
||||
RENDERDOC_VertexOffset(m_Ctx.CurPipelineState().GetPrimitiveTopology(), tag.primitive);
|
||||
|
||||
Reference in new issue
Block a user