aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm/all_bitmap_configs.cpp
diff options
context:
space:
mode:
authorGravatar Mike Reed <reed@google.com>2017-01-19 13:48:39 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-01-19 19:26:21 +0000
commit1baaacac74d24604e3dfca9857fbd647df375997 (patch)
treedbc22ee1c88765a5f0661621ec76cb262aff3de4 /gm/all_bitmap_configs.cpp
parent43ae4b4e6bcb3575dae6ab385d6d8cf8e92e57ec (diff)
explictly fail to draw unpremul, as this is buggy, incomplete, tricky, and unused
BUG=skia: Change-Id: Ie9da6015cc4955c0f27f6db53fc6ae532e0132f4 Reviewed-on: https://skia-review.googlesource.com/7304 Commit-Queue: Mike Reed <reed@google.com> Reviewed-by: Matt Sarett <msarett@google.com>
Diffstat (limited to 'gm/all_bitmap_configs.cpp')
-rw-r--r--gm/all_bitmap_configs.cpp14
1 files changed, 12 insertions, 2 deletions
diff --git a/gm/all_bitmap_configs.cpp b/gm/all_bitmap_configs.cpp
index e954fc33e5..0d9c2c5a3d 100644
--- a/gm/all_bitmap_configs.cpp
+++ b/gm/all_bitmap_configs.cpp
@@ -260,27 +260,37 @@ static void make_color_test_bitmap_variant(
*pm.writable_addr32(x, y) = make_pixel(x, y, alphaType);
}
}
+ bm->setImmutable();
}
-DEF_SIMPLE_GM(all_variants_8888, canvas, 4 * SCALE + 30, 2 * SCALE + 10) {
+DEF_SIMPLE_GM(all_variants_8888, canvas, 4 * SCALE + 30, 4 * SCALE + 30) {
sk_tool_utils::draw_checkerboard(canvas, SK_ColorLTGRAY, SK_ColorWHITE, 8);
sk_sp<SkColorSpace> colorSpaces[] {
SkColorSpace::MakeNamed(SkColorSpace::kSRGB_Named),
nullptr,
};
+
+ SkPaint rectPaint;
+ rectPaint.setColor(0x8000FF00);
+ SkRect r = { 0, 0, SCALE, SCALE };
+
for (auto colorSpace : colorSpaces) {
canvas->save();
+ // unpremul is expected to *not* draw anything
for (auto alphaType : {kPremul_SkAlphaType, kUnpremul_SkAlphaType}) {
canvas->save();
for (auto colorType : {kRGBA_8888_SkColorType, kBGRA_8888_SkColorType}) {
SkBitmap bm;
make_color_test_bitmap_variant(colorType, alphaType, colorSpace, &bm);
+ canvas->drawRect(r, rectPaint);
canvas->drawBitmap(bm, 0.0f, 0.0f);
+ canvas->drawRect(r.makeOffset(0, SCALE + 10), rectPaint);
+ canvas->drawImage(SkImage::MakeFromBitmap(bm), 0, SCALE + 10, nullptr);
canvas->translate(SCALE + 10, 0.0f);
}
canvas->restore();
- canvas->translate(0.0f, SCALE + 10);
+ canvas->translate(0.0f, (SCALE + 10) * 2);
}
canvas->restore();
canvas->translate(2 * (SCALE + 10), 0.0f);