diff options
author | 2018-03-16 16:47:25 -0400 | |
---|---|---|
committer | 2018-03-19 12:21:05 +0000 | |
commit | fe0253f8bb64857df088d5ff54e2b5b66b102b46 (patch) | |
tree | 0d540ceaf02a992228dd713ccfee9fef413f7b3b /tests/TextureProxyTest.cpp | |
parent | 4410d7ff757268792dd5f842d585c514cc80a5fb (diff) |
Alter GrSurface/GrSurfaceProxy flags to prepare for GrTexture/GrTextureProxy -specific flags
This CL:
moves GrRenderTarget::fFlags to GrSurface::fSurfaceFlags
adds a GrInternalSurfaceFlags type and uses it for GrSurfaceProxy::fSurfaceFlags
The goal of this is to provide a location where GrTexture/GrTextureProxy-specific flags
(i.e., isExternal & isRectangle) can be stored.
Change-Id: I8df7b79036a6853dd378ff6cf10d4b37c60dd511
Reviewed-on: https://skia-review.googlesource.com/114796
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'tests/TextureProxyTest.cpp')
-rw-r--r-- | tests/TextureProxyTest.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/TextureProxyTest.cpp b/tests/TextureProxyTest.cpp index 5745e4ebd4..8727bef51e 100644 --- a/tests/TextureProxyTest.cpp +++ b/tests/TextureProxyTest.cpp @@ -27,9 +27,9 @@ int GrProxyProvider::numUniqueKeyProxies_TestOnly() const { return fUniquelyKeyedProxies.count(); } -static GrSurfaceDesc make_desc(GrSurfaceFlags flags) { +static GrSurfaceDesc make_desc(GrSurfaceDescFlags descFlags) { GrSurfaceDesc desc; - desc.fFlags = flags; + desc.fFlags = descFlags; desc.fWidth = 64; desc.fHeight = 64; desc.fConfig = kRGBA_8888_GrPixelConfig; @@ -89,7 +89,7 @@ static sk_sp<GrTextureProxy> wrapped_with_key(skiatest::Reporter* reporter, // Only budgeted & wrapped external proxies get to carry uniqueKeys sk_sp<GrTextureProxy> proxy = proxyProvider->createInstantiatedProxy( - desc, kBottomLeft_GrSurfaceOrigin, fit, SkBudgeted::kYes, 0); + desc, kBottomLeft_GrSurfaceOrigin, fit, SkBudgeted::kYes); SkAssertResult(proxyProvider->assignUniqueKeyToProxy(key, proxy.get())); REPORTER_ASSERT(reporter, proxy->getUniqueKey().isValid()); return proxy; |