Fuse GrReplacements and GrLayerCache

src/gpu/GrLayerCache.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrLayerCache_DEFINED
 #define GrLayerCache_DEFINED
 
@@ skipping 59 matching lines @@
 // contains the layer's extent in its texture.
 // Atlased layers also get a pointer to the plot in which they reside.
 // For non-atlased layers, the lock field just corresponds to locking in
 // the resource cache. For atlased layers, it implements an additional level
 // of locking to allow atlased layers to be reused multiple times.
 struct GrCachedLayer {
 public:
     // For SkTDynamicHash
     struct Key {
         Key(uint32_t pictureID, const SkMatrix& initialMat, 
-            const int* key, int keySize, bool copyKey = false)
+            const unsigned* key, int keySize, bool copyKey = false)
         : fKeySize(keySize) 
         , fFreeKey(copyKey) {
             fIDMatrix.fPictureID = pictureID;
             fIDMatrix.fInitialMat = initialMat;
             fIDMatrix.fInitialMat.getType(); // force initialization of type so hashes match
 
             if (copyKey) {
-                int* tempKey = SkNEW_ARRAY(int, keySize);
-                memcpy(tempKey, key, keySize*sizeof(int));
+                unsigned* tempKey = SkNEW_ARRAY(unsigned, keySize);
+                memcpy(tempKey, key, keySize*sizeof(unsigned));
                 fKey = tempKey;
             } else {
                 fKey = key;
             }
 
             // The pictureID/matrix portion needs to be tightly packed.
             GR_STATIC_ASSERT(sizeof(IDMatrix) == sizeof(uint32_t)+                     // pictureID
                                              9 * sizeof(SkScalar) + sizeof(uint32_t)); // matrix
         }
 
         ~Key() {
             if (fFreeKey) {
                 SkDELETE_ARRAY(fKey);
             }
         }
 
         bool operator==(const Key& other) const {
             if (fKeySize != other.fKeySize) {
                 return false;
             }
             return fIDMatrix.fPictureID == other.fIDMatrix.fPictureID &&
                    fIDMatrix.fInitialMat.cheapEqualTo(other.fIDMatrix.fInitialMat) &&
                    !memcmp(fKey, other.fKey, fKeySize * sizeof(int));
         }
 
         uint32_t pictureID() const { return fIDMatrix.fPictureID; }
 
         // TODO: remove these when GrCachedLayer & ReplacementInfo fuse
-        const int* key() const { SkASSERT(fFreeKey);  return fKey; }
+        const unsigned* key() const { SkASSERT(fFreeKey);  return fKey; }
         int keySize() const { SkASSERT(fFreeKey); return fKeySize; }
 
         uint32_t hash() const {
             uint32_t hash = SkChecksum::Murmur3(reinterpret_cast<const uint32_t*>(fKey),
                                                 fKeySize * sizeof(int));
             return SkChecksum::Murmur3(reinterpret_cast<const uint32_t*>(&fIDMatrix), 
                                        sizeof(IDMatrix), hash);
         }
 
     private:
         struct IDMatrix {
             // ID of the picture of which this layer is a part
             uint32_t fPictureID;
             // The initial matrix passed into drawPicture
             SkMatrix fInitialMat;
         }              fIDMatrix;
 
-        const int*     fKey;
-        const int      fKeySize;
-        bool           fFreeKey;
+        const unsigned* fKey;
+        const int       fKeySize;
+        bool            fFreeKey;
     };
 
     static const Key& GetKey(const GrCachedLayer& layer) { return layer.fKey; }
     static uint32_t Hash(const Key& key) { return key.hash(); }
 
     // GrCachedLayer proper
