diff options
author | Matt Sarett <msarett@google.com> | 2017-04-12 10:21:30 -0400 |
---|---|---|
committer | Matt Sarett <msarett@google.com> | 2017-04-12 15:20:28 +0000 |
commit | 6b4c94b8e996f6cc1f4fa61e9182dc6796c6d533 (patch) | |
tree | 25abfa8637e5480ed20a9a9c097688089596cd62 | |
parent | 11338de0cc999efa09cb1cf8be7623a8332cfeb8 (diff) | |
download | skia-6b4c94b8e996f6cc1f4fa61e9182dc6796c6d533.tar.gz |
Fix SkLocalMatrixShader::isAImage() to respect local matrix and image local matrix
Fixes cts tests.
b/37161109
b/37237678
Bug: skia:
Change-Id: Ida9ac5e4261e8a6b22e8cdc0e585e0e7929dbbfd
Reviewed-on: https://skia-review.googlesource.com/13249
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>
(cherry picked from commit e5efa51b2acc86d1993132348d5b465855a653cc)
Reviewed-on: https://skia-review.googlesource.com/13257
Reviewed-by: Matt Sarett <msarett@google.com>
-rw-r--r-- | gm/localmatriximageshader.cpp | 60 | ||||
-rw-r--r-- | gn/gm.gni | 1 | ||||
-rw-r--r-- | src/core/SkLocalMatrixShader.cpp | 11 | ||||
-rw-r--r-- | src/core/SkLocalMatrixShader.h | 4 |
4 files changed, 73 insertions, 3 deletions
diff --git a/gm/localmatriximageshader.cpp b/gm/localmatriximageshader.cpp new file mode 100644 index 0000000000..2c9fcd2601 --- /dev/null +++ b/gm/localmatriximageshader.cpp @@ -0,0 +1,60 @@ +/* + * 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 "SkCanvas.h" +#include "SkSurface.h" + +static sk_sp<SkImage> make_image(SkCanvas* rootCanvas, SkColor color) { + SkImageInfo info = SkImageInfo::MakeN32Premul(100, 100); + auto surface(rootCanvas->makeSurface(info)); + if (!surface) { + surface = SkSurface::MakeRaster(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(SkShader::TileMode::kClamp_TileMode, + SkShader::TileMode::kClamp_TileMode, &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(SkShader::TileMode::kClamp_TileMode, + SkShader::TileMode::kClamp_TileMode, &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); +} @@ -188,6 +188,7 @@ gm_sources = [ "$_gm/lightingshaderbevel.cpp", "$_gm/linepaths.cpp", "$_gm/localmatriximagefilter.cpp", + "$_gm/localmatriximageshader.cpp", "$_gm/lumafilter.cpp", "$_gm/manypaths.cpp", "$_gm/matrixconvolution.cpp", diff --git a/src/core/SkLocalMatrixShader.cpp b/src/core/SkLocalMatrixShader.cpp index 9d9e109fcb..22eb0fec93 100644 --- a/src/core/SkLocalMatrixShader.cpp +++ b/src/core/SkLocalMatrixShader.cpp @@ -51,6 +51,17 @@ SkShader::Context* SkLocalMatrixShader::onMakeContext( return fProxyShader->makeContext(newRec, alloc); } +SkImage* SkLocalMatrixShader::onIsAImage(SkMatrix* outMatrix, enum TileMode* mode) const { + SkMatrix imageMatrix; + SkImage* image = fProxyShader->isAImage(&imageMatrix, mode); + if (outMatrix) { + // Local matrix must be applied first so it is on the right side of the concat. + *outMatrix = SkMatrix::Concat(imageMatrix, this->getLocalMatrix()); + } + + return image; +} + bool SkLocalMatrixShader::onAppendStages(SkRasterPipeline* p, SkColorSpace* dst, SkArenaAlloc* scratch, diff --git a/src/core/SkLocalMatrixShader.h b/src/core/SkLocalMatrixShader.h index 5c0424053b..cba140906b 100644 --- a/src/core/SkLocalMatrixShader.h +++ b/src/core/SkLocalMatrixShader.h @@ -45,9 +45,7 @@ protected: Context* onMakeContext(const ContextRec&, SkArenaAlloc*) const override; - SkImage* onIsAImage(SkMatrix* matrix, TileMode* mode) const override { - return fProxyShader->isAImage(matrix, mode); - } + SkImage* onIsAImage(SkMatrix* matrix, TileMode* mode) const override; bool onAppendStages(SkRasterPipeline*, SkColorSpace*, SkArenaAlloc*, const SkMatrix&, const SkPaint&, const SkMatrix*) const override; |