diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-04-24 16:27:17 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-24 16:27:23 +0000 |
| commit | 4a395049a977d7e04515bad490365fe9ec9ffaab (patch) | |
| tree | efb32997bbe5376eb40dffa5a59d85a7e2c9b0c2 /src/gpu/GrOpList.cpp | |
| parent | 3e38d8205fc743ca956a265a3965ede2897b040a (diff) | |
Revert "Split up opLists (take 2)"
This reverts commit df2bf213649e0b2bcb9402548af9976bbdf7a218.
Reason for revert: Maybe AndroidOne timing out
Original change's description:
> Split up opLists (take 2)
>
> Reland of: https://skia-review.googlesource.com/c/11581/ (Split up opLists)
>
> https://skia-review.googlesource.com/c/13860/ (Make InstancedRendering more opList-splitting friendly) has landed so this should be good for another attempt.
>
> Change-Id: Icc9998196587510328e0a9ca1b2ce42013a86c6c
> Reviewed-on: https://skia-review.googlesource.com/13802
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Robert Phillips <robertphillips@google.com>
>
TBR=bsalomon@google.com,robertphillips@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I744f2a3145b294e5911862bb39d57ca33a1b9a5a
Reviewed-on: https://skia-review.googlesource.com/14184
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu/GrOpList.cpp')
| -rw-r--r-- | src/gpu/GrOpList.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gpu/GrOpList.cpp b/src/gpu/GrOpList.cpp index 5e618a21df..91c8c7942c 100644 --- a/src/gpu/GrOpList.cpp +++ b/src/gpu/GrOpList.cpp @@ -21,7 +21,9 @@ uint32_t GrOpList::CreateUniqueID() { } GrOpList::GrOpList(sk_sp<GrSurfaceProxy> surfaceProxy, GrAuditTrail* auditTrail) - : fTarget(surfaceProxy) + // MDB TODO: in the future opLists will own the GrSurfaceProxy they target. + // For now, preserve the status quo. + : fTarget(surfaceProxy.get()) , fAuditTrail(auditTrail) , fUniqueID(CreateUniqueID()) , fFlags(0) { |