commit b92234a3210bce532f103d71002f4e04d336a182
author Brian Osman <brianosman@google.com> Wed Jan 25 14:13:00 2017 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Jan 25 14:54:35 2017 +0000
tree 2d0e7a4cf5d912af913a5dbcce7f6bb14f94a256
parent e330eb2c0e6bab83add6986119864b546bf0b0a7

Revert "Remove SkImage::MakeTextureFromPixmap"

This reverts commit 8ccbbb455c6ef194920c47e846b95b50f5017138.

Reason for revert: Chrome perf regression

BUG=chrome:684483

Original change's description:
> Remove SkImage::MakeTextureFromPixmap
> 
> Another step towards reducing the number of texture upload paths.
> 
> BUG=skia:
> 
> Change-Id: Ica185e7334f52dc9ebf87e21fe6f60589ef87bb3
> Reviewed-on: https://skia-review.googlesource.com/7346
> Commit-Queue: Brian Osman <brianosman@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> 

TBR=bsalomon@google.com,robertphillips@google.com,brianosman@google.com,cblume@google.com
# Not skipping CQ checks because original CL landed > 1 day ago.
BUG=skia:

Change-Id: I8bf6970b764018f3ebcac8123e4d6a8ad05317ff
Reviewed-on: https://skia-review.googlesource.com/7484
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>

src/image/SkImage_Gpu.cpp

diff --git a/src/image/SkImage_Gpu.cpp b/src/image/SkImage_Gpu.cpp
index a1ecf5b..ec1968f 100644
--- a/src/image/SkImage_Gpu.cpp
+++ b/src/image/SkImage_Gpu.cpp
@@ -371,6 +371,20 @@
     return MakeRasterData(info, data, rowBytes);
 }
 
+sk_sp<SkImage> SkImage::MakeTextureFromPixmap(GrContext* ctx, const SkPixmap& pixmap,
+                                              SkBudgeted budgeted) {
+    if (!ctx) {
+        return nullptr;
+    }
+    sk_sp<GrTexture> texture(GrUploadPixmapToTexture(ctx, pixmap, budgeted));
+    if (!texture) {
+        return nullptr;
+    }
+    return sk_make_sp<SkImage_Gpu>(texture->width(), texture->height(), kNeedNewImageUniqueID,
+                                   pixmap.alphaType(), std::move(texture),
+                                   sk_ref_sp(pixmap.info().colorSpace()), budgeted);
+}
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace {
@@ -666,14 +680,21 @@
     }
     SkImageInfo info = SkImageInfo::Make(dti->fWidth, dti->fHeight,
                                          dti->fColorType, dti->fAlphaType, colorSpace);
-    SkAutoSTArray<16, GrMipLevel> texels(mipLevelCount);
-    for (int i = 0; i < mipLevelCount; i++) {
-        texels[i].fPixels = dti->fMipMapLevelData[i].fPixelData;
-        texels[i].fRowBytes = dti->fMipMapLevelData[i].fRowBytes;
-    }
+    if (mipLevelCount == 1) {
+        SkPixmap pixmap;
+        pixmap.reset(info, dti->fMipMapLevelData[0].fPixelData, dti->fMipMapLevelData[0].fRowBytes);
+        return SkImage::MakeTextureFromPixmap(context, pixmap, budgeted);
+    } else {
+        std::unique_ptr<GrMipLevel[]> texels(new GrMipLevel[mipLevelCount]);
+        for (int i = 0; i < mipLevelCount; i++) {
+            texels[i].fPixels = dti->fMipMapLevelData[i].fPixelData;
+            texels[i].fRowBytes = dti->fMipMapLevelData[i].fRowBytes;
+        }
 
-    return SkImage::MakeTextureFromMipMap(context, info, texels.get(), mipLevelCount,
-                                          SkBudgeted::kYes, dti->fColorMode);
+        return SkImage::MakeTextureFromMipMap(context, info, texels.get(),
+                                              mipLevelCount, SkBudgeted::kYes,
+                                              dti->fColorMode);
+    }
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////