aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/shaders
diff options
context:
space:
mode:
authorGravatar Mike Klein <mtklein@chromium.org>2018-07-12 11:38:10 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-07-12 19:19:28 +0000
commit9e229233a67b36a508d3c753a5b93a022369c5f7 (patch)
tree25f86e467bc48d5dff3276427f3f1772e8f89352 /src/shaders
parentd46f0091afdc2563ec50319c4f93d110e0868fb9 (diff)
update SkColor4f::FromColor() to preserve transfer function
This kills off some sRGB tables, and lots of call sites can now use SkColor4f::FromColor(). It doesn't seem important to keep this test. Change-Id: Ia79ec8ace45e80bbc7a1e33f560f59289e61b2fb Reviewed-on: https://skia-review.googlesource.com/141046 Commit-Queue: Mike Klein <mtklein@chromium.org> Reviewed-by: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src/shaders')
-rw-r--r--src/shaders/SkImageShader.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/shaders/SkImageShader.cpp b/src/shaders/SkImageShader.cpp
index 22c3f95c04..b770d64c5f 100644
--- a/src/shaders/SkImageShader.cpp
+++ b/src/shaders/SkImageShader.cpp
@@ -315,8 +315,8 @@ bool SkImageShader::onAppendStages(const StageRec& rec) const {
SkColor4f paint_color;
};
auto misc = alloc->make<MiscCtx>();
- misc->state = std::move(state); // Extend lifetime to match the pipeline's.
- swizzle_rb(Sk4f_fromL32(rec.fPaint.getColor())).store(misc->paint_color.vec()); // sRGBA floats
+ misc->state = std::move(state); // Extend lifetime to match the pipeline's.
+ misc->paint_color = SkColor4f::FromColor(rec.fPaint.getColor());
p->append_matrix(alloc, matrix);
auto gather = alloc->make<SkJumper_GatherCtx>();