commit acaa607328fb0dfac0894d4a2fcdead520e696b3
author Robert Phillips <robertphillips@google.com> Fri Jul 28 10:54:53 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jul 28 15:22:57 2017 +0000
tree 39ddb2a9f9bc56c861b2ba37edd20dadb2652159
parent 5d169ed337c009175783f77f56b5d96f0e3ece67

Make op-level texture uploading be GrProxy-based

Change-Id: I898d626eff059fa7c687357b536d09409a174358
Reviewed-on: https://skia-review.googlesource.com/28001
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

src/gpu/GrDrawOpAtlas.h

diff --git a/src/gpu/GrDrawOpAtlas.h b/src/gpu/GrDrawOpAtlas.h
index 1119e3d..87bd695 100644
--- a/src/gpu/GrDrawOpAtlas.h
+++ b/src/gpu/GrDrawOpAtlas.h
@@ -216,7 +216,7 @@
         void setLastUploadToken(GrDrawOpUploadToken token) { fLastUpload = token; }
         void setLastUseToken(GrDrawOpUploadToken token) { fLastUse = token; }
 
-        void uploadToTexture(GrDrawOp::WritePixelsFn&, GrTexture* texture);
+        void uploadToTexture(GrDrawOp::WritePixelsFn&, GrTextureProxy*);
         void resetRects();
 
     private: