Revert "makeSurface defaults to raster"
This reverts commit 29a4a684af2525d78a1090fba2d3dea2b6a59fc7.
Reason for revert: some configs fail
Original change's description:
> makeSurface defaults to raster
>
> Rather that returning nullptr for a recording
> canvas, return a raster canvas instead.
>
> R=​reed@google.com,robertphillips@google.com
>
> Bug: skia:
> Change-Id: I211d8ef368b9aec6d14cc72d1652ac6a03f3fa7b
> Reviewed-on: https://skia-review.googlesource.com/151666
> Commit-Queue: Cary Clark <caryclark@skia.org>
> Reviewed-by: Robert Phillips <robertphillips@google.com>
TBR=robertphillips@google.com,reed@google.com,caryclark@skia.org
Change-Id: I82d2c3e4589a2ca8523bbf86884ed68b1431631d
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/151824
Reviewed-by: Cary Clark <caryclark@google.com>
Commit-Queue: Cary Clark <caryclark@google.com>
diff --git a/gm/dstreadshuffle.cpp b/gm/dstreadshuffle.cpp
index 90c44b3..c4c19fc 100644
--- a/gm/dstreadshuffle.cpp
+++ b/gm/dstreadshuffle.cpp
@@ -154,6 +154,20 @@
canvas->imageInfo().refColorSpace());
}
auto surf = canvas->makeSurface(info);
+ if (!surf) {
+ // Fall back to raster. Raster supports only one of the 8 bit per-channel RGBA or BGRA
+ // formats. This fall back happens when running with --preAbandonGpuContext.
+ if ((info.colorType() == kRGBA_8888_SkColorType ||
+ info.colorType() == kBGRA_8888_SkColorType) &&
+ info.colorType() != kN32_SkColorType) {
+ info = SkImageInfo::Make(35, 35,
+ kN32_SkColorType,
+ canvas->imageInfo().alphaType(),
+ canvas->imageInfo().refColorSpace());
+ }
+ surf = SkSurface::MakeRaster(info);
+ SkASSERT(surf);
+ }
canvas->scale(5.f, 5.f);
canvas->translate(67.f, 10.f);
DrawHairlines(surf->getCanvas());