Add a simpler key type for scratch resource keys.

src/gpu/GrGpuResource.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "GrGpuResource.h"
 #include "GrResourceCache2.h"
 #include "GrGpu.h"
 
 static inline GrResourceCache2* get_resource_cache2(GrGpu* gpu) {
     SkASSERT(gpu);
     SkASSERT(gpu->getContext());
     SkASSERT(gpu->getContext()->getResourceCache2());
     return gpu->getContext()->getResourceCache2();
 }
 
 GrGpuResource::GrGpuResource(GrGpu* gpu, bool isWrapped)
-    : fScratchKey(GrResourceKey::NullScratchKey())
-    , fGpu(gpu)
+    : fGpu(gpu)
     , fGpuMemorySize(kInvalidGpuMemorySize)
     , fUniqueID(CreateUniqueID()) {
     if (isWrapped) {
         fFlags = kWrapped_Flag;
     } else {
         // By default all non-wrapped resources are budgeted.
         fFlags = kBudgeted_Flag;
     }
 }
 
@@ skipping 50 matching lines @@
     }
 
     size_t oldSize = fGpuMemorySize;
     SkASSERT(kInvalidGpuMemorySize != oldSize);
     fGpuMemorySize = kInvalidGpuMemorySize;
     get_resource_cache2(fGpu)->resourceAccess().didChangeGpuMemorySize(this, oldSize);
 }
 
 bool GrGpuResource::setContentKey(const GrResourceKey& contentKey) {
     // Currently this can only be called once and can't be called when the resource is scratch.
-    SkASSERT(!contentKey.isScratch());
     SkASSERT(this->internalHasRef());
 
     // Wrapped resources can never have a key.
     if (this->isWrapped()) {
         return false;
     }
 
     if ((fFlags & kContentKeySet_Flag) || this->wasDestroyed()) {
         return false;
     }
@@ skipping 11 matching lines @@
 void GrGpuResource::notifyIsPurgable() const {
     if (this->wasDestroyed()) {
         // We've already been removed from the cache. Goodbye cruel world!
         SkDELETE(this);
     } else {
         GrGpuResource* mutableThis = const_cast<GrGpuResource*>(this);
         get_resource_cache2(fGpu)->resourceAccess().notifyPurgable(mutableThis);
     }
 }
 
-void GrGpuResource::setScratchKey(const GrResourceKey& scratchKey) {
-    SkASSERT(fScratchKey.isNullScratch());
-    SkASSERT(scratchKey.isScratch());
-    SkASSERT(!scratchKey.isNullScratch());
-    // Wrapped resources can never have a key.
+void GrGpuResource::setScratchKey(const GrScratchKey& scratchKey) {
+    SkASSERT(!fScratchKey.isValid());
+    SkASSERT(scratchKey.isValid());
+    // Wrapped resources can never have a scratch key.
     if (this->isWrapped()) {
         return;
     }
     fScratchKey = scratchKey;
 }
 
 void GrGpuResource::removeScratchKey() {
-    if (!this->wasDestroyed() && !fScratchKey.isNullScratch()) {
+    if (!this->wasDestroyed() && fScratchKey.isValid()) {
         get_resource_cache2(fGpu)->resourceAccess().willRemoveScratchKey(this);
-        fScratchKey = GrResourceKey::NullScratchKey();
+        fScratchKey.reset();
     }
 }
 
 uint32_t GrGpuResource::CreateUniqueID() {
     static int32_t gUniqueID = SK_InvalidUniqueID;
     uint32_t id;
     do {
         id = static_cast<uint32_t>(sk_atomic_inc(&gUniqueID) + 1);
     } while (id == SK_InvalidUniqueID);
     return id;
 }
 
 void GrGpuResource::setBudgeted(bool countsAgainstBudget) {
     // Wrapped resources never count against the budget, nothing to do. No point in changing the
     // budgeting of destroyed resources.
     if (this->isWrapped() || this->wasDestroyed()) {
         return;
     }
 
     uint32_t oldFlags = fFlags;
     if (countsAgainstBudget) {
         fFlags |= kBudgeted_Flag;
     } else {
         fFlags &= ~kBudgeted_Flag;
     }
     if (fFlags != oldFlags) {
         get_resource_cache2(fGpu)->resourceAccess().didChangeBudgetStatus(this);
     }
 }