commit fd98c2c8716435fd630ea6d746d9cb6009fd93e3
author Brian Salomon <bsalomon@google.com> Tue Jul 31 17:25:29 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Aug 01 12:00:47 2018 +0000
tree 11339533913a40be443f2d4592cbcc61d960f532
parent f4bf7fc35d8364d7c4d261e829e5febf74c26b48

Make some GrSurfaceProxy and GrTextureProxy methods easier to access

Move peek[Surface|Texture|RenderTarget]() from GrSurfaceProxyPriv to
to GrSurfaceProxy.

Move proxyMipMapped(), textureType(), and hasRestrictedSampling()
from GrTextureProxyPriv to GrTextureProxy.

Change-Id: I259114d0508c4613d55f7f1faccac362fa6fb281
Reviewed-on: https://skia-review.googlesource.com/144641
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

src/gpu/ops/GrTextureOp.cpp

diff --git a/src/gpu/ops/GrTextureOp.cpp b/src/gpu/ops/GrTextureOp.cpp
index 9b2baeb..c69eecc 100644
--- a/src/gpu/ops/GrTextureOp.cpp
+++ b/src/gpu/ops/GrTextureOp.cpp
@@ -842,7 +842,7 @@
         float iw[kMaxTextures];
         float ih[kMaxTextures];
         for (int t = 0; t < fProxyCnt; ++t) {
-            const auto* texture = proxies[t]->priv().peekTexture();
+            const auto* texture = proxies[t]->peekTexture();
             iw[t] = 1.f / texture->width();
             ih[t] = 1.f / texture->height();
         }
@@ -986,7 +986,7 @@
             if (thatProxies[j]->config() != config) {
                 return -1;
             }
-            if (GrTexture* tex = thatProxies[j]->priv().peekTexture()) {
+            if (GrTexture* tex = thatProxies[j]->peekTexture()) {
                 if (tex->texturePriv().textureType() != GrTextureType::k2D) {
                     return -1;
                 }