Alter resource cache and GrContext to (optionally) never reuse a scratch texture

src/gpu/GrResourceCache.h

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 
@@ skipping 204 matching lines @@
 public:
     GrResourceCache(int maxCount, size_t maxBytes);
     ~GrResourceCache();
 
     /**
      *  Return the current resource cache limits.
      *
      *  @param maxResource If non-null, returns maximum number of resources
      *                     that can be held in the cache.
      *  @param maxBytes    If non-null, returns maximum number of bytes of
-     *                         gpu memory that can be held in the cache.
+     *                     gpu memory that can be held in the cache.
      */
     void getLimits(int* maxResources, size_t* maxBytes) const;
 
     /**
      *  Specify the resource cache limits. If the current cache exceeds either
      *  of these, it will be purged (LRU) to keep the cache within these limits.
      *
      *  @param maxResources The maximum number of resources that can be held in
      *                      the cache.
      *  @param maxBytes     The maximum number of bytes of resource memory that
      *                      can be held in the cache.
      */
-    void setLimits(int maxResource, size_t maxResourceBytes);
+    void setLimits(int maxResources, size_t maxResourceBytes);
 
     /**
      *  The callback function used by the cache when it is still over budget
      *  after a purge. The passed in 'data' is the same 'data' handed to
      *  setOverbudgetCallback. The callback returns true if some resources
      *  have been freed.
      */
     typedef bool (*PFOverbudgetCB)(void* data);
 
     /**
      *  Set the callback the cache should use when it is still over budget
      *  after a purge. The 'data' provided here will be passed back to the
-     *  callback. The cache will attempt to purge any resources newly freed
-     *  by the callback.
+     *  callback. Note that the cache will attempt to purge any resources newly 
+     *  freed by the callback.
      */
     void setOverbudgetCallback(PFOverbudgetCB overbudgetCB, void* data) {
         fOverbudgetCB = overbudgetCB;
         fOverbudgetData = data;
     }
 
     /**
      * Returns the number of bytes consumed by cached resources.
      */
     size_t getCachedResourceBytes() const { return fEntryBytes; }
@@ skipping 31 matching lines @@
      *  is called.
      */
     void addResource(const GrResourceKey& key,
                      GrResource* resource,
                      uint32_t ownershipFlags = 0);
 
     /**
      * Determines if the cache contains an entry matching a key. If a matching
      * entry exists but was detached then it will not be found.
      */
-    bool hasKey(const GrResourceKey& key) const;
+    bool hasKey(const GrResourceKey& key) const { return NULL != fCache.find(key); }
 
     /**
      * Hide 'entry' so that future searches will not find it. Such
      * hidden entries will not be purged. The entry still counts against
      * the cache's budget and should be made non-exclusive when exclusive access
      * is no longer needed.
      */
     void makeExclusive(GrResourceEntry* entry);
 
     /**
      * Restore 'entry' so that it can be found by future searches. 'entry'
      * will also be purgeable (provided its lock count is now 0.)
      */
     void makeNonExclusive(GrResourceEntry* entry);
 
     /**
+     * Remove a resource from the cache and delete it!
+     */
+    void deleteResource(GrResourceEntry* entry);
+
+    /**
      * Removes every resource in the cache that isn't locked.
      */
     void purgeAllUnlocked();
 
     /**
      * Allow cache to purge unused resources to obey resource limitations
      * Note: this entry point will be hidden (again) once totally ref-driven
-     * cache maintenance is implemented
+     * cache maintenance is implemented. Note that the overbudget callback
+     * will be called if the initial purge doesn't get the cache under
+     * its budget.
      *
      * extraCount and extraBytes are added to the current resource allocation
      * to make sure enough room is available for future additions (e.g,
      * 10MB across 10 textures is about to be added).
      */
     void purgeAsNeeded(int extraCount = 0, size_t extraBytes = 0);
 
 #if GR_DEBUG
     void validate() const;
 #else
@@ skipping 12 matching lines @@
 
     void internalDetach(GrResourceEntry*, BudgetBehaviors behavior = kAccountFor_BudgetBehavior);
     void attachToHead(GrResourceEntry*, BudgetBehaviors behavior = kAccountFor_BudgetBehavior);
 
     void removeInvalidResource(GrResourceEntry* entry);
 
     GrTHashTable<GrResourceEntry, GrResourceKey, 8> fCache;
 
     // We're an internal doubly linked list
     typedef SkTInternalLList<GrResourceEntry> EntryList;
-    EntryList    fList;
+    EntryList      fList;
 
 #if GR_DEBUG
     // These objects cannot be returned by a search
-    EntryList    fExclusiveList;
+    EntryList      fExclusiveList;
 #endif
 
     // our budget, used in purgeAsNeeded()
-    int fMaxCount;
-    size_t fMaxBytes;
+    int            fMaxCount;
+    size_t         fMaxBytes;
 
     // our current stats, related to our budget
 #if GR_CACHE_STATS
-    int fHighWaterEntryCount;
-    size_t fHighWaterEntryBytes;
-    int fHighWaterClientDetachedCount;
-    size_t fHighWaterClientDetachedBytes;
+    int            fHighWaterEntryCount;
+    size_t         fHighWaterEntryBytes;
+    int            fHighWaterClientDetachedCount;
+    size_t         fHighWaterClientDetachedBytes;
 #endif
 
-    int fEntryCount;
-    size_t fEntryBytes;
-    int fClientDetachedCount;
-    size_t fClientDetachedBytes;
+    int            fEntryCount;
+    size_t         fEntryBytes;
+    int            fClientDetachedCount;
+    size_t         fClientDetachedBytes;
 
     // prevents recursive purging
     bool           fPurging;
 
     PFOverbudgetCB fOverbudgetCB;
     void*          fOverbudgetData;
 
     void internalPurge(int extraCount, size_t extraBytes);
 
 #if GR_DEBUG
@@ skipping 16 matching lines @@
         GrResourceCache* fCache;
     };
 #else
     class GrAutoResourceCacheValidate {
     public:
         GrAutoResourceCacheValidate(GrResourceCache*) {}
     };
 #endif
 
 #endif