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 /tools | |
| 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 'tools')
| -rw-r--r-- | tools/viewer/Viewer.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp index de4c6e0cbf..e53bd1ab64 100644 --- a/tools/viewer/Viewer.cpp +++ b/tools/viewer/Viewer.cpp @@ -426,8 +426,7 @@ Viewer::Viewer(int argc, char** argv, void* platformData) SkPixmap pmap(info, pixels, info.minRowBytes()); SkMatrix localMatrix = SkMatrix::MakeScale(1.0f / w, 1.0f / h); auto fontImage = SkImage::MakeFromRaster(pmap, nullptr, nullptr); - auto fontShader = fontImage->makeShader(SkShader::kClamp_TileMode, SkShader::kClamp_TileMode, - &localMatrix); + auto fontShader = fontImage->makeShader(&localMatrix); fImGuiFontPaint.setShader(fontShader); fImGuiFontPaint.setColor(SK_ColorWHITE); fImGuiFontPaint.setFilterQuality(kLow_SkFilterQuality); @@ -435,9 +434,7 @@ Viewer::Viewer(int argc, char** argv, void* platformData) auto gamutImage = GetResourceAsImage("gamut.png"); if (gamutImage) { - auto gamutShader = gamutImage->makeShader(SkShader::kClamp_TileMode, - SkShader::kClamp_TileMode); - fImGuiGamutPaint.setShader(gamutShader); + fImGuiGamutPaint.setShader(gamutImage->makeShader()); } fImGuiGamutPaint.setColor(SK_ColorWHITE); fImGuiGamutPaint.setFilterQuality(kLow_SkFilterQuality); @@ -1152,8 +1149,7 @@ void Viewer::drawImGui(SkCanvas* canvas) { static int zoomFactor = 4; ImGui::SliderInt("Scale", &zoomFactor, 1, 16); - zoomImagePaint.setShader(fLastImage->makeShader(SkShader::kClamp_TileMode, - SkShader::kClamp_TileMode)); + zoomImagePaint.setShader(fLastImage->makeShader()); zoomImagePaint.setColor(SK_ColorWHITE); // Zoom by shrinking the corner UVs towards the mouse cursor |