a24712e4dc
This reverts commit 29a4a684af
.
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>
188 lines
5.9 KiB
C++
188 lines
5.9 KiB
C++
/*
|
|
* Copyright 2014 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "gm.h"
|
|
#include "sk_tool_utils.h"
|
|
#include "SkGradientShader.h"
|
|
#include "SkSurface.h"
|
|
#include "SkSurfaceProps.h"
|
|
|
|
#define W 200
|
|
#define H 100
|
|
|
|
static sk_sp<SkShader> make_shader() {
|
|
int a = 0x99;
|
|
int b = 0xBB;
|
|
SkPoint pts[] = { { 0, 0 }, { W, H } };
|
|
SkColor colors[] = { SkColorSetRGB(a, a, a), SkColorSetRGB(b, b, b) };
|
|
return SkGradientShader::MakeLinear(pts, colors, nullptr, 2, SkShader::kClamp_TileMode);
|
|
}
|
|
|
|
static sk_sp<SkSurface> make_surface(GrContext* ctx, const SkImageInfo& info, SkPixelGeometry geo) {
|
|
SkSurfaceProps props(0, geo);
|
|
if (ctx) {
|
|
return SkSurface::MakeRenderTarget(ctx, SkBudgeted::kNo, info, 0, &props);
|
|
} else {
|
|
return SkSurface::MakeRaster(info, &props);
|
|
}
|
|
}
|
|
|
|
static void test_draw(SkCanvas* canvas, const char label[]) {
|
|
SkPaint paint;
|
|
|
|
paint.setAntiAlias(true);
|
|
paint.setLCDRenderText(true);
|
|
paint.setDither(true);
|
|
|
|
paint.setShader(make_shader());
|
|
canvas->drawRect(SkRect::MakeWH(W, H), paint);
|
|
paint.setShader(nullptr);
|
|
|
|
paint.setColor(SK_ColorWHITE);
|
|
paint.setTextSize(32);
|
|
paint.setTextAlign(SkPaint::kCenter_Align);
|
|
sk_tool_utils::set_portable_typeface(&paint);
|
|
canvas->drawString(label, W / 2, H * 3 / 4, paint);
|
|
}
|
|
|
|
class SurfacePropsGM : public skiagm::GM {
|
|
public:
|
|
SurfacePropsGM() {}
|
|
|
|
protected:
|
|
SkString onShortName() override {
|
|
return SkString("surfaceprops");
|
|
}
|
|
|
|
SkISize onISize() override {
|
|
return SkISize::Make(W, H * 5);
|
|
}
|
|
|
|
void onDraw(SkCanvas* canvas) override {
|
|
GrContext* ctx = canvas->getGrContext();
|
|
|
|
// must be opaque to have a hope of testing LCD text
|
|
const SkImageInfo info = SkImageInfo::MakeN32(W, H, kOpaque_SkAlphaType);
|
|
|
|
const struct {
|
|
SkPixelGeometry fGeo;
|
|
const char* fLabel;
|
|
} recs[] = {
|
|
{ kUnknown_SkPixelGeometry, "Unknown" },
|
|
{ kRGB_H_SkPixelGeometry, "RGB_H" },
|
|
{ kBGR_H_SkPixelGeometry, "BGR_H" },
|
|
{ kRGB_V_SkPixelGeometry, "RGB_V" },
|
|
{ kBGR_V_SkPixelGeometry, "BGR_V" },
|
|
};
|
|
|
|
SkScalar x = 0;
|
|
SkScalar y = 0;
|
|
for (const auto& rec : recs) {
|
|
auto surface(make_surface(ctx, info, rec.fGeo));
|
|
if (!surface) {
|
|
SkDebugf("failed to create surface! label: %s", rec.fLabel);
|
|
continue;
|
|
}
|
|
test_draw(surface->getCanvas(), rec.fLabel);
|
|
surface->draw(canvas, x, y, nullptr);
|
|
y += H;
|
|
}
|
|
}
|
|
|
|
private:
|
|
typedef GM INHERITED;
|
|
};
|
|
DEF_GM( return new SurfacePropsGM )
|
|
|
|
#ifdef SK_DEBUG
|
|
static bool equal(const SkSurfaceProps& a, const SkSurfaceProps& b) {
|
|
return a.flags() == b.flags() && a.pixelGeometry() == b.pixelGeometry();
|
|
}
|
|
#endif
|
|
|
|
class NewSurfaceGM : public skiagm::GM {
|
|
public:
|
|
NewSurfaceGM() {}
|
|
|
|
protected:
|
|
SkString onShortName() override {
|
|
return SkString("surfacenew");
|
|
}
|
|
|
|
SkISize onISize() override {
|
|
return SkISize::Make(300, 140);
|
|
}
|
|
|
|
static void drawInto(SkCanvas* canvas) {
|
|
canvas->drawColor(SK_ColorRED);
|
|
}
|
|
|
|
void onDraw(SkCanvas* canvas) override {
|
|
SkImageInfo info = SkImageInfo::MakeN32Premul(100, 100);
|
|
|
|
auto surf(sk_tool_utils::makeSurface(canvas, info, nullptr));
|
|
drawInto(surf->getCanvas());
|
|
|
|
sk_sp<SkImage> image(surf->makeImageSnapshot());
|
|
canvas->drawImage(image, 10, 10, nullptr);
|
|
|
|
auto surf2(surf->makeSurface(info));
|
|
drawInto(surf2->getCanvas());
|
|
|
|
// Assert that the props were communicated transitively through the first image
|
|
SkASSERT(equal(surf->props(), surf2->props()));
|
|
|
|
sk_sp<SkImage> image2(surf2->makeImageSnapshot());
|
|
canvas->drawImage(image2.get(), 10 + SkIntToScalar(image->width()) + 10, 10, nullptr);
|
|
}
|
|
|
|
private:
|
|
typedef GM INHERITED;
|
|
};
|
|
DEF_GM( return new NewSurfaceGM )
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
DEF_SIMPLE_GM(copy_on_write_retain, canvas, 256, 256) {
|
|
const SkImageInfo info = SkImageInfo::MakeN32Premul(256, 256);
|
|
sk_sp<SkSurface> surf = sk_tool_utils::makeSurface(canvas, info);
|
|
|
|
surf->getCanvas()->clear(SK_ColorRED);
|
|
// its important that image survives longer than the next draw, so the surface will see
|
|
// an outstanding image, and have to decide if it should retain or discard those pixels
|
|
sk_sp<SkImage> image = surf->makeImageSnapshot();
|
|
|
|
// normally a clear+opaque should trigger the discard optimization, but since we have a clip
|
|
// it should not (we need the previous red pixels).
|
|
surf->getCanvas()->clipRect(SkRect::MakeWH(128, 256));
|
|
surf->getCanvas()->clear(SK_ColorBLUE);
|
|
|
|
// expect to see two rects: blue | red
|
|
canvas->drawImage(surf->makeImageSnapshot(), 0, 0, nullptr);
|
|
}
|
|
|
|
DEF_SIMPLE_GM(copy_on_write_savelayer, canvas, 256, 256) {
|
|
const SkImageInfo info = SkImageInfo::MakeN32Premul(256, 256);
|
|
sk_sp<SkSurface> surf = sk_tool_utils::makeSurface(canvas, info);
|
|
surf->getCanvas()->clear(SK_ColorRED);
|
|
// its important that image survives longer than the next draw, so the surface will see
|
|
// an outstanding image, and have to decide if it should retain or discard those pixels
|
|
sk_sp<SkImage> image = surf->makeImageSnapshot();
|
|
|
|
// now draw into a full-screen layer. This should (a) trigger a copy-on-write, but it should
|
|
// not trigger discard, even tho its alpha (SK_ColorBLUE) is opaque, since it is in a layer
|
|
// with a non-opaque paint.
|
|
SkPaint paint;
|
|
paint.setAlpha(0x40);
|
|
surf->getCanvas()->saveLayer({0, 0, 256, 256}, &paint);
|
|
surf->getCanvas()->clear(SK_ColorBLUE);
|
|
surf->getCanvas()->restore();
|
|
|
|
// expect to see two rects: blue blended on red
|
|
canvas->drawImage(surf->makeImageSnapshot(), 0, 0, nullptr);
|
|
}
|