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>
70 lines
2.6 KiB
C++
70 lines
2.6 KiB
C++
/*
|
|
* Copyright 2015 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 "Resources.h"
|
|
#include "SkCanvas.h"
|
|
#include "SkSurface.h"
|
|
#include "sk_tool_utils.h"
|
|
|
|
static sk_sp<SkImage> make_image(SkCanvas* rootCanvas, SkColor color) {
|
|
SkImageInfo info = SkImageInfo::MakeN32Premul(100, 100);
|
|
auto surface(sk_tool_utils::makeSurface(rootCanvas, info));
|
|
|
|
SkPaint paint;
|
|
paint.setAntiAlias(true);
|
|
paint.setColor(color);
|
|
surface->getCanvas()->drawIRect(SkIRect::MakeXYWH(25, 25, 50, 50), paint);
|
|
return surface->makeImageSnapshot();
|
|
}
|
|
|
|
DEF_SIMPLE_GM(localmatriximageshader, canvas, 250, 250) {
|
|
sk_sp<SkImage> redImage = make_image(canvas, SK_ColorRED);
|
|
SkMatrix translate = SkMatrix::MakeTrans(100.0f, 0.0f);
|
|
SkMatrix rotate;
|
|
rotate.setRotate(45.0f);
|
|
sk_sp<SkShader> redImageShader = redImage->makeShader(&translate);
|
|
sk_sp<SkShader> redLocalMatrixShader = redImageShader->makeWithLocalMatrix(rotate);
|
|
|
|
// Rotate about the origin will happen first.
|
|
SkPaint paint;
|
|
paint.setShader(redLocalMatrixShader);
|
|
canvas->drawIRect(SkIRect::MakeWH(250, 250), paint);
|
|
|
|
sk_sp<SkImage> blueImage = make_image(canvas, SK_ColorBLUE);
|
|
sk_sp<SkShader> blueImageShader = blueImage->makeShader(&rotate);
|
|
sk_sp<SkShader> blueLocalMatrixShader = blueImageShader->makeWithLocalMatrix(translate);
|
|
|
|
// Translate will happen first.
|
|
paint.setShader(blueLocalMatrixShader);
|
|
canvas->drawIRect(SkIRect::MakeWH(250, 250), paint);
|
|
|
|
canvas->translate(100.0f, 0.0f);
|
|
|
|
// Use isAImage() and confirm that the shaders will draw exactly the same (to the right by 100).
|
|
SkShader::TileMode mode[2];
|
|
SkMatrix matrix;
|
|
SkImage* image = redLocalMatrixShader->isAImage(&matrix, mode);
|
|
paint.setShader(image->makeShader(mode[0], mode[1], &matrix));
|
|
canvas->drawIRect(SkIRect::MakeWH(250, 250), paint);
|
|
image = blueLocalMatrixShader->isAImage(&matrix, mode);
|
|
paint.setShader(image->makeShader(mode[0], mode[1], &matrix));
|
|
canvas->drawIRect(SkIRect::MakeWH(250, 250), paint);
|
|
}
|
|
|
|
DEF_SIMPLE_GM(localmatriximageshader_filtering, canvas, 256, 256) {
|
|
// Test that filtering decisions (eg bicubic for upscale) are made correctly when the scale
|
|
// comes from a local matrix shader.
|
|
auto image = GetResourceAsImage("images/mandrill_256.png");
|
|
SkPaint p;
|
|
p.setFilterQuality(kHigh_SkFilterQuality);
|
|
SkMatrix m = SkMatrix::MakeScale(2.0f);
|
|
p.setShader(image->makeShader()->makeWithLocalMatrix(m));
|
|
|
|
canvas->drawRect(SkRect::MakeXYWH(0, 0, 256, 256), p);
|
|
}
|