Revert "Remove isMipMapped from GrSurfaceDesc" and follow up find exact scratch CL

This reverts commit 52cb5fe23b8f960bb3248620c8f4e2f2957b6685.
This reverts commit e1fbf170580a4b932d0abcb11593fb1ef0cac60b.

TBR:bsalomon@googole.com

Bug: chromium:763333
Change-Id: Ie94e00c3c7231e32f009b9dc7bb51ebb53baf7b1
Reviewed-on: https://skia-review.googlesource.com/44400
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>

1 files changed, 5 insertions, 4 deletions

diff --git a/src/gpu/GrResourceProvider.h b/src/gpu/GrResourceProvider.h
index 7b794ad236..1ab1ec42fc 100644
--- a/src/gpu/GrResourceProvider.h
+++ b/src/gpu/GrResourceProvider.h
@@ -163,7 +163,7 @@ public:
 
     /** These flags govern which scratch resources we are allowed to return */
     enum Flags {
-        kMipMapped_Flag           = 0x1,
+        kExact_Flag           = 0x1,
 
         /** If the caller intends to do direct reads/writes to/from the CPU then this flag must be
          *  set when accessing resources during a GrOpList flush. This includes the execution of
@@ -173,10 +173,12 @@ public:
          */
         kNoPendingIO_Flag     = 0x2,
 
+        kNoCreate_Flag        = 0x4,
+
         /** Normally the caps may indicate a preference for client-side buffers. Set this flag when
          *  creating a buffer to guarantee it resides in GPU memory.
          */
-        kRequireGpuMemory_Flag = 0x4,
+        kRequireGpuMemory_Flag = 0x8,
     };
 
     /**
@@ -260,8 +262,7 @@ private:
      * Try to find an existing scratch texture that exactly matches 'desc'. If successful
      * update the budgeting accordingly.
      */
-    sk_sp<GrTexture> getExactScratch(const GrSurfaceDesc&, SkBudgeted, uint32_t flags,
-                                     bool isMipMapped);
+    sk_sp<GrTexture> getExactScratch(const GrSurfaceDesc&, SkBudgeted, uint32_t flags);
 
     GrResourceCache* cache() { return fCache; }
     const GrResourceCache* cache() const { return fCache; }