From 4a17501f5bbd5e45a49d76d7a733393fec9701ee Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Fri, 13 Jul 2018 13:18:56 +0000 Subject: Revert "update SkColor4f::FromColor() to preserve transfer function" This reverts commit 9e229233a67b36a508d3c753a5b93a022369c5f7. Reason for revert: See if blocking Android roll Original change's description: > 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 > Reviewed-by: Brian Osman TBR=mtklein@chromium.org,brianosman@google.com Change-Id: I9d76e4ccf8a101853a7404abb33bdab9e0c64c25 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/141181 Reviewed-by: Robert Phillips Commit-Queue: Robert Phillips --- src/shaders/SkImageShader.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/shaders') diff --git a/src/shaders/SkImageShader.cpp b/src/shaders/SkImageShader.cpp index b770d64c5f..22c3f95c04 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(); - misc->state = std::move(state); // Extend lifetime to match the pipeline's. - misc->paint_color = SkColor4f::FromColor(rec.fPaint.getColor()); + 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 p->append_matrix(alloc, matrix); auto gather = alloc->make(); -- cgit v1.2.3