Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Unified Diff: tests/ProxyTest.cpp

Issue 2312173002: Revert of Improve usage of window rectangles (Closed) Base URL: https://skia.googlesource.com/skia.git@upload_drawsinreducedclip
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/vk/GrVkGpuCommandBuffer.cpp ('k') | tests/WindowRectanglesTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/ProxyTest.cpp
diff --git a/tests/ProxyTest.cpp b/tests/ProxyTest.cpp
index 367dee426a66c10549bd9fc19ec49c48c7f7be51..016ce5e763a82d85bcfc684e702c01a31cf70b74 100644
--- a/tests/ProxyTest.cpp
+++ b/tests/ProxyTest.cpp
@@ -162,8 +162,7 @@
GrGpu* gpu = ctxInfo.grContext()->getGpu();
sk_sp<GrRenderTarget> defaultFBO(
gpu->wrapBackendRenderTarget(backendDesc, kBorrow_GrWrapOwnership));
- REPORTER_ASSERT(reporter,
- !defaultFBO->renderTargetPriv().maxWindowRectangles());
+ SkASSERT(!defaultFBO->renderTargetPriv().supportsWindowRectangles());
sk_sp<GrRenderTargetProxy> rtProxy(
GrRenderTargetProxy::Make(caps, defaultFBO));
@@ -179,9 +178,8 @@
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());
+ SkASSERT(caps.maxWindowRectangles() <= 0 ||
+ rt->renderTargetPriv().supportsWindowRectangles());
sk_sp<GrRenderTargetProxy> rtProxy(GrRenderTargetProxy::Make(caps, rt));
check_surface(reporter, rtProxy.get(), origin,
« no previous file with comments | « src/gpu/vk/GrVkGpuCommandBuffer.cpp ('k') | tests/WindowRectanglesTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698