commit cc119d9dbf746dd0c60a576125e423d47432c251
author Adlai Holler <adlai@google.com> Tue Mar 16 15:17:25 2021 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Mar 16 20:25:05 2021 +0000
tree 05e77e3d42d1f077e4a78724376c15833e5ba89a
parent 1143b1b4bb7d6ce581e1c73bc526e48df17ac4d6

Make getUniqueKey virtual on GrSurfaceProxy

This lets GrResourceAllocator stop worrying about whether
proxies are texture-proxies or not.

Bug: skia:10877
Change-Id: Iccc4505bdc9d5c74f6ab7f93c26df5f913fff339
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/385497
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Adlai Holler <adlai@google.com>

src/gpu/GrResourceAllocator.cpp

diff --git a/src/gpu/GrResourceAllocator.cpp b/src/gpu/GrResourceAllocator.cpp
index 848665b..5cb4cb2 100644
--- a/src/gpu/GrResourceAllocator.cpp
+++ b/src/gpu/GrResourceAllocator.cpp
@@ -13,7 +13,6 @@
 #include "src/gpu/GrResourceProvider.h"
 #include "src/gpu/GrSurfaceProxy.h"
 #include "src/gpu/GrSurfaceProxyPriv.h"
-#include "src/gpu/GrTextureProxy.h"
 
 #if GR_TRACK_INTERVAL_CREATION
     #include <atomic>
@@ -211,15 +210,14 @@
 // First try to reuse one of the recently allocated/used GrSurfaces in the free pool.
 // If we can't find a useable one, create a new one.
 sk_sp<GrSurface> GrResourceAllocator::findSurfaceFor(const GrSurfaceProxy* proxy) {
-    if (proxy->asTextureProxy() && proxy->asTextureProxy()->getUniqueKey().isValid()) {
-        // First try to reattach to a cached version if the proxy is uniquely keyed
-        if (sk_sp<GrSurface> surface = fResourceProvider->findByUniqueKey<GrSurface>(
-                proxy->asTextureProxy()->getUniqueKey())) {
+    if (const auto& uniqueKey = proxy->getUniqueKey(); uniqueKey.isValid()) {
+        // First try to reattach to a cached surface if the proxy is uniquely keyed
+        if (sk_sp<GrSurface> surface = fResourceProvider->findByUniqueKey<GrSurface>(uniqueKey)) {
             return surface;
         }
     }
 
-    // First look in the free pool
+    // Then look in the free pool
     GrScratchKey key;
 
     proxy->priv().computeScratchKey(*fResourceProvider->caps(), &key);
@@ -286,15 +284,11 @@
                 fFailedInstantiation = true;
             }
         } else if (sk_sp<GrSurface> surface = this->findSurfaceFor(cur->proxy())) {
-            // TODO: make getUniqueKey virtual on GrSurfaceProxy
-            GrTextureProxy* texProxy = cur->proxy()->asTextureProxy();
-
-            if (texProxy && texProxy->getUniqueKey().isValid()) {
+            if (const auto& uniqueKey = cur->proxy()->getUniqueKey(); uniqueKey.isValid()) {
                 if (!surface->getUniqueKey().isValid()) {
-                    fResourceProvider->assignUniqueKeyToResource(texProxy->getUniqueKey(),
-                                                                 surface.get());
+                    fResourceProvider->assignUniqueKeyToResource(uniqueKey, surface.get());
                 }
-                SkASSERT(surface->getUniqueKey() == texProxy->getUniqueKey());
+                SkASSERT(surface->getUniqueKey() == uniqueKey);
             }
 
 #if GR_ALLOCATION_SPEW