Revert "Add native caching of uniquely keyed GrTextureProxies"

This reverts commit d4f100dad90ed5beb1b614464d8c4fcb22c0a993.

Reason for revert: ASAN

Original change's description:
> Add native caching of uniquely keyed GrTextureProxies
> 
> Change-Id: I303fe025b7856b8d681a2d35b416c015bd468e1d
> Reviewed-on: https://skia-review.googlesource.com/48300
> Commit-Queue: Robert Phillips <robertphillips@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>

TBR=bsalomon@google.com,robertphillips@google.com,brianosman@google.com

Change-Id: I7bbf549d4855ce6d985867c3880eef80080bd3d1
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/49442
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

1 files changed, 0 insertions, 238 deletions

diff --git a/tests/TextureProxyTest.cpp b/tests/TextureProxyTest.cpp
deleted file mode 100644
index 58c29fcb85..0000000000
--- a/tests/TextureProxyTest.cpp
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Copyright 2017 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// This is a GPU-backend specific test.
-
-#include "Test.h"
-
-#if SK_SUPPORT_GPU
-
-#include "GrBackendSurface.h"
-#include "GrContextPriv.h"
-#include "GrResourceCache.h"
-#include "GrResourceProvider.h"
-#include "GrTest.h"
-#include "GrTexture.h"
-#include "GrTextureProxy.h"
-
-#include "SkGr.h"
-#include "SkImage.h"
-
-int GrResourceCache::numUniqueKeyProxies_TestOnly() const {
-    return fUniquelyKeyedProxies.count();
-}
-
-static GrSurfaceDesc make_desc(GrSurfaceFlags flags) {
-    GrSurfaceDesc desc;
-    desc.fFlags = flags;
-    desc.fOrigin = kBottomLeft_GrSurfaceOrigin;
-    desc.fWidth = 64;
-    desc.fHeight = 64;
-    desc.fConfig = kRGBA_8888_GrPixelConfig;
-    desc.fSampleCnt = 0;
-
-    return desc;
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// Basic test
-
-static sk_sp<GrTextureProxy> deferred_tex(GrResourceProvider* provider, SkBackingFit fit) {
-    GrSurfaceDesc desc = make_desc(kNone_GrSurfaceFlags);
-
-    // Only budgeted & wrapped external proxies get to carry uniqueKeys
-    return GrSurfaceProxy::MakeDeferred(provider, desc, fit, SkBudgeted::kYes);
-}
-
-static sk_sp<GrTextureProxy> deferred_texRT(GrResourceProvider* provider, SkBackingFit fit) {
-    GrSurfaceDesc desc = make_desc(kRenderTarget_GrSurfaceFlag);
-
-    // Only budgeted & wrapped external proxies get to carry uniqueKeys
-    return GrSurfaceProxy::MakeDeferred(provider, desc, fit, SkBudgeted::kYes);
-}
-
-static sk_sp<GrTextureProxy> wrapped(GrResourceProvider* provider, SkBackingFit fit) {
-    GrSurfaceDesc desc = make_desc(kNone_GrSurfaceFlags);
-
-    sk_sp<GrTexture> tex;
-    if (SkBackingFit::kApprox == fit) {
-        tex = sk_sp<GrTexture>(provider->createApproxTexture(desc, 0));
-    } else {
-        // Only budgeted & wrapped external proxies get to carry uniqueKeys
-        tex = provider->createTexture(desc, SkBudgeted::kYes);
-    }
-
-    return GrSurfaceProxy::MakeWrapped(std::move(tex), kBottomLeft_GrSurfaceOrigin);
-}
-
-static sk_sp<GrTextureProxy> create_wrapped_backend(GrContext* context, SkBackingFit fit,
-                                                    sk_sp<GrTexture>* backingSurface) {
-    GrResourceProvider* provider = context->resourceProvider();
-
-    GrSurfaceDesc desc = make_desc(kNone_GrSurfaceFlags);
-
-    *backingSurface = provider->createTexture(desc, SkBudgeted::kNo);
-    if (!(*backingSurface)) {
-        return nullptr;
-    }
-
-    GrBackendTexture backendTex =
-            GrTest::CreateBackendTexture(context->contextPriv().getBackend(),
-                                         64, 64,
-                                         kRGBA_8888_GrPixelConfig,
-                                         (*backingSurface)->getTextureHandle());
-
-    return GrSurfaceProxy::MakeWrappedBackend(context, backendTex, kBottomLeft_GrSurfaceOrigin);
-}
-
-
-// This tests the basic capabilities of the uniquely keyed texture proxies. Does assigning
-// and looking them up work, etc.
-static void basic_test(GrContext* context,
-                       skiatest::Reporter* reporter,
-                       sk_sp<GrTextureProxy> proxy, bool proxyIsCached) {
-    static int id = 1;
-
-    GrResourceProvider* provider = context->resourceProvider();
-    GrResourceCache* cache = context->getResourceCache();
-
-    int startCacheCount = cache->getResourceCount();
-
-    REPORTER_ASSERT(reporter, !proxy->getUniqueKey().isValid());
-
-    GrUniqueKey key;
-    GrMakeKeyFromImageID(&key, id, SkIRect::MakeWH(64, 64));
-    ++id;
-
-    // Assigning the uniqueKey adds the proxy to the hash but doesn't force instantiation
-    REPORTER_ASSERT(reporter, !cache->numUniqueKeyProxies_TestOnly());
-    provider->assignUniqueKeyToProxy(key, proxy.get());
-    REPORTER_ASSERT(reporter, 1 == cache->numUniqueKeyProxies_TestOnly());
-    REPORTER_ASSERT(reporter, startCacheCount == cache->getResourceCount());
-
-    // setUniqueKey had better stick
-    REPORTER_ASSERT(reporter, key == proxy->getUniqueKey());
-
-    // We just added it, surely we can find it
-    REPORTER_ASSERT(reporter, provider->findProxyByUniqueKey(key, kBottomLeft_GrSurfaceOrigin));
-    REPORTER_ASSERT(reporter, 1 == cache->numUniqueKeyProxies_TestOnly());
-
-    // Once instantiated, the backing resource should have the same key
-    SkAssertResult(proxy->instantiate(provider));
-    const GrUniqueKey& texKey = proxy->priv().peekSurface()->getUniqueKey();
-    REPORTER_ASSERT(reporter, texKey.isValid());
-    REPORTER_ASSERT(reporter, key == texKey);
-    if (proxyIsCached) {
-        REPORTER_ASSERT(reporter, 1 == cache->getResourceCount());
-    }
-
-    // deleting the proxy should delete it from the hash but not the cache
-    proxy = nullptr;
-    REPORTER_ASSERT(reporter, 0 == cache->numUniqueKeyProxies_TestOnly());
-    REPORTER_ASSERT(reporter, 1 == cache->getResourceCount());
-
-    // If the proxy was cached refinding it should bring it back to life
-    proxy = provider->findProxyByUniqueKey(key, kBottomLeft_GrSurfaceOrigin);
-    if (proxyIsCached) {
-        REPORTER_ASSERT(reporter, proxy);
-        REPORTER_ASSERT(reporter, 1 == cache->numUniqueKeyProxies_TestOnly());
-    } else {
-        REPORTER_ASSERT(reporter, !proxy);
-        REPORTER_ASSERT(reporter, 0 == cache->numUniqueKeyProxies_TestOnly());
-    }
-    REPORTER_ASSERT(reporter, 1 == cache->getResourceCount());
-
-    // Mega-purging it should remove it from both the hash and the cache
-    proxy = nullptr;
-    cache->purgeAllUnlocked();
-    if (proxyIsCached) {
-        REPORTER_ASSERT(reporter, 0 == cache->getResourceCount());
-    } else {
-        REPORTER_ASSERT(reporter, 1 == cache->getResourceCount());
-    }
-
-    // We can bring neither the texture nor proxy back from perma-death
-    proxy = provider->findProxyByUniqueKey(key, kBottomLeft_GrSurfaceOrigin);
-    REPORTER_ASSERT(reporter, !proxy);
-    if (proxyIsCached) {
-        REPORTER_ASSERT(reporter, 0 == cache->getResourceCount());
-    } else {
-        REPORTER_ASSERT(reporter, 1 == cache->getResourceCount());
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// Invalidation test
-
-// Test if invalidating unique ids operates as expected for texture proxies.
-static void invalidation_test(GrContext* context, skiatest::Reporter* reporter) {
-
-    GrResourceCache* cache = context->getResourceCache();
-    REPORTER_ASSERT(reporter, 0 == cache->getResourceCount());
-
-    sk_sp<SkImage> rasterImg;
-
-    {
-        SkImageInfo ii = SkImageInfo::Make(64, 64, kRGBA_8888_SkColorType, kOpaque_SkAlphaType);
-
-        SkBitmap bm;
-        bm.allocPixels(ii);
-
-        rasterImg = SkImage::MakeFromBitmap(bm);
-        REPORTER_ASSERT(reporter, 0 == cache->numUniqueKeyProxies_TestOnly());
-        REPORTER_ASSERT(reporter, 0 == cache->getResourceCount());
-    }
-
-    sk_sp<SkImage> textureImg = rasterImg->makeTextureImage(context, nullptr);
-    REPORTER_ASSERT(reporter, 1 == cache->numUniqueKeyProxies_TestOnly());
-    REPORTER_ASSERT(reporter, 1 == cache->getResourceCount());
-
-    rasterImg = nullptr;        // this invalidates the uniqueKey
-
-    // this forces the cache to respond to the inval msg
-    int maxNum;
-    size_t maxBytes;
-    context->getResourceCacheLimits(&maxNum, &maxBytes);
-    context->setResourceCacheLimits(maxNum-1, maxBytes);
-
-    REPORTER_ASSERT(reporter, 0 == cache->numUniqueKeyProxies_TestOnly());
-    REPORTER_ASSERT(reporter, 1 == cache->getResourceCount());
-
-    textureImg = nullptr;
-    context->purgeAllUnlockedResources();
-
-    REPORTER_ASSERT(reporter, 0 == cache->numUniqueKeyProxies_TestOnly());
-    REPORTER_ASSERT(reporter, 0 == cache->getResourceCount());
-}
-
-DEF_GPUTEST_FOR_RENDERING_CONTEXTS(TextureProxyTest, reporter, ctxInfo) {
-    GrContext* context = ctxInfo.grContext();
-    GrResourceProvider* provider = context->resourceProvider();
-    GrResourceCache* cache = context->getResourceCache();
-
-    REPORTER_ASSERT(reporter, !cache->numUniqueKeyProxies_TestOnly());
-    REPORTER_ASSERT(reporter, 0 == cache->getResourceCount());
-
-    for (auto fit : { SkBackingFit::kExact, SkBackingFit::kApprox }) {
-        for (auto create : { deferred_tex, deferred_texRT, wrapped }) {
-            REPORTER_ASSERT(reporter, 0 == cache->getResourceCount());
-            basic_test(context, reporter, create(provider, fit), true);
-        }
-
-        REPORTER_ASSERT(reporter, 0 == cache->getResourceCount());
-        sk_sp<GrTexture> backingTex;
-        sk_sp<GrTextureProxy> proxy = create_wrapped_backend(context, fit, &backingTex);
-        basic_test(context, reporter, std::move(proxy), false);
-
-        backingTex = nullptr;
-        cache->purgeAllUnlocked();
-    }
-
-    invalidation_test(context, reporter);
-}
-
-#endif