AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanup SkPatchUtils, stop using SkColorSpaceXform

Browse Source 
Bug: skia:
Change-Id: If60b571be2aaf0ab6e1ec37e28a2fb29a2940270
Reviewed-on: https://skia-review.googlesource.com/156191
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Auto-Submit: Brian Osman <brianosman@google.com>
This commit is contained in:
Brian Osman 2018-09-21 16:49:55 -04:00 committed by Skia Commit-Bot
parent c5de102ff4
commit 358558a4ce
2 changed files with 14 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/core/SkColor.h
View File

@ -269,12 +269,6 @@ struct SkRGBA4f {
}
}
template <SkAlphaType dstAT>
SkRGBA4f<dstAT> as() const {
static_assert(kAT != dstAT, "");
return { fR, fG, fB, fA };
}
// TODO: remove?
SkPM4f toPM4f() const; // impl. depends on kAT
};

63
src/utils/SkPatchUtils.cpp
View File

@ -10,6 +10,7 @@
#include "SkArenaAlloc.h"
#include "SkColorData.h"
#include "SkColorSpacePriv.h"
#include "SkConvertPixels.h"
#include "SkGeometry.h"
#include "SkPM4f.h"
#include "SkTo.h"
@ -216,34 +217,20 @@ void SkPatchUtils::GetRightCubic(const SkPoint cubics[12], SkPoint points[4]) {
points[3] = cubics[kRightP3_CubicCtrlPts];
}
#include "SkColorSpaceXform.h"
static void skcolor_to_float(SkPMColor4f dst[], const SkColor src[], int count, SkColorSpace* dstCS,
bool doPremul) {
// Source is always sRGB SkColor.
auto srcCS = sk_srgb_singleton();
auto op = doPremul ? SkColorSpaceXform::kPremul_AlphaOp : SkColorSpaceXform::kPreserve_AlphaOp;
SkAssertResult(SkColorSpaceXform::Apply(dstCS, SkColorSpaceXform::kRGBA_F32_ColorFormat, dst,
srcCS, SkColorSpaceXform::kBGRA_8888_ColorFormat, src,
count, op));
static void skcolor_to_float(SkPMColor4f* dst, const SkColor* src, int count, SkColorSpace* dstCS) {
SkImageInfo srcInfo = SkImageInfo::Make(count, 1, kBGRA_8888_SkColorType,
kUnpremul_SkAlphaType, SkColorSpace::MakeSRGB());
SkImageInfo dstInfo = SkImageInfo::Make(count, 1, kRGBA_F32_SkColorType,
kPremul_SkAlphaType, sk_ref_sp(dstCS));
SkConvertPixels(dstInfo, dst, 0, srcInfo, src, 0);
}
static void float_to_skcolor(SkColor dst[], const SkPMColor4f src[], int count,
SkColorSpace* srcCS) {
// Destination is always sRGB SkColor.
// src colors are actually unpremul
auto dstCS = sk_srgb_singleton();
SkAssertResult(SkColorSpaceXform::Apply(dstCS, SkColorSpaceXform::kBGRA_8888_ColorFormat, dst,
srcCS, SkColorSpaceXform::kRGBA_F32_ColorFormat, src,
count, SkColorSpaceXform::kPreserve_AlphaOp));
}
static void unpremul(SkPMColor4f array[], int count) {
// Technically, SkPMColor4f to SkColor4f, in-place
for (int i = 0; i < count; ++i) {
array[i] = array[i].unpremul().as<kPremul_SkAlphaType>();
}
static void float_to_skcolor(SkColor* dst, const SkPMColor4f* src, int count, SkColorSpace* srcCS) {
SkImageInfo srcInfo = SkImageInfo::Make(count, 1, kRGBA_F32_SkColorType,
kPremul_SkAlphaType, sk_ref_sp(srcCS));
SkImageInfo dstInfo = SkImageInfo::Make(count, 1, kBGRA_8888_SkColorType,
kUnpremul_SkAlphaType, SkColorSpace::MakeSRGB());
SkConvertPixels(dstInfo, dst, 0, srcInfo, src, 0);
}
sk_sp<SkVertices> SkPatchUtils::MakeVertices(const SkPoint cubics[12], const SkColor srcColors[4],
@ -297,25 +284,9 @@ sk_sp<SkVertices> SkPatchUtils::MakeVertices(const SkPoint cubics[12], const SkC
SkPoint* pos = builder.positions();
SkPoint* texs = builder.texCoords();
uint16_t* indices = builder.indices();
bool is_opaque = false;
/*
* 1. Should we offer this as a runtime choice, as we do in gradients?
* 2. Since drawing the vertices wants premul, shoudl we extend SkVertices to store
* premul colors (as floats, w/ a colorspace)?
*/
bool doPremul = true;
if (cornerColors) {
SkColor c = ~0;
for (int i = 0; i < kNumCorners; i++) {
c &= srcColors[i];
}
is_opaque = (SkColorGetA(c) == 0xFF);
if (is_opaque) {
doPremul = false; // no need
}
skcolor_to_float(cornerColors, srcColors, kNumCorners, colorSpace, doPremul);
skcolor_to_float(cornerColors, srcColors, kNumCorners, colorSpace);
}
SkPoint pts[kNumPtsCubic];
@ -364,9 +335,6 @@ sk_sp<SkVertices> SkPatchUtils::MakeVertices(const SkPoint cubics[12], const SkC
Sk4f::Load(cornerColors[kBottomLeft_Corner].vec()),
Sk4f::Load(cornerColors[kBottomRight_Corner].vec()))
.store(tmpColors[dataIndex].vec());
if (is_opaque) {
tmpColors[dataIndex].fA = 1;
}
}
if (texs) {
@ -396,9 +364,6 @@ sk_sp<SkVertices> SkPatchUtils::MakeVertices(const SkPoint cubics[12], const SkC
}
if (tmpColors) {
if (doPremul) {
unpremul(tmpColors, vertexCount);
}
float_to_skcolor(builder.colors(), tmpColors, vertexCount, colorSpace);
}
return builder.detach();