commit bc074a68dfd7523199f8231fb7f992d9bef06d9d
author Brian Salomon <bsalomon@google.com> Wed Mar 18 10:06:13 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Mar 18 17:27:41 2020 +0000
tree 190a0da59fa2344dc81a5abe8e24d70b755df0ae
parent 0b1e5fc8f228a2d5c16779db63976aed2376356f

Add SkBudgeted parameter to SkImage::makeTextureImage().

Also strengthens/adds some guarantees about this function:
* Always returns the same image if the original is texture-backed and
compatible with GrMipMapped (WRT HW MIP support)
* If a new texture backed image is returned it is always an uncached
texture that is not shared with another image or owned by an image
generator.

Adds a GrImageTexGenPolicy that allows control through image/bitmap
GrTextureProducers of whether a new texture must be made and whether
that texture should be budgeted or not.

Increases unit test coverage of this API.

Bug: skia:8669

Change-Id: Ifc0681856114a08fc8cfc57ca83d22efb1c1f166
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/274938
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/GrBitmapTextureMaker.cpp

diff --git a/src/gpu/GrBitmapTextureMaker.cpp b/src/gpu/GrBitmapTextureMaker.cpp
index 172d34a..f6bc4f2 100644
--- a/src/gpu/GrBitmapTextureMaker.cpp
+++ b/src/gpu/GrBitmapTextureMaker.cpp
@@ -26,10 +26,27 @@
     return {ct, bitmap.alphaType(), bitmap.refColorSpace(), bitmap.dimensions()};
 }
 
-GrBitmapTextureMaker::GrBitmapTextureMaker(GrRecordingContext* context, const SkBitmap& bitmap,
-                                           Cached cached, SkBackingFit fit)
-        : INHERITED(context, get_image_info(context, bitmap)), fBitmap(bitmap), fFit(fit) {
-    if (!bitmap.isVolatile() && cached == Cached::kYes) {
+GrBitmapTextureMaker::GrBitmapTextureMaker(GrRecordingContext* context,
+                                           const SkBitmap& bitmap,
+                                           SkBackingFit fit)
+        : GrBitmapTextureMaker(context, bitmap, GrImageTexGenPolicy::kNew_Uncached_Budgeted, fit) {}
+
+GrBitmapTextureMaker::GrBitmapTextureMaker(GrRecordingContext* context,
+                                           const SkBitmap& bitmap,
+                                           GrImageTexGenPolicy cachePolicy)
+        : GrBitmapTextureMaker(context, bitmap, cachePolicy, SkBackingFit::kExact) {}
+
+GrBitmapTextureMaker::GrBitmapTextureMaker(GrRecordingContext* context,
+                                           const SkBitmap& bitmap,
+                                           GrImageTexGenPolicy cachePolicy,
+                                           SkBackingFit fit)
+        : INHERITED(context, get_image_info(context, bitmap))
+        , fBitmap(bitmap)
+        , fFit(fit)
+        , fBudgeted(cachePolicy == GrImageTexGenPolicy::kNew_Uncached_Unbudgeted
+                            ? SkBudgeted::kNo
+                            : SkBudgeted::kYes) {
+    if (!bitmap.isVolatile() && cachePolicy == GrImageTexGenPolicy::kDraw) {
         SkIPoint origin = bitmap.pixelRefOrigin();
         SkIRect subset = SkIRect::MakeXYWH(origin.fX, origin.fY, bitmap.width(),
                                            bitmap.height());
@@ -69,9 +86,9 @@
                 return {};
             }
             copy8888.setImmutable();
-            proxy = proxyProvider->createProxyFromBitmap(copy8888, mipMapped, fFit);
+            proxy = proxyProvider->createProxyFromBitmap(copy8888, mipMapped, fFit, fBudgeted);
         } else {
-            proxy = proxyProvider->createProxyFromBitmap(fBitmap, mipMapped, fFit);
+            proxy = proxyProvider->createProxyFromBitmap(fBitmap, mipMapped, fFit, fBudgeted);
         }
         if (proxy) {
             swizzle = this->context()->priv().caps()->getReadSwizzle(proxy->backendFormat(),