AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update GrOp printouts

Browse Source 
Change-Id: I19ac4ec7849e5eaae1726a746ac2051d5861e12f
Reviewed-on: https://skia-review.googlesource.com/18304
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
This commit is contained in:
Robert Phillips 2017-06-01 08:46:00 -04:00 committed by Skia Commit-Bot
parent 5cc9da6bbc
commit 48567ac8ae
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/gpu/GrRenderTargetOpList.cpp
View File

@ -322,6 +322,8 @@ GrOp* GrRenderTargetOpList::recordOp(std::unique_ptr<GrOp> op,
void GrRenderTargetOpList::forwardCombine(const GrCaps& caps) {
SkASSERT(!this->isClosed());
GrOP_INFO("opList: %d ForwardCombine %d ops:\n", this->uniqueID(), fRecordedOps.count());
for (int i = 0; i < fRecordedOps.count() - 1; ++i) {
GrOp* op = fRecordedOps[i].fOp.get();
@ -332,21 +334,24 @@ void GrRenderTargetOpList::forwardCombine(const GrCaps& caps) {
if (this->combineIfPossible(fRecordedOps[i], candidate.fOp.get(),
candidate.fAppliedClip, &candidate.fDstProxy, caps)) {
GrOP_INFO("\t\tForward: Combining with (%s, opID: %u)\n", candidate.fOp->name(),
candidate.fOp->uniqueID());
GrOP_INFO("\t\t%d: (%s opID: %u) -> Combining with (%s, opID: %u)\n",
i, op->name(), op->uniqueID(),
candidate.fOp->name(), candidate.fOp->uniqueID());
GR_AUDIT_TRAIL_OPS_RESULT_COMBINED(fAuditTrail, op, candidate.fOp.get());
fRecordedOps[j].fOp = std::move(fRecordedOps[i].fOp);
break;
}
// Stop traversing if we would cause a painter's order violation.
if (!can_reorder(fRecordedOps[j].fOp->bounds(), op->bounds())) {
GrOP_INFO("\t\tForward: Intersects with (%s, opID: %u)\n", candidate.fOp->name(),
candidate.fOp->uniqueID());
GrOP_INFO("\t\t%d: (%s opID: %u) -> Intersects with (%s, opID: %u)\n",
i, op->name(), op->uniqueID(),
candidate.fOp->name(), candidate.fOp->uniqueID());
break;
}
++j;
if (j > maxCandidateIdx) {
GrOP_INFO("\t\tForward: Reached max lookahead or end of op array %d\n", i);
GrOP_INFO("\t\t%d: (%s opID: %u) -> Reached max lookahead or end of array\n",
i, op->name(), op->uniqueID());
break;
}
}

1
src/gpu/GrTextureOpList.h
View File

@ -24,7 +24,6 @@ struct SkIRect;
class GrTextureOpList final : public GrOpList {
public:
GrTextureOpList(GrResourceProvider*, GrTextureProxy*, GrAuditTrail*);
~GrTextureOpList() override;
/**