commit d004e0b55c4a1e375af39c09d0f96628252b797d
author Chris Dalton <csmartdalton@google.com> Thu Sep 27 09:28:03 2018 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Sep 27 23:40:23 2018 +0000
tree 429e220d92eba76661e434781812d7fc671573b8
parent b726c89ff8a84c1da1784c0c8172e9f59ddf757a

Cleanup resource flags

Converts GrResourceProvider::Flags and GrResourceCache::ScratchFlags
to "enum class" and fixes a case where we were accidentally using the
wrong type of flag. Makes sure to allocate GrSWMaskHelper proxies with
kNoPendingIO.

Bug: skia:8351
Change-Id: Ibcaa26314a53d0cb31ae22915ab94ab0fc07e76d
Reviewed-on: https://skia-review.googlesource.com/157280
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>

tools/gpu/GrTest.cpp

diff --git a/tools/gpu/GrTest.cpp b/tools/gpu/GrTest.cpp
index 4afb07a..c0ca8ff 100644
--- a/tools/gpu/GrTest.cpp
+++ b/tools/gpu/GrTest.cpp
@@ -203,6 +203,24 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
+sk_sp<GrTextureProxy> GrProxyProvider::testingOnly_createInstantiatedProxy(
+        const GrSurfaceDesc& desc, GrSurfaceOrigin origin, SkBackingFit fit, SkBudgeted budgeted) {
+    sk_sp<GrTexture> tex;
+
+    if (SkBackingFit::kApprox == fit) {
+        tex = fResourceProvider->createApproxTexture(desc, GrResourceProvider::Flags::kNone);
+    } else {
+        tex = fResourceProvider->createTexture(desc, budgeted, GrResourceProvider::Flags::kNone);
+    }
+    if (!tex) {
+        return nullptr;
+    }
+
+    return this->createWrapped(std::move(tex), origin);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
 #define ASSERT_SINGLE_OWNER \
     SkDEBUGCODE(GrSingleOwner::AutoEnforce debug_SingleOwner(fRenderTargetContext->singleOwner());)