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>

tests/GrMipMappedTest.cpp

diff --git a/tests/GrMipMappedTest.cpp b/tests/GrMipMappedTest.cpp
index 4c93714..d4571d1 100644
--- a/tests/GrMipMappedTest.cpp
+++ b/tests/GrMipMappedTest.cpp
@@ -73,9 +73,9 @@
                 return;
             }
 
-            REPORTER_ASSERT(reporter, proxy->priv().isInstantiated());
+            REPORTER_ASSERT(reporter, proxy->isInstantiated());
 
-            GrTexture* texture = proxy->priv().peekTexture();
+            GrTexture* texture = proxy->peekTexture();
             REPORTER_ASSERT(reporter, texture);
             if (!texture) {
                 gpu->deleteTestingOnlyBackendTexture(backendTex);
@@ -124,9 +124,9 @@
                 return;
             }
 
-            REPORTER_ASSERT(reporter, proxy->priv().isInstantiated());
+            REPORTER_ASSERT(reporter, proxy->isInstantiated());
 
-            sk_sp<GrTexture> texture = sk_ref_sp(proxy->priv().peekTexture());
+            sk_sp<GrTexture> texture = sk_ref_sp(proxy->peekTexture());
             REPORTER_ASSERT(reporter, texture);
             if (!texture) {
                 gpu->deleteTestingOnlyBackendTexture(backendTex);
@@ -156,17 +156,17 @@
 
             if (GrSurfaceProxy::LazyState::kNot != genProxy->lazyInstantiationState()) {
                 genProxy->priv().doLazyInstantiation(context->contextPriv().resourceProvider());
-            } else if (!genProxy->priv().isInstantiated()) {
+            } else if (!genProxy->isInstantiated()) {
                 genProxy->instantiate(context->contextPriv().resourceProvider());
             }
 
-            REPORTER_ASSERT(reporter, genProxy->priv().isInstantiated());
-            if (!genProxy->priv().isInstantiated()) {
+            REPORTER_ASSERT(reporter, genProxy->isInstantiated());
+            if (!genProxy->isInstantiated()) {
                 gpu->deleteTestingOnlyBackendTexture(backendTex);
                 return;
             }
 
-            GrTexture* genTexture = genProxy->priv().peekTexture();
+            GrTexture* genTexture = genProxy->peekTexture();
             REPORTER_ASSERT(reporter, genTexture);
             if (!genTexture) {
                 gpu->deleteTestingOnlyBackendTexture(backendTex);
@@ -260,7 +260,7 @@
             REPORTER_ASSERT(reporter, mipMapped == texProxy->mipMapped());
 
             texProxy->instantiate(resourceProvider);
-            GrTexture* texture = texProxy->priv().peekTexture();
+            GrTexture* texture = texProxy->peekTexture();
             REPORTER_ASSERT(reporter, mipMapped == texture->texturePriv().mipMapped());
 
             sk_sp<SkImage> image = surface->makeImageSnapshot();
@@ -272,7 +272,7 @@
             REPORTER_ASSERT(reporter, mipMapped == texProxy->mipMapped());
 
             texProxy->instantiate(resourceProvider);
-            texture = texProxy->priv().peekTexture();
+            texture = texProxy->peekTexture();
             REPORTER_ASSERT(reporter, mipMapped == texture->texturePriv().mipMapped());
 
             // Must flush the context to make sure all the cmds (copies, etc.) from above are sent