From 7ce67db5643eb8ff1149c152ede1253d43e875d4 Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Tue, 18 Apr 2017 17:10:13 +0000 Subject: 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 > Reviewed-by: Brian Osman > 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 Commit-Queue: Robert Phillips --- include/private/GrSurfaceProxy.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/private/GrSurfaceProxy.h') 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; }; -- cgit v1.2.3