diff options
| author |  Mike Reed <reed@google.com> | 2017-04-28 11:12:19 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-28 15:36:14 +0000 |
| commit | 0acd7954a9e654d7e9c11a532eeeeb2f18a76152 (patch) | |
| tree | f3f7265224b2b0d6e8e057e367851d86234bd5e7 /gm | |
| parent | b6069dfba7b7ab563a3fccb2f38307e47035300c (diff) | |
add helper makeShader for the common Clamp case
Bug: skia:
Change-Id: I22cac56f35fed16daede0cf1b3e34dfa6f5ae3ea
Reviewed-on: https://skia-review.googlesource.com/14625
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/composeshader.cpp | 7 | ||||
| -rw-r--r-- | gm/croppedrects.cpp | 3 | ||||
| -rw-r--r-- | gm/drawatlas.cpp | 3 | ||||
| -rw-r--r-- | gm/localmatriximageshader.cpp | 6 | ||||
| -rw-r--r-- | gm/rectangletexture.cpp | 3 |
5 files changed, 7 insertions, 15 deletions
diff --git a/gm/composeshader.cpp b/gm/composeshader.cpp index ff525f4777..90fcedc970 100644 --- a/gm/composeshader.cpp +++ b/gm/composeshader.cpp @@ -247,13 +247,10 @@ DEF_SIMPLE_GM(composeshader_bitmap2, canvas, 200, 200) { SkColorType::kAlpha_8_SkColorType, kPremul_SkAlphaType); skMask.installPixels(imageInfo, dst8Storage.begin(), width, nullptr, nullptr, nullptr); sk_sp<SkImage> skSrc = SkImage::MakeFromBitmap(skBitmap); - sk_sp<SkShader> skSrcShader = - skSrc->makeShader(SkShader::kClamp_TileMode, SkShader::kClamp_TileMode); sk_sp<SkImage> skMaskImage = SkImage::MakeFromBitmap(skMask); - sk_sp<SkShader> skMaskShader = skMaskImage->makeShader( - SkShader::kClamp_TileMode, SkShader::kClamp_TileMode); paint.setShader( - SkShader::MakeComposeShader(skMaskShader, skSrcShader, SkBlendMode::kSrcIn)); + SkShader::MakeComposeShader(skMaskImage->makeShader(), skSrc->makeShader(), + SkBlendMode::kSrcIn)); canvas->drawRect(r, paint); } diff --git a/gm/croppedrects.cpp b/gm/croppedrects.cpp index 0ea265c2fb..006e3d3dec 100644 --- a/gm/croppedrects.cpp +++ b/gm/croppedrects.cpp @@ -47,8 +47,7 @@ private: srcCanvas->drawRect(kSrcImageClip.makeInset(kStrokeWidth / 2, kStrokeWidth / 2), stroke); fSrcImage = srcSurface->makeImageSnapshot(); - fSrcImageShader = fSrcImage->makeShader(SkShader::kClamp_TileMode, - SkShader::kClamp_TileMode); + fSrcImageShader = fSrcImage->makeShader(); } void onDraw(SkCanvas* canvas) override { diff --git a/gm/drawatlas.cpp b/gm/drawatlas.cpp index d0609b5f57..de44b6d7a7 100644 --- a/gm/drawatlas.cpp +++ b/gm/drawatlas.cpp @@ -220,8 +220,7 @@ DEF_SIMPLE_GM(compare_atlas_vertices, canvas, 560, 585) { canvas->drawAtlas(image, &xform, &tex, &color, 1, mode, &tex, &paint); canvas->translate(128, 0); - paint.setShader(image->makeShader(SkShader::kClamp_TileMode, - SkShader::kClamp_TileMode)); + paint.setShader(image->makeShader()); canvas->drawVertices(verts, mode, paint); paint.setShader(nullptr); canvas->translate(145, 0); diff --git a/gm/localmatriximageshader.cpp b/gm/localmatriximageshader.cpp index 2c9fcd2601..f63497de83 100644 --- a/gm/localmatriximageshader.cpp +++ b/gm/localmatriximageshader.cpp @@ -28,8 +28,7 @@ DEF_SIMPLE_GM(localmatriximageshader, canvas, 250, 250) { 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> redImageShader = redImage->makeShader(&translate); sk_sp<SkShader> redLocalMatrixShader = redImageShader->makeWithLocalMatrix(rotate); // Rotate about the origin will happen first. @@ -38,8 +37,7 @@ DEF_SIMPLE_GM(localmatriximageshader, canvas, 250, 250) { 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> blueImageShader = blueImage->makeShader(&rotate); sk_sp<SkShader> blueLocalMatrixShader = blueImageShader->makeWithLocalMatrix(translate); // Translate will happen first. diff --git a/gm/rectangletexture.cpp b/gm/rectangletexture.cpp index d4f4552e10..67ffa9a08c 100644 --- a/gm/rectangletexture.cpp +++ b/gm/rectangletexture.cpp @@ -163,8 +163,7 @@ protected: SkPaint clampPaint; clampPaint.setFilterQuality(q); - clampPaint.setShader(rectImg->makeShader(SkShader::kClamp_TileMode, - SkShader::kClamp_TileMode)); + clampPaint.setShader(rectImg->makeShader()); canvas->drawRect(SkRect::MakeWH(1.5f * kWidth, 1.5f * kHeight), clampPaint); canvas->translate(kWidth * 1.5f + kPad, 0); |