Fix some bugs around opaque color types and computeIsOpaque
Spun out from: https://skia-review.googlesource.com/c/skia/+/161423
Bug: skia:
Change-Id: I7f3a7e10faa844271235f3b064576d43bab8e554
Reviewed-on: https://skia-review.googlesource.com/c/161480
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
diff --git a/src/core/SkBlitter.cpp b/src/core/SkBlitter.cpp
index 9cf208e..e80445f 100644
--- a/src/core/SkBlitter.cpp
+++ b/src/core/SkBlitter.cpp
@@ -1001,7 +1001,7 @@
}
if (mode != SkBlendMode::kSrcOver) {
- bool deviceIsOpaque = kRGB_565_SkColorType == device.colorType();
+ bool deviceIsOpaque = SkColorTypeIsAlwaysOpaque(device.colorType());
switch (SkInterpretXfermode(*commonPaint, deviceIsOpaque)) {
case kSrcOver_SkXfermodeInterpretation:
mode = SkBlendMode::kSrcOver;
diff --git a/src/core/SkPixmap.cpp b/src/core/SkPixmap.cpp
index 4ac6f09..959336c 100644
--- a/src/core/SkPixmap.cpp
+++ b/src/core/SkPixmap.cpp
@@ -516,6 +516,8 @@
} break;
case kRGB_565_SkColorType:
case kGray_8_SkColorType:
+ case kRGB_888x_SkColorType:
+ case kRGB_101010x_SkColorType:
return true;
break;
case kARGB_4444_SkColorType: {
@@ -557,7 +559,33 @@
}
return true;
}
- default:
+ case kRGBA_F32_SkColorType: {
+ const float* row = (const float*)this->addr();
+ for (int y = 0; y < height; ++y) {
+ for (int x = 0; x < width; ++x) {
+ if (row[4 * x + 3] < 1.0f) {
+ return false;
+ }
+ }
+ row += this->rowBytes() >> 2;
+ }
+ return true;
+ }
+ case kRGBA_1010102_SkColorType: {
+ uint32_t c = ~0;
+ for (int y = 0; y < height; ++y) {
+ const uint32_t* row = this->addr32(0, y);
+ for (int x = 0; x < width; ++x) {
+ c &= row[x];
+ }
+ if (0b11 != c >> 30) {
+ return false;
+ }
+ }
+ return true;
+ }
+ case kUnknown_SkColorType:
+ SkDEBUGFAIL("");
break;
}
return false;
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index b29454c..596fa66 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -565,7 +565,9 @@
if (kUnknown_SkColorType == srcSkColorType || kUnknown_SkColorType == dstSkColorType) {
return false;
}
- auto srcAlphaType = premul ? kUnpremul_SkAlphaType : kPremul_SkAlphaType;
+ auto srcAlphaType = SkColorTypeIsAlwaysOpaque(srcSkColorType)
+ ? kOpaque_SkAlphaType
+ : (premul ? kUnpremul_SkAlphaType : kPremul_SkAlphaType);
SkPixmap src(SkImageInfo::Make(width, height, srcSkColorType, srcAlphaType,
sk_ref_sp(srcColorSpace)),
buffer, rowBytes);
@@ -738,15 +740,16 @@
if (convert) {
SkColorType srcSkColorType = GrColorTypeToSkColorType(allowedColorType);
SkColorType dstSkColorType = GrColorTypeToSkColorType(dstColorType);
+ bool srcAlwaysOpaque = SkColorTypeIsAlwaysOpaque(srcSkColorType);
+ bool dstAlwaysOpaque = SkColorTypeIsAlwaysOpaque(dstSkColorType);
if (kUnknown_SkColorType == srcSkColorType || kUnknown_SkColorType == dstSkColorType) {
return false;
}
- auto tempAT = SkColorTypeIsAlwaysOpaque(srcSkColorType) ? kOpaque_SkAlphaType
- : kPremul_SkAlphaType;
+ auto tempAT = srcAlwaysOpaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType;
auto tempII = SkImageInfo::Make(width, height, srcSkColorType, tempAT,
src->colorSpaceInfo().refColorSpace());
- SkASSERT(!unpremul || !SkColorTypeIsAlwaysOpaque(dstSkColorType));
- auto finalAT = SkColorTypeIsAlwaysOpaque(srcSkColorType)
+ SkASSERT(!unpremul || !dstAlwaysOpaque);
+ auto finalAT = (srcAlwaysOpaque || dstAlwaysOpaque)
? kOpaque_SkAlphaType
: unpremul ? kUnpremul_SkAlphaType : kPremul_SkAlphaType;
auto finalII =
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index 94d2206..6239477 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -136,7 +136,6 @@
, fRenderTargetContext(std::move(renderTargetContext))
{
fSize.set(width, height);
- fOpaque = SkToBool(flags & kIsOpaque_Flag);
if (flags & kNeedClear_Flag) {
this->clearAll();
diff --git a/src/gpu/SkGpuDevice.h b/src/gpu/SkGpuDevice.h
index a1a6606..c0dec29 100644
--- a/src/gpu/SkGpuDevice.h
+++ b/src/gpu/SkGpuDevice.h
@@ -129,7 +129,6 @@
sk_sp<GrRenderTargetContext> fRenderTargetContext;
SkISize fSize;
- bool fOpaque;
enum Flags {
kNeedClear_Flag = 1 << 0, //!< Surface requires an initial clear
diff --git a/tests/BitmapTest.cpp b/tests/BitmapTest.cpp
index 70dde59..d1462f8 100644
--- a/tests/BitmapTest.cpp
+++ b/tests/BitmapTest.cpp
@@ -174,29 +174,29 @@
// Test that SkBitmap::ComputeOpaque() is correct for various colortypes.
DEF_TEST(Bitmap_compute_is_opaque, r) {
- struct {
- SkColorType fCT;
- SkAlphaType fAT;
- } types[] = {
- { kGray_8_SkColorType, kOpaque_SkAlphaType },
- { kAlpha_8_SkColorType, kPremul_SkAlphaType },
- { kARGB_4444_SkColorType, kPremul_SkAlphaType },
- { kRGB_565_SkColorType, kOpaque_SkAlphaType },
- { kBGRA_8888_SkColorType, kPremul_SkAlphaType },
- { kRGBA_8888_SkColorType, kPremul_SkAlphaType },
- { kRGBA_F16_SkColorType, kPremul_SkAlphaType },
+ SkColorType colorTypes[] = {
+ kAlpha_8_SkColorType,
+ kRGB_565_SkColorType,
+ kARGB_4444_SkColorType,
+ kRGBA_8888_SkColorType,
+ kRGB_888x_SkColorType,
+ kBGRA_8888_SkColorType,
+ kRGBA_1010102_SkColorType,
+ kRGB_101010x_SkColorType,
+ kGray_8_SkColorType,
+ kRGBA_F16_SkColorType,
+ kRGBA_F32_SkColorType,
};
- for (auto type : types) {
+ for (auto ct : colorTypes) {
SkBitmap bm;
- REPORTER_ASSERT(r, !SkBitmap::ComputeIsOpaque(bm));
-
- bm.allocPixels(SkImageInfo::Make(13, 17, type.fCT, type.fAT));
+ SkAlphaType at = SkColorTypeIsAlwaysOpaque(ct) ? kOpaque_SkAlphaType : kPremul_SkAlphaType;
+ bm.allocPixels(SkImageInfo::Make(13, 17, ct, at));
bm.eraseColor(SkColorSetARGB(255, 10, 20, 30));
REPORTER_ASSERT(r, SkBitmap::ComputeIsOpaque(bm));
bm.eraseColor(SkColorSetARGB(128, 255, 255, 255));
bool isOpaque = SkBitmap::ComputeIsOpaque(bm);
- bool shouldBeOpaque = (type.fAT == kOpaque_SkAlphaType);
+ bool shouldBeOpaque = (at == kOpaque_SkAlphaType);
REPORTER_ASSERT(r, isOpaque == shouldBeOpaque);
}
}