-    GrCachedLayer(uint32_t pictureID, int start, int stop,
+    GrCachedLayer(uint32_t pictureID, unsigned start, unsigned stop,
                   const SkIRect& bounds, const SkMatrix& ctm,
-                  const int* key, int keySize,
+                  const unsigned* key, int keySize,
                   const SkPaint* paint)
         : fKey(pictureID, ctm, key, keySize, true)
         , fStart(start)
         , fStop(stop)
         , fBounds(bounds)
         , fPaint(paint ? SkNEW_ARGS(SkPaint, (*paint)) : NULL)
         , fTexture(NULL)
-        , fRect(GrIRect16::MakeEmpty())
+        , fRect(SkIRect::MakeEmpty())
         , fPlot(NULL)
         , fUses(0)
         , fLocked(false) {
-        SkASSERT(SK_InvalidGenID != pictureID && start >= 0 && stop >= 0);
+        SkASSERT(SK_InvalidGenID != pictureID);
     }
 
     ~GrCachedLayer() {
         SkSafeUnref(fTexture);
         SkDELETE(fPaint);
     }
 
     uint32_t pictureID() const { return fKey.pictureID(); }
     // TODO: remove these when GrCachedLayer & ReplacementInfo fuse
-    const int* key() const { return fKey.key(); }
+    const unsigned* key() const { return fKey.key(); }
     int keySize() const { return fKey.keySize(); }
 
-    int start() const { return fStart; }
+    unsigned start() const { return fStart; }
     // TODO: make bound debug only
     const SkIRect& bound() const { return fBounds; }
-    int stop() const { return fStop; }
-    void setTexture(GrTexture* texture, const GrIRect16& rect) {
+    unsigned stop() const { return fStop; }
+    void setTexture(GrTexture* texture, const SkIRect& rect) {
         SkRefCnt_SafeAssign(fTexture, texture);
         fRect = rect;
     }
     GrTexture* texture() { return fTexture; }
     const SkPaint* paint() const { return fPaint; }
-    const GrIRect16& rect() const { return fRect; }
+    const SkIRect& rect() const { return fRect; }
 
     void setPlot(GrPlot* plot) {
         SkASSERT(NULL == plot || NULL == fPlot);
         fPlot = plot;
     }
     GrPlot* plot() { return fPlot; }
 
     bool isAtlased() const { return SkToBool(fPlot); }
 
     void setLocked(bool locked) { fLocked = locked; }
     bool locked() const { return fLocked; }
 
     SkDEBUGCODE(const GrPlot* plot() const { return fPlot; })
     SkDEBUGCODE(void validate(const GrTexture* backingTexture) const;)
 
 private:
     const Key       fKey;
 
     // The "saveLayer" operation index of the cached layer
-    const int       fStart;
+    const unsigned  fStart;
     // The final "restore" operation index of the cached layer
-    const int       fStop;
+    const unsigned  fStop;
 
     const SkIRect   fBounds;
 
     // The paint used when dropping the layer down into the owning canvas.
     // Can be NULL. This class makes a copy for itself.
     const SkPaint*  fPaint;
 
     // fTexture is a ref on the atlasing texture for atlased layers and a
     // ref on a GrTexture for non-atlased textures.
     GrTexture*      fTexture;
 
     // For both atlased and non-atlased layers 'fRect' contains the  bound of
     // the layer in whichever texture it resides. It is empty when 'fTexture'
     // is NULL.
-    GrIRect16       fRect;
+    SkIRect         fRect;
 
     // For atlased layers, fPlot stores the atlas plot in which the layer rests.
     // It is always NULL for non-atlased layers.
     GrPlot*         fPlot;
 
     // The number of actively hoisted layers using this cached image (e.g.,
     // extant GrHoistedLayers pointing at this object). This object will
     // be unlocked when the use count reaches 0.
     int             fUses;
 
@@ skipping 22 matching lines @@
 // classes.
 class GrLayerCache {
 public:
     GrLayerCache(GrContext*);
     ~GrLayerCache();
 
     // As a cache, the GrLayerCache can be ordered to free up all its cached
     // elements by the GrContext
     void freeAll();
 
+    GrCachedLayer* findLayer(uint32_t pictureID, const SkMatrix& ctm,
+                             const unsigned* key, int keySize);
     GrCachedLayer* findLayerOrCreate(uint32_t pictureID,
                                      int start, int stop, 
                                      const SkIRect& bounds,
                                      const SkMatrix& initialMat,
-                                     const int* key, int keySize,
+                                     const unsigned* key, int keySize,
                                      const SkPaint* paint);
 
     // Attempt to place 'layer' in the atlas. Return true on success; false on failure.
     // When true is returned, 'needsRendering' will indicate if the layer must be (re)drawn.
     // Additionally, the GPU resources will be locked.
     bool tryToAtlas(GrCachedLayer* layer, const GrSurfaceDesc& desc, bool* needsRendering);
 
     // Attempt to lock the GPU resources required for a layer. Return true on success;
     // false on failure. When true is returned 'needsRendering' will indicate if the
     // layer must be (re)drawn.
@@ skipping 62 matching lines @@
     // layers used in it decrement the lock count for the used plots.
     // Plots with a 0 lock count are open for recycling/purging.
     int fPlotLocks[kNumPlotsX * kNumPlotsY];
 
     // Inform the cache that layer's cached image is not currently required
     void unlock(GrCachedLayer* layer);
 
     void initAtlas();
     GrCachedLayer* createLayer(uint32_t pictureID, int start, int stop,
                                const SkIRect& bounds, const SkMatrix& initialMat,
-                               const int* key, int keySize,
+                               const unsigned* key, int keySize,
                                const SkPaint* paint);
 
     // Remove all the layers (and unlock any resources) associated with 'pictureID'
     void purge(uint32_t pictureID);
 
     void purgePlot(GrPlot* plot);
 
     // Try to find a purgeable plot and clear it out. Return true if a plot
     // was purged; false otherwise.
     bool purgePlot();
 
     void incPlotLock(int plotIdx) { ++fPlotLocks[plotIdx]; }
     void decPlotLock(int plotIdx) {
         SkASSERT(fPlotLocks[plotIdx] > 0);
         --fPlotLocks[plotIdx];
     }
 
     // for testing
     friend class TestingAccess;
     int numLayers() const { return fLayerHash.count(); }
-    GrCachedLayer* findLayer(uint32_t pictureID, const SkMatrix& ctm,
-                             const int* key, int keySize);
 };
 
 #endif