commit 3743013f755d23c215d852af7d829c3cd74f34a2
author Robert Phillips <robertphillips@google.com> Wed Nov 09 06:50:43 2016 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Nov 09 12:20:50 2016 +0000
tree f685cc82d3dc40153863552b55c2519582c84d15
parent 7b8400dad2f82dcc6ed3c7cc1707ebaf85f04840

Consolidate GrSurfaceProxy Make methods

I think GrSurfaceDesc is still the most compact way to communicate the deferred GrSurface's settings to the Proxy but this CL, at least, reduces where it is used.

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4559

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

tests/ProxyTest.cpp

diff --git a/tests/ProxyTest.cpp b/tests/ProxyTest.cpp
index 270f787..17a3dad 100644
--- a/tests/ProxyTest.cpp
+++ b/tests/ProxyTest.cpp
@@ -104,27 +104,28 @@
                             desc.fSampleCnt = numSamples;
 
                             if (renderable) {
-                                sk_sp<GrRenderTargetProxy> rtProxy(GrRenderTargetProxy::Make(
+                                sk_sp<GrSurfaceProxy> sProxy(GrSurfaceProxy::MakeDeferred(
                                                                                 caps, desc, 
                                                                                 fit, budgeted));
-                                check_surface(reporter, rtProxy.get(), origin,
+                                check_surface(reporter, sProxy.get(), origin,
                                               widthHeight, widthHeight, config,
                                               SK_InvalidUniqueID, budgeted);
-                                check_rendertarget(reporter, provider, rtProxy.get(), 
+                                check_rendertarget(reporter, provider,
+                                                   sProxy->asRenderTargetProxy(), 
                                                    numSamples, fit);
                             }
 
                             desc.fFlags = kNone_GrSurfaceFlags;
                             desc.fSampleCnt = 0;
 
-                            sk_sp<GrTextureProxy> texProxy(GrTextureProxy::Make(caps, provider,
-                                                                                desc,
-                                                                                fit,
-                                                                                budgeted));
-                            check_surface(reporter, texProxy.get(), origin,
+                            sk_sp<GrSurfaceProxy> sProxy(GrSurfaceProxy::MakeDeferred(caps,
+                                                                                      desc,
+                                                                                      fit,
+                                                                                      budgeted));
+                            check_surface(reporter, sProxy.get(), origin,
                                           widthHeight, widthHeight, config,
                                           SK_InvalidUniqueID, budgeted);
-                            check_texture(reporter, provider, texProxy.get(), fit);
+                            check_texture(reporter, provider, sProxy->asTextureProxy(), fit);
                         }
                     }
                 }
@@ -168,11 +169,11 @@
                         REPORTER_ASSERT(reporter,
                                         !defaultFBO->renderTargetPriv().maxWindowRectangles());
 
-                        sk_sp<GrRenderTargetProxy> rtProxy(GrRenderTargetProxy::Make(defaultFBO));
-                        check_surface(reporter, rtProxy.get(), origin,
+                        sk_sp<GrSurfaceProxy> sProxy(GrSurfaceProxy::MakeWrapped(defaultFBO));
+                        check_surface(reporter, sProxy.get(), origin,
                                       kWidthHeight, kWidthHeight, config,
                                       defaultFBO->uniqueID(), SkBudgeted::kNo);
-                        check_rendertarget(reporter, provider, rtProxy.get(),
+                        check_rendertarget(reporter, provider, sProxy->asRenderTargetProxy(),
                                            numSamples, SkBackingFit::kExact);
                     }
 
@@ -187,11 +188,11 @@
                                         caps.maxWindowRectangles() ==
                                         rt->renderTargetPriv().maxWindowRectangles());
 
-                        sk_sp<GrRenderTargetProxy> rtProxy(GrRenderTargetProxy::Make(rt));
-                        check_surface(reporter, rtProxy.get(), origin,
+                        sk_sp<GrSurfaceProxy> sProxy(GrSurfaceProxy::MakeWrapped(rt));
+                        check_surface(reporter, sProxy.get(), origin,
                                       kWidthHeight, kWidthHeight, config,
                                       rt->uniqueID(), budgeted);
-                        check_rendertarget(reporter, provider, rtProxy.get(),
+                        check_rendertarget(reporter, provider, sProxy->asRenderTargetProxy(),
                                            numSamples, SkBackingFit::kExact);
                     }
 
@@ -201,10 +202,11 @@
                         tex.reset(provider->createTexture(desc, budgeted));
                     }
 
-                    sk_sp<GrTextureProxy> texProxy(GrTextureProxy::Make(tex));
-                    check_surface(reporter, texProxy.get(), origin,
+                    sk_sp<GrSurfaceProxy> sProxy(GrSurfaceProxy::MakeWrapped(tex));
+                    check_surface(reporter, sProxy.get(), origin,
                                   kWidthHeight, kWidthHeight, config, tex->uniqueID(), budgeted);
-                    check_texture(reporter, provider, texProxy.get(), SkBackingFit::kExact);
+                    check_texture(reporter, provider, sProxy->asTextureProxy(),
+                                  SkBackingFit::kExact);
                 }
             }
         }