Merge GrOpList and GrRTOpList and rename to GrOpsTask.
Change-Id: I8f4f2218a30fd0541a8f79f7bb9850f9500cd243
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/236343
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
diff --git a/src/gpu/GrAuditTrail.cpp b/src/gpu/GrAuditTrail.cpp
index 609fe84..9c72acf 100644
--- a/src/gpu/GrAuditTrail.cpp
+++ b/src/gpu/GrAuditTrail.cpp
@@ -18,7 +18,7 @@
auditOp->fName = op->name();
auditOp->fBounds = op->bounds();
auditOp->fClientID = kGrAuditTrailInvalidID;
- auditOp->fOpListID = kGrAuditTrailInvalidID;
+ auditOp->fOpsTaskID = kGrAuditTrailInvalidID;
auditOp->fChildID = kGrAuditTrailInvalidID;
// consume the current stack trace if any
@@ -40,15 +40,15 @@
}
// Our algorithm doesn't bother to reorder inside of an OpNode so the ChildID will start at 0
- auditOp->fOpListID = fOpList.count();
+ auditOp->fOpsTaskID = fOpsTask.count();
auditOp->fChildID = 0;
// We use the op pointer as a key to find the OpNode we are 'glomming' ops onto
- fIDLookup.set(op->uniqueID(), auditOp->fOpListID);
+ fIDLookup.set(op->uniqueID(), auditOp->fOpsTaskID);
OpNode* opNode = new OpNode(proxyID);
opNode->fBounds = op->bounds();
opNode->fChildren.push_back(auditOp);
- fOpList.emplace_back(opNode);
+ fOpsTask.emplace_back(opNode);
}
void GrAuditTrail::opsCombined(const GrOp* consumer, const GrOp* consumed) {
@@ -56,22 +56,22 @@
int* indexPtr = fIDLookup.find(consumer->uniqueID());
SkASSERT(indexPtr);
int index = *indexPtr;
- SkASSERT(index < fOpList.count() && fOpList[index]);
- OpNode& consumerOp = *fOpList[index];
+ SkASSERT(index < fOpsTask.count() && fOpsTask[index]);
+ OpNode& consumerOp = *fOpsTask[index];
// Look up the op which will be glommed
int* consumedPtr = fIDLookup.find(consumed->uniqueID());
SkASSERT(consumedPtr);
int consumedIndex = *consumedPtr;
- SkASSERT(consumedIndex < fOpList.count() && fOpList[consumedIndex]);
- OpNode& consumedOp = *fOpList[consumedIndex];
+ SkASSERT(consumedIndex < fOpsTask.count() && fOpsTask[consumedIndex]);
+ OpNode& consumedOp = *fOpsTask[consumedIndex];
// steal all of consumed's ops
for (int i = 0; i < consumedOp.fChildren.count(); i++) {
Op* childOp = consumedOp.fChildren[i];
// set the ids for the child op
- childOp->fOpListID = index;
+ childOp->fOpsTaskID = index;
childOp->fChildID = consumerOp.fChildren.count();
consumerOp.fChildren.push_back(childOp);
}
@@ -79,15 +79,15 @@
// Update the bounds for the combineWith node
consumerOp.fBounds = consumer->bounds();
- // remove the old node from our opList and clear the combinee's lookup
+ // remove the old node from our opsTask and clear the combinee's lookup
// NOTE: because we can't change the shape of the oplist, we use a sentinel
- fOpList[consumedIndex].reset(nullptr);
+ fOpsTask[consumedIndex].reset(nullptr);
fIDLookup.remove(consumed->uniqueID());
}
-void GrAuditTrail::copyOutFromOpList(OpInfo* outOpInfo, int opListID) {
- SkASSERT(opListID < fOpList.count());
- const OpNode* bn = fOpList[opListID].get();
+void GrAuditTrail::copyOutFromOpsTask(OpInfo* outOpInfo, int opsTaskID) {
+ SkASSERT(opsTaskID < fOpsTask.count());
+ const OpNode* bn = fOpsTask[opsTaskID].get();
SkASSERT(bn);
outOpInfo->fBounds = bn->fBounds;
outOpInfo->fProxyUniqueID = bn->fProxyUniqueID;
@@ -105,30 +105,30 @@
// We track which oplistID we're currently looking at. If it changes, then we need to push
// back a new op info struct. We happen to know that ops are in sequential order in the
// oplist, otherwise we'd have to do more bookkeeping
- int currentOpListID = kGrAuditTrailInvalidID;
+ int currentOpsTaskID = kGrAuditTrailInvalidID;
for (int i = 0; i < (*opsLookup)->count(); i++) {
const Op* op = (**opsLookup)[i];
// Because we will copy out all of the ops associated with a given op list id everytime
// the id changes, we only have to update our struct when the id changes.
- if (kGrAuditTrailInvalidID == currentOpListID || op->fOpListID != currentOpListID) {
+ if (kGrAuditTrailInvalidID == currentOpsTaskID || op->fOpsTaskID != currentOpsTaskID) {
OpInfo& outOpInfo = outInfo->push_back();
// copy out all of the ops so the client can display them even if they have a
// different clientID
- this->copyOutFromOpList(&outOpInfo, op->fOpListID);
+ this->copyOutFromOpsTask(&outOpInfo, op->fOpsTaskID);
}
}
}
}
-void GrAuditTrail::getBoundsByOpListID(OpInfo* outInfo, int opListID) {
- this->copyOutFromOpList(outInfo, opListID);
+void GrAuditTrail::getBoundsByOpsTaskID(OpInfo* outInfo, int opsTaskID) {
+ this->copyOutFromOpsTask(outInfo, opsTaskID);
}
void GrAuditTrail::fullReset() {
SkASSERT(fEnabled);
- fOpList.reset();
+ fOpsTask.reset();
fIDLookup.reset();
// free all client ops
fClientIDLookup.foreach ([](const int&, Ops** ops) { delete *ops; });
@@ -152,7 +152,7 @@
void GrAuditTrail::toJson(SkJSONWriter& writer) const {
writer.beginObject();
- JsonifyTArray(writer, "Ops", fOpList);
+ JsonifyTArray(writer, "Ops", fOpsTask);
writer.endObject();
}
@@ -178,7 +178,7 @@
writer.beginObject();
writer.appendString("Name", fName.c_str());
writer.appendS32("ClientID", fClientID);
- writer.appendS32("OpListID", fOpListID);
+ writer.appendS32("OpsTaskID", fOpsTaskID);
writer.appendS32("ChildID", fChildID);
skrect_to_json(writer, "Bounds", fBounds);
if (fStackTrace.count()) {