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

Improve the gamma GM significantly

Browse Source 
- Switch to portable typeface, to avoid per-platform diffs in the labels
- Stretch out the image slightly, to avoid overlap with larger font
- Fix several tests that were no longer matching ground-truth. We treat
  SkColor as sRGB, so 0x7F is incorrect, for example. Several of the
  XferMode tests had similar math errors now. Computed new values, and
  verified that they work as expected.
- Removed a couple tests that were mixing color and alpha in funny ways

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2288053003

Review-Url: https://codereview.chromium.org/2288053003
This commit is contained in:
brianosman 2016-08-30 07:08:07 -07:00 committed by Commit bot
parent 0e22eb8e6e
commit 7a99a0a301
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gm/gamma.cpp
View File

@ -11,11 +11,11 @@
#include "SkGradientShader.h"
#include "SkPM4fPriv.h"
DEF_SIMPLE_GM(gamma, canvas, 560, 200) {
DEF_SIMPLE_GM(gamma, canvas, 650, 200) {
SkPaint p;
const SkScalar sz = 50.0f;
const int szInt = SkScalarTruncToInt(sz);
const SkScalar tx = sz + 5.0f;
const SkScalar tx = sz + 15.0f;
const SkRect r = SkRect::MakeXYWH(0, 0, sz, sz);
SkShader::TileMode rpt = SkShader::kRepeat_TileMode;
auto srgbColorSpace = SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named);
@ -49,7 +49,9 @@ DEF_SIMPLE_GM(gamma, canvas, 560, 200) {
mipmapPixels[1] = mipmapPixels[2] = SkPackARGB32(0xFF, s75, s75, s75);
SkPaint textPaint;
textPaint.setAntiAlias(true);
textPaint.setColor(SK_ColorWHITE);
sk_tool_utils::set_portable_typeface(&textPaint);
// Helpers:
auto advance = [&]() {
@ -125,8 +127,8 @@ DEF_SIMPLE_GM(gamma, canvas, 560, 200) {
p.setFilterQuality(SkFilterQuality::kMedium_SkFilterQuality);
nextRect("MipMaps", 0);
// 50% grey via paint color.
p.setColor(0xff7f7f7f);
// 50% grey via paint color. Paint color (SkColor) is specified to be sRGB!
p.setColor(0xffbcbcbc);
nextRect("Color", 0);
// Black -> White gradient, scaled to sample just the middle.
@ -160,10 +162,6 @@ DEF_SIMPLE_GM(gamma, canvas, 560, 200) {
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, all done off-screen so certain modes work...
canvas->saveLayer(nullptr, nullptr);
@ -174,11 +172,12 @@ DEF_SIMPLE_GM(gamma, canvas, 560, 200) {
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);
// 0x89 = 255 * linear_to_srgb(0.25)
nextXferRect(0xff898989, SkXfermode::kPlus_Mode, 0xff898989);
// 0xDB = 255 * linear_to_srgb(sqrt(0.5))
nextXferRect(0xffdbdbdb, SkXfermode::kModulate_Mode, 0xffdbdbdb);
canvas->restore();
}