diff options
| author |  reed <reed@google.com> | 2016-01-22 00:04:30 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-01-22 00:04:30 -0800 |
| commit | 2a2bdc698460c38ac9e24ba4abdeefec67bcba37 (patch) | |
| tree | fd2660e993c369874be1966a95ebc673194aabb4 /src/core/SkShader.cpp | |
| parent | 7765000709dc64eb23be7df47d1f995d1f787115 (diff) | |
Revert of experiment: float color components (patchset #6 id:100001 of https://codereview.chromium.org/1617813002/ )
Reason for revert:
broke some colormatrix tests
Original issue's description:
> experiment: float color components
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1617813002
>
> Committed: https://skia.googlesource.com/skia/+/353c148d8e8c9031daca34c6f9d6bcc6f08706c7
TBR=fmalita@chromium.org,mtklein@google.com,herb@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1623453002
Diffstat (limited to 'src/core/SkShader.cpp')
| -rw-r--r-- | src/core/SkShader.cpp | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/core/SkShader.cpp b/src/core/SkShader.cpp index 856b659213..bd3876a69b 100644 --- a/src/core/SkShader.cpp +++ b/src/core/SkShader.cpp @@ -117,10 +117,6 @@ SkShader::Context::ShadeProc SkShader::Context::asAShadeProc(void** ctx) { return nullptr; } -void SkShader::Context::shadeSpan4f(int x, int y, SkPM4f[], int count) { - SkASSERT(false && "shadeSpan4f called but not implemented"); -} - #include "SkColorPriv.h" #define kTempColorQuadCount 6 // balance between speed (larger) and saving stack-space @@ -283,11 +279,7 @@ SkColorShader::ColorShaderContext::ColorShaderContext(const SkColorShader& shade } fPMColor = SkPackARGB32(a, r, g, b); - SkColor4f c4 = SkColor4f::FromColor(shader.fColor); - c4.fA *= rec.fPaint->getAlpha() / 255.0f; - fPM4f = c4.premul(); - - fFlags = kConstInY32_Flag | kSupports4f_Flag; + fFlags = kConstInY32_Flag; if (255 == a) { fFlags |= kOpaqueAlpha_Flag; } @@ -301,12 +293,6 @@ void SkColorShader::ColorShaderContext::shadeSpanAlpha(int x, int y, uint8_t alp memset(alpha, SkGetPackedA32(fPMColor), count); } -void SkColorShader::ColorShaderContext::shadeSpan4f(int x, int y, SkPM4f span[], int count) { - for (int i = 0; i < count; ++i) { - span[i] = fPM4f; - } -} - SkShader::GradientType SkColorShader::asAGradient(GradientInfo* info) const { if (info) { if (info->fColors && info->fColorCount >= 1) { |