commit 587fb57aabc9871950307a70855af9491319523d
author Sally Qi <sallyqi@google.com> Fri Mar 03 15:50:06 2023 -0800
committer Sally Qi <sallyqi@google.com> Tue Mar 07 11:23:49 2023 -0800
tree d40467e37592c803a4d2690096ee5c92346fe34c
parent 5a0ac4f8e337b2892c0806095ffbe13feb8f99d8

Support gainmap HW copy.

- for Bitmap::allocateHardwareBitmap to create and upload a hardware
  version of the gainmap.

Bug: 267216439
Test: android.graphics.cts.BitmapFactoryTest,
android.graphics.cts.BitmapRegionDecoderTest,
android.graphics.cts.ImageDecoderTest, android.graphics.cts.GainmapTest

Change-Id: Ie080896425dc82a605b2bc41e97ddc2420f5328a

libs/hwui/jni/Bitmap.cpp

diff --git a/libs/hwui/jni/Bitmap.cpp b/libs/hwui/jni/Bitmap.cpp
index 3f9c4bd..6ee7576 100644
--- a/libs/hwui/jni/Bitmap.cpp
+++ b/libs/hwui/jni/Bitmap.cpp
@@ -386,15 +386,10 @@
             return NULL;
         }
         if (hasGainmap) {
-            auto gainmap = sp<uirenderer::Gainmap>::make();
-            gainmap->info = original.gainmap()->info;
-            const SkBitmap skSrcBitmap = original.gainmap()->bitmap->getSkBitmap();
-            sk_sp<Bitmap> skBitmap(Bitmap::allocateHardwareBitmap(skSrcBitmap));
-            if (!skBitmap.get()) {
-                return NULL;
+            auto gm = uirenderer::Gainmap::allocateHardwareGainmap(original.gainmap());
+            if (gm) {
+                bitmap->setGainmap(std::move(gm));
             }
-            gainmap->bitmap = std::move(skBitmap);
-            bitmap->setGainmap(std::move(gainmap));
         }
         return createBitmap(env, bitmap.release(), getPremulBitmapCreateFlags(isMutable));
     }