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 /src/core | |
| 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 'src/core')
| -rw-r--r-- | src/core/SkCanvas.cpp | 6 | ||||
| -rw-r--r-- | src/core/SkDevice.cpp | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index 76b4a522b2..dc5f68fb80 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -2907,10 +2907,8 @@ void SkCanvas::onDrawShadowedPicture(const SkPicture* picture, diffuseMap = surf->makeImageSnapshot(); } - sk_sp<SkShader> povDepthShader = povDepthMap->makeShader(SkShader::kClamp_TileMode, - SkShader::kClamp_TileMode); - sk_sp<SkShader> diffuseShader = diffuseMap->makeShader(SkShader::kClamp_TileMode, - SkShader::kClamp_TileMode); + sk_sp<SkShader> povDepthShader = povDepthMap->makeShader(); + sk_sp<SkShader> diffuseShader = diffuseMap->makeShader(); // TODO: pass the depth to the shader in vertices, or uniforms // so we don't have to render depth and color separately diff --git a/src/core/SkDevice.cpp b/src/core/SkDevice.cpp index 99a7a0c7ff..9d38e16d04 100644 --- a/src/core/SkDevice.cpp +++ b/src/core/SkDevice.cpp @@ -250,9 +250,7 @@ void SkBaseDevice::drawAtlas(const SkImage* atlas, const SkRSXform xform[], localM.preTranslate(-tex[i].left(), -tex[i].top()); SkPaint pnt(paint); - sk_sp<SkShader> shader = atlas->makeShader(SkShader::kClamp_TileMode, - SkShader::kClamp_TileMode, - &localM); + sk_sp<SkShader> shader = atlas->makeShader(&localM); if (!shader) { break; } |