diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-04-18 17:10:13 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-18 17:10:22 +0000 |
| commit | 7ce67db5643eb8ff1149c152ede1253d43e875d4 (patch) | |
| tree | 31140f73dd7e37482ff16378c2432d950152667b /include | |
| parent | 73e597d0eddeaaa466101d5bb7da537c0066166a (diff) | |
Revert "Split up opLists"
This reverts commit bc8ee52d4649afdc972599e5ef2a2a543867985d.
Reason for revert: Instanced rendering is broken
Original change's description:
> Split up opLists
>
> Split into:
> https://skia-review.googlesource.com/c/11793/ (Remove lastProxy capability from GrSurface)
>
> Change-Id: I903ba30e17de4aab8cb0d2cc3281ae5c262142f9
> Reviewed-on: https://skia-review.googlesource.com/11581
> Commit-Queue: Robert Phillips <robertphillips@google.com>
> Reviewed-by: Brian Osman <brianosman@google.com>
>
TBR=egdaniel@google.com,robertphillips@google.com,brianosman@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: Ic3ae650630a09730d40da4a9587d9e25a9dd5e6c
Reviewed-on: https://skia-review.googlesource.com/13725
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/private/GrSurfaceProxy.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/private/GrSurfaceProxy.h b/include/private/GrSurfaceProxy.h index 35cff20dd4..efcec137c4 100644 --- a/include/private/GrSurfaceProxy.h +++ b/include/private/GrSurfaceProxy.h @@ -378,9 +378,9 @@ private: // This back-pointer is required so that we can add a dependancy between // the opList used to create the current contents of this surface // and the opList of a destination surface to which this one is being drawn or copied. - // This pointer is unreffed. OpLists own a ref on their surface proxies. GrOpList* fLastOpList; + typedef GrIORefProxy INHERITED; }; |