commit ec2249fc73b36621af9efd4a9fc62e1be84b784d
author Robert Phillips <robertphillips@google.com> Wed Nov 09 08:54:35 2016 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Nov 09 15:10:37 2016 +0000
tree 39ef9c23c3b09397a4ae5725499ebb12d647c6bd
parent 68b7a52a0b9355b357d4bd72bca479916d115d7c

Move GrRenderTargetPriv::maxWindowRectangles to GrRenderTargetContextPriv & GrRenderTargetProxy

This removes a reason to call accessRenderTarget on the GrRenderTargetContext

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

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

tests/ProxyTest.cpp

diff --git a/tests/ProxyTest.cpp b/tests/ProxyTest.cpp
index 17a3dad..618941e 100644
--- a/tests/ProxyTest.cpp
+++ b/tests/ProxyTest.cpp
@@ -34,10 +34,13 @@
 }
 
 static void check_rendertarget(skiatest::Reporter* reporter,
+                               const GrCaps& caps,
                                GrTextureProvider* provider,
                                GrRenderTargetProxy* rtProxy,
                                int numSamples,
-                               SkBackingFit fit) {
+                               SkBackingFit fit,
+                               int expectedMaxWindowRects) {
+    REPORTER_ASSERT(reporter, rtProxy->maxWindowRectangles(caps) == expectedMaxWindowRects);
     REPORTER_ASSERT(reporter, rtProxy->numStencilSamples() == numSamples);
 
     GrRenderTarget* rt = rtProxy->instantiate(provider);
@@ -110,9 +113,9 @@
                                 check_surface(reporter, sProxy.get(), origin,
                                               widthHeight, widthHeight, config,
                                               SK_InvalidUniqueID, budgeted);
-                                check_rendertarget(reporter, provider,
+                                check_rendertarget(reporter, caps, provider,
                                                    sProxy->asRenderTargetProxy(), 
-                                                   numSamples, fit);
+                                                   numSamples, fit, caps.maxWindowRectangles());
                             }
 
                             desc.fFlags = kNone_GrSurfaceFlags;
@@ -166,15 +169,13 @@
 
                         sk_sp<GrRenderTarget> defaultFBO(
                             provider->wrapBackendRenderTarget(backendDesc));
-                        REPORTER_ASSERT(reporter,
-                                        !defaultFBO->renderTargetPriv().maxWindowRectangles());
 
                         sk_sp<GrSurfaceProxy> sProxy(GrSurfaceProxy::MakeWrapped(defaultFBO));
                         check_surface(reporter, sProxy.get(), origin,
                                       kWidthHeight, kWidthHeight, config,
                                       defaultFBO->uniqueID(), SkBudgeted::kNo);
-                        check_rendertarget(reporter, provider, sProxy->asRenderTargetProxy(),
-                                           numSamples, SkBackingFit::kExact);
+                        check_rendertarget(reporter, caps, provider, sProxy->asRenderTargetProxy(),
+                                           numSamples, SkBackingFit::kExact, 0);
                     }
 
                     sk_sp<GrTexture> tex;
@@ -184,16 +185,14 @@
                         desc.fFlags = kRenderTarget_GrSurfaceFlag;
                         tex.reset(provider->createTexture(desc, budgeted));
                         sk_sp<GrRenderTarget> rt(sk_ref_sp(tex->asRenderTarget()));
-                        REPORTER_ASSERT(reporter,
-                                        caps.maxWindowRectangles() ==
-                                        rt->renderTargetPriv().maxWindowRectangles());
 
                         sk_sp<GrSurfaceProxy> sProxy(GrSurfaceProxy::MakeWrapped(rt));
                         check_surface(reporter, sProxy.get(), origin,
                                       kWidthHeight, kWidthHeight, config,
                                       rt->uniqueID(), budgeted);
-                        check_rendertarget(reporter, provider, sProxy->asRenderTargetProxy(),
-                                           numSamples, SkBackingFit::kExact);
+                        check_rendertarget(reporter, caps, provider, sProxy->asRenderTargetProxy(),
+                                           numSamples, SkBackingFit::kExact,
+                                           caps.maxWindowRectangles());
                     }
 
                     if (!tex) {