diff options
| author | Derek Sollenberger <djsollen@google.com> | 2017-07-26 13:53:27 -0400 |
|---|---|---|
| committer | Stan Iliev <stani@google.com> | 2017-07-27 10:52:11 -0400 |
| commit | fb0c8fc3d5413a3ec357680d85084a17bb9ef64f (patch) | |
| tree | a1952c3daf90ff2dc6441c489619a27be6de4b22 /libs/hwui/pipeline/skia/SkiaPipeline.cpp | |
| parent | 25b14a1a2881e11716844a56b6fdbeae9099527b (diff) | |
Enable colorspace conversion while perserving legacy blending.
When requesting an SkImage from a android::Bitmap we will also
return a colorFilter that will perform the sRGB conversion at draw
time.
Bug: 62347704
Test: CtsUiRenderingTestCases, CtsGraphicsTestCases, CtsViewTestCases
Change-Id: Icc4694e2c42605e29fcc834c252bc21263bac658
Diffstat (limited to 'libs/hwui/pipeline/skia/SkiaPipeline.cpp')
| -rw-r--r-- | libs/hwui/pipeline/skia/SkiaPipeline.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/hwui/pipeline/skia/SkiaPipeline.cpp b/libs/hwui/pipeline/skia/SkiaPipeline.cpp index d08a62c830ad..a8463ecc44d8 100644 --- a/libs/hwui/pipeline/skia/SkiaPipeline.cpp +++ b/libs/hwui/pipeline/skia/SkiaPipeline.cpp @@ -167,7 +167,8 @@ void SkiaPipeline::prepareToDraw(const RenderThread& thread, Bitmap* bitmap) { GrContext* context = thread.getGrContext(); if (context) { ATRACE_FORMAT("Bitmap#prepareToDraw %dx%d", bitmap->width(), bitmap->height()); - auto image = bitmap->makeImage(); + sk_sp<SkColorFilter> colorFilter; + auto image = bitmap->makeImage(&colorFilter); if (image.get() && !bitmap->isHardware()) { SkImage_pinAsTexture(image.get(), context); SkImage_unpinAsTexture(image.get(), context); |