writePixels should notify GPU that pixels have changed

R=reed@google.com,robertphillips@google.com
Bug: skia:7644
Change-Id: I469c537a649e4d8d05a78cedb26caa3057d824c1
Reviewed-on: https://skia-review.googlesource.com/108961
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Cary Clark <caryclark@google.com>

2 files changed, 26 insertions, 0 deletions

diff --git a/gm/copyTo4444.cpp b/gm/copyTo4444.cpp
index b860dca3e9..ec9b72610d 100644
--- a/gm/copyTo4444.cpp
+++ b/gm/copyTo4444.cpp
@@ -54,3 +54,28 @@ static GM* MyFactory(void*) { return new CopyTo4444GM; }
 static GMRegistry reg(MyFactory);
 
 }
+
+DEF_SIMPLE_GM(format4444, canvas, 64, 64) {
+    canvas->scale(16, 16);
+    SkBitmap bitmap;
+    SkImageInfo imageInfo = SkImageInfo::Make(1, 1, kARGB_4444_SkColorType, kPremul_SkAlphaType);
+    bitmap.allocPixels(imageInfo);
+    SkCanvas offscreen(bitmap);
+    offscreen.clear(SK_ColorRED);
+    canvas->drawBitmap(bitmap, 0, 0);
+    offscreen.clear(SK_ColorBLUE);
+    canvas->drawBitmap(bitmap, 1, 1);
+    auto pack4444 = [](unsigned a, unsigned r, unsigned g, unsigned b) -> uint16_t {
+        return (a << 0) | (b << 4) | (g << 8) | (r << 12);
+    };
+    uint16_t red4444 = pack4444(0xF, 0xF, 0x0, 0x0);
+    uint16_t blue4444 = pack4444(0xF, 0x0, 0x0, 0x0F);
+    SkPixmap redPixmap(imageInfo, &red4444, 2);
+    if (bitmap.writePixels(redPixmap, 0, 0)) {
+        canvas->drawBitmap(bitmap, 2, 2);
+    }
+    SkPixmap bluePixmap(imageInfo, &blue4444, 2);
+    if (bitmap.writePixels(bluePixmap, 0, 0)) {
+        canvas->drawBitmap(bitmap, 3, 3);
+    }
+}
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp
index 0e88e03b06..7223fdb828 100644
--- a/src/core/SkBitmap.cpp
+++ b/src/core/SkBitmap.cpp
@@ -500,6 +500,7 @@ bool SkBitmap::writePixels(const SkPixmap& src, int dstX, int dstY,
     const SkImageInfo dstInfo = this->info().makeWH(rec.fInfo.width(), rec.fInfo.height());
     SkConvertPixels(dstInfo, dstPixels, this->rowBytes(), rec.fInfo, rec.fPixels, rec.fRowBytes,
                     nullptr, behavior);
+    this->notifyPixelsChanged();
     return true;
 }