commit 18166eeaf2d088d494c4273b88107544166046fd
author Robert Phillips <robertphillips@google.com> Thu Jun 01 12:55:44 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jun 02 11:46:40 2017 +0000
tree a5653250b48b2c3c432127ac2e40d57008a5f117
parent dec4c0b29843d5de7d06c3998d919b3e3abecdf2

Omnibus: Push instantiation of GrTextures later (post TextureSampler)


Split into:
   https://skia-review.googlesource.com/c/10485/ (More GrSurfaceProxy-clean up)
   https://skia-review.googlesource.com/c/15819/ (Expand GrTextureProxy to handle highestFilterMode)
   https://skia-review.googlesource.com/c/16714/ (Switch ImageStorageAccess over to GrTextureProxies)
   https://skia-review.googlesource.com/c/16908/ (Convert DstTexture to DstProxy)

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

src/gpu/glsl/GrGLSLPrimitiveProcessor.cpp

diff --git a/src/gpu/glsl/GrGLSLPrimitiveProcessor.cpp b/src/gpu/glsl/GrGLSLPrimitiveProcessor.cpp
index d32766c..7c6b2d4 100644
--- a/src/gpu/glsl/GrGLSLPrimitiveProcessor.cpp
+++ b/src/gpu/glsl/GrGLSLPrimitiveProcessor.cpp
@@ -18,8 +18,8 @@
     SkMatrix combined;
     combined.setConcat(coordTransform.getMatrix(), localMatrix);
     if (coordTransform.normalize()) {
-        SkASSERT(coordTransform.texture());
-        combined.postIDiv(coordTransform.texture()->width(), coordTransform.texture()->height());
+        combined.postIDiv(coordTransform.peekTexture()->width(),
+                          coordTransform.peekTexture()->height());
     }
 
     if (coordTransform.reverseY()) {