aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gm/gamma.cpp166
-rw-r--r--src/core/SkBlitter_Sprite.cpp7
-rw-r--r--src/core/SkSpriteBlitter.h4
-rw-r--r--src/core/SkSpriteBlitter4f.cpp15
-rw-r--r--src/core/SkSpriteBlitter_ARGB32.cpp4
5 files changed, 12 insertions, 184 deletions
diff --git a/gm/gamma.cpp b/gm/gamma.cpp
deleted file mode 100644
index c874db6969..0000000000
--- a/gm/gamma.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "gm.h"
-
-#include "Resources.h"
-#include "SkGradientShader.h"
-
-DEF_SIMPLE_GM(gamma, canvas, 500, 200) {
- SkPaint p;
- const SkScalar sz = 50.0f;
- const int szInt = SkScalarTruncToInt(sz);
- const SkScalar tx = sz + 5.0f;
- const SkRect r = SkRect::MakeXYWH(0, 0, sz, sz);
- SkShader::TileMode rpt = SkShader::kRepeat_TileMode;
-
- SkBitmap ditherBmp;
- ditherBmp.allocN32Pixels(2, 2);
- SkPMColor* pixels = reinterpret_cast<SkPMColor*>(ditherBmp.getPixels());
- pixels[0] = pixels[3] = SkPackARGB32(0xFF, 0xFF, 0xFF, 0xFF);
- pixels[1] = pixels[2] = SkPackARGB32(0xFF, 0, 0, 0);
-
- SkBitmap linearGreyBmp;
- SkImageInfo linearGreyInfo = SkImageInfo::MakeN32(szInt, szInt, kOpaque_SkAlphaType,
- kLinear_SkColorProfileType);
- linearGreyBmp.allocPixels(linearGreyInfo);
- linearGreyBmp.eraseARGB(0xFF, 0x7F, 0x7F, 0x7F);
-
- SkBitmap srgbGreyBmp;
- SkImageInfo srgbGreyInfo = SkImageInfo::MakeN32(szInt, szInt, kOpaque_SkAlphaType,
- kSRGB_SkColorProfileType);
- srgbGreyBmp.allocPixels(srgbGreyInfo);
- srgbGreyBmp.eraseARGB(0xFF, 0xBC, 0xBC, 0xBC);
-
- SkPaint textPaint;
- textPaint.setColor(SK_ColorWHITE);
-
- // Helpers:
- auto advance = [&]() {
- canvas->translate(tx, 0);
- p.reset();
- };
-
- auto nextRect = [&](const char* label, const char* label2) {
- canvas->drawRect(r, p);
- canvas->drawText(label, strlen(label), 0, sz + textPaint.getFontSpacing(), textPaint);
- if (label2) {
- canvas->drawText(label2, strlen(label2), 0, sz + 2 * textPaint.getFontSpacing(),
- textPaint);
- }
- advance();
- };
-
- auto nextBitmap = [&](const SkBitmap& bmp, const char* label) {
- canvas->drawBitmap(bmp, 0, 0);
- canvas->drawText(label, strlen(label), 0, sz + textPaint.getFontSpacing(), textPaint);
- advance();
- };
-
- auto nextXferRect = [&](SkColor srcColor, SkXfermode::Mode mode, SkColor dstColor) {
- p.setColor(dstColor);
- canvas->drawRect(r, p);
- p.setColor(srcColor);
- p.setXfermodeMode(mode);
- canvas->drawRect(r, p);
-
- SkString srcText = SkStringPrintf("%08X", srcColor);
- SkString dstText = SkStringPrintf("%08X", dstColor);
- canvas->drawText(srcText.c_str(), srcText.size(), 0, sz + textPaint.getFontSpacing(),
- textPaint);
- const char* modeName = SkXfermode::ModeName(mode);
- canvas->drawText(modeName, strlen(modeName), 0, sz + 2 * textPaint.getFontSpacing(),
- textPaint);
- canvas->drawText(dstText.c_str(), dstText.size(), 0, sz + 3 * textPaint.getFontSpacing(),
- textPaint);
- advance();
- };
-
- // Necessary for certain Xfermodes to work:
- canvas->clear(SK_ColorTRANSPARENT);
-
- // *Everything* should be perceptually 50% grey. Only the first rectangle
- // is guaranteed to draw that way, though.
- canvas->save();
-
- // Black/white dither, pixel perfect. This is ground truth.
- p.setShader(SkShader::CreateBitmapShader(
- ditherBmp, rpt, rpt))->unref();
- p.setFilterQuality(SkFilterQuality::kNone_SkFilterQuality);
- nextRect("Dither", "Reference");
-
- // Black/white dither, sampled at half-texel offset. Tests bilerp.
- // NOTE: We need to apply a non-identity scale and/or rotation to trick
- // the raster pipeline into *not* snapping to nearest.
- SkMatrix offsetMatrix = SkMatrix::Concat(
- SkMatrix::MakeScale(-1.0f), SkMatrix::MakeTrans(0.5f, 0.0f));
- p.setShader(SkShader::CreateBitmapShader(
- ditherBmp, rpt, rpt, &offsetMatrix))->unref();
- p.setFilterQuality(SkFilterQuality::kMedium_SkFilterQuality);
- nextRect("Dither", "Bilerp");
-
- // Black/white dither, scaled down by 2x. Tests minification.
- SkMatrix scaleMatrix = SkMatrix::MakeScale(0.5f);
- p.setShader(SkShader::CreateBitmapShader(
- ditherBmp, rpt, rpt, &scaleMatrix))->unref();
- p.setFilterQuality(SkFilterQuality::kMedium_SkFilterQuality);
- nextRect("Dither", "Scale");
-
- // 50% grey via paint color.
- p.setColor(0xff7f7f7f);
- nextRect("Color", 0);
-
- // Black -> White gradient, scaled to sample just the middle.
- // Tests gradient interpolation.
- SkPoint points[2] = {
- SkPoint::Make(0 - (sz * 10), 0),
- SkPoint::Make(sz + (sz * 10), 0)
- };
- SkColor colors[2] = { SK_ColorBLACK, SK_ColorWHITE };
- p.setShader(SkGradientShader::CreateLinear(
- points, colors, nullptr, 2, SkShader::kClamp_TileMode))->unref();
- nextRect("Gradient", 0);
-
- // 50% grey from linear bitmap, with drawBitmap
- nextBitmap(linearGreyBmp, "Lnr BMP");
-
- // 50% grey from sRGB bitmap, with drawBitmap
- nextBitmap(srgbGreyBmp, "sRGB BMP");
-
- // Bitmap wrapped in a shader (linear):
- p.setShader(SkShader::CreateBitmapShader(linearGreyBmp, rpt, rpt))->unref();
- p.setFilterQuality(SkFilterQuality::kMedium_SkFilterQuality);
- nextRect("Lnr BMP", "Shader");
-
- // Bitmap wrapped in a shader (sRGB):
- p.setShader(SkShader::CreateBitmapShader(srgbGreyBmp, rpt, rpt))->unref();
- p.setFilterQuality(SkFilterQuality::kMedium_SkFilterQuality);
- nextRect("sRGB BMP", "Shader");
-
- // Carriage return.
- canvas->restore();
- canvas->translate(0, 2 * sz);
-
- const U8CPU sqrtHalf = 0xB4;
- const SkColor sqrtHalfAlpha = SkColorSetARGB(sqrtHalf, 0, 0, 0);
- const SkColor sqrtHalfWhite = SkColorSetARGB(0xFF, sqrtHalf, sqrtHalf, sqrtHalf);
-
- // Xfermode tests.
- nextXferRect(0x7fffffff, SkXfermode::kSrcOver_Mode, SK_ColorBLACK);
- nextXferRect(0x7f000000, SkXfermode::kSrcOver_Mode, SK_ColorWHITE);
-
- nextXferRect(SK_ColorBLACK, SkXfermode::kDstOver_Mode, 0x7fffffff);
- nextXferRect(SK_ColorWHITE, SkXfermode::kSrcIn_Mode, 0x7fff00ff);
- nextXferRect(0x7fff00ff, SkXfermode::kDstIn_Mode, SK_ColorWHITE);
- nextXferRect(sqrtHalfWhite, SkXfermode::kSrcIn_Mode, sqrtHalfAlpha);
- nextXferRect(sqrtHalfAlpha, SkXfermode::kDstIn_Mode, sqrtHalfWhite);
-
- nextXferRect(0xff3f3f3f, SkXfermode::kPlus_Mode, 0xff3f3f3f);
- nextXferRect(sqrtHalfWhite, SkXfermode::kModulate_Mode, sqrtHalfWhite);
-
- canvas->restore();
-}
diff --git a/src/core/SkBlitter_Sprite.cpp b/src/core/SkBlitter_Sprite.cpp
index 754703cf75..27cbd61768 100644
--- a/src/core/SkBlitter_Sprite.cpp
+++ b/src/core/SkBlitter_Sprite.cpp
@@ -60,11 +60,10 @@ SkBlitter* SkBlitter::ChooseSprite(const SkPixmap& dst, const SkPaint& paint,
blitter = SkSpriteBlitter::ChooseD16(source, paint, allocator);
break;
case kN32_SkColorType:
- if (dst.info().isSRGB() || source.info().isSRGB()) {
- blitter = SkSpriteBlitter::ChooseNew32(source, paint, allocator,
- dst.info().profileType());
+ if (dst.info().isSRGB()) {
+ blitter = SkSpriteBlitter::ChooseS32(source, paint, allocator);
} else {
- blitter = SkSpriteBlitter::ChooseLegacy32(source, paint, allocator);
+ blitter = SkSpriteBlitter::ChooseL32(source, paint, allocator);
}
break;
case kRGBA_F16_SkColorType:
diff --git a/src/core/SkSpriteBlitter.h b/src/core/SkSpriteBlitter.h
index 1bc5cf502f..62c50c8b35 100644
--- a/src/core/SkSpriteBlitter.h
+++ b/src/core/SkSpriteBlitter.h
@@ -29,8 +29,8 @@ public:
#endif
static SkSpriteBlitter* ChooseD16(const SkPixmap& source, const SkPaint&, SkTBlitterAllocator*);
- static SkSpriteBlitter* ChooseLegacy32(const SkPixmap& source, const SkPaint&, SkTBlitterAllocator*);
- static SkSpriteBlitter* ChooseNew32(const SkPixmap& source, const SkPaint&, SkTBlitterAllocator*, SkColorProfileType dstPt);
+ static SkSpriteBlitter* ChooseL32(const SkPixmap& source, const SkPaint&, SkTBlitterAllocator*);
+ static SkSpriteBlitter* ChooseS32(const SkPixmap& source, const SkPaint&, SkTBlitterAllocator*);
static SkSpriteBlitter* ChooseF16(const SkPixmap& source, const SkPaint&, SkTBlitterAllocator*);
protected:
diff --git a/src/core/SkSpriteBlitter4f.cpp b/src/core/SkSpriteBlitter4f.cpp
index 0079b29160..474bf4d0f6 100644
--- a/src/core/SkSpriteBlitter4f.cpp
+++ b/src/core/SkSpriteBlitter4f.cpp
@@ -82,12 +82,8 @@ SkSpriteBlitter* SkSpriteBlitter::ChooseF16(const SkPixmap& source, const SkPain
class Sprite_sRGB : public Sprite_4f {
public:
- Sprite_sRGB(const SkPixmap& src, const SkPaint& paint, SkColorProfileType dstPt)
- : INHERITED(src, paint) {
- uint32_t flags = 0;
- if (kSRGB_SkColorProfileType == dstPt) {
- flags |= SkXfermode::kDstIsSRGB_D32Flag;
- }
+ Sprite_sRGB(const SkPixmap& src, const SkPaint& paint) : INHERITED(src, paint) {
+ uint32_t flags = SkXfermode::kDstIsSRGB_D32Flag;
if (src.isOpaque()) {
flags |= SkXfermode::kSrcIsOpaque_D32Flag;
}
@@ -115,9 +111,8 @@ private:
};
-SkSpriteBlitter* SkSpriteBlitter::ChooseNew32(const SkPixmap& source, const SkPaint& paint,
- SkTBlitterAllocator* allocator,
- SkColorProfileType dstPt) {
+SkSpriteBlitter* SkSpriteBlitter::ChooseS32(const SkPixmap& source, const SkPaint& paint,
+ SkTBlitterAllocator* allocator) {
SkASSERT(allocator != nullptr);
if (paint.getMaskFilter() != nullptr) {
@@ -127,7 +122,7 @@ SkSpriteBlitter* SkSpriteBlitter::ChooseNew32(const SkPixmap& source, const SkPa
switch (source.colorType()) {
case kN32_SkColorType:
case kRGBA_F16_SkColorType:
- return allocator->createT<Sprite_sRGB>(source, paint, dstPt);
+ return allocator->createT<Sprite_sRGB>(source, paint);
default:
return nullptr;
}
diff --git a/src/core/SkSpriteBlitter_ARGB32.cpp b/src/core/SkSpriteBlitter_ARGB32.cpp
index 0e3cc1a3af..93885996ea 100644
--- a/src/core/SkSpriteBlitter_ARGB32.cpp
+++ b/src/core/SkSpriteBlitter_ARGB32.cpp
@@ -254,8 +254,8 @@ public:
///////////////////////////////////////////////////////////////////////////////
-SkSpriteBlitter* SkSpriteBlitter::ChooseLegacy32(const SkPixmap& source, const SkPaint& paint,
- SkTBlitterAllocator* allocator) {
+SkSpriteBlitter* SkSpriteBlitter::ChooseL32(const SkPixmap& source, const SkPaint& paint,
+ SkTBlitterAllocator* allocator) {
SkASSERT(allocator != nullptr);
if (paint.getMaskFilter() != nullptr) {
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-24 06:59:44 +0000