diff options
| author |  Jim Van Verth <jvanverth@google.com> | 2017-12-19 13:02:38 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-19 19:27:06 +0000 |
| commit | 744cbb388870bc1ae0f6b3ac0fbeaa136f55917b (patch) | |
| tree | a8929b482248d8fd9cd0e57880e7696dff7784ad /src | |
| parent | faa095e9842b924c20de84dce1bcc1adad7fe2e4 (diff) | |
Fix alpha contribution to tonal color.
Also adds a tonal color GM, a grayscale mode to shadowutils GM,
and animated alpha to SampleAndroidShadows.
Bug: skia:
Change-Id: I1dcb5cab7e53ffa7a3bf1a07b6ebfed38df1a9ed
Reviewed-on: https://skia-review.googlesource.com/85002
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Jim Van Verth <jvanverth@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpu/GrRenderTargetContext.cpp | 2 | ||||
| -rw-r--r-- | src/utils/SkShadowUtils.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/GrRenderTargetContext.cpp b/src/gpu/GrRenderTargetContext.cpp index 6f93a1c190..1c617c9410 100644 --- a/src/gpu/GrRenderTargetContext.cpp +++ b/src/gpu/GrRenderTargetContext.cpp @@ -1141,7 +1141,7 @@ bool GrRenderTargetContext::drawFastShadow(const GrClip& clip, SkScalar colorScale; SkScalar tonalAlpha; SkShadowUtils::ComputeTonalColorParams(color.fRGBA[0], color.fRGBA[1], - color.fRGBA[2], rec.fSpotAlpha, + color.fRGBA[2], color.fRGBA[3]*rec.fSpotAlpha, &colorScale, &tonalAlpha); color.fRGBA[0] *= colorScale; color.fRGBA[1] *= colorScale; diff --git a/src/utils/SkShadowUtils.cpp b/src/utils/SkShadowUtils.cpp index 44010b7d01..85e9979d79 100644 --- a/src/utils/SkShadowUtils.cpp +++ b/src/utils/SkShadowUtils.cpp @@ -466,7 +466,7 @@ static SkColor compute_render_color(SkColor color, float alpha, bool useTonalCol SkShadowUtils::ComputeTonalColorParams(color4f.fR, color4f.fG, color4f.fB, - alpha, + color4f.fA*alpha, &colorScale, &tonalAlpha); // After pre-multiplying, we want the alpha to be scaled by tonalAlpha, and // the color scaled by colorScale. This scale factor gives that. |