aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorGravatar Matt Sarett <msarett@google.com>2017-03-24 10:06:03 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-03-24 17:11:26 +0000
commitf3880933092c3226cd7ffd1690fe72c9c0cc376c (patch)
tree893a45cb711edc327e1a450f1ce3cb2974a42528 /tools
parent70288c0a9179f308fc7de1b07899baef4446e444 (diff)
Delete SkColorSpace::ColorSpaceFlags
BUG=skia: Change-Id: Ia0688876915cd773614ca0c4ccd467cf6e7c603e Reviewed-on: https://skia-review.googlesource.com/10105 Commit-Queue: Matt Sarett <msarett@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/flags/SkCommonFlagsConfig.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/tools/flags/SkCommonFlagsConfig.cpp b/tools/flags/SkCommonFlagsConfig.cpp
index b9d6a5d5d7..1e980d20e9 100644
--- a/tools/flags/SkCommonFlagsConfig.cpp
+++ b/tools/flags/SkCommonFlagsConfig.cpp
@@ -306,14 +306,10 @@ static bool parse_option_gpu_color(const SkString& value,
}
const bool linearGamma = commands[0].equals("f16");
- const bool nonLinearBlending = commands[0].equals("srgbnl");
SkColorSpace::Gamut gamut = SkColorSpace::kSRGB_Gamut;
SkColorSpace::RenderTargetGamma gamma = linearGamma ? SkColorSpace::kLinear_RenderTargetGamma
: SkColorSpace::kSRGB_RenderTargetGamma;
- SkColorSpace::ColorSpaceFlags flags =
- nonLinearBlending ? SkColorSpace::kNonLinearBlending_ColorSpaceFlag
- : (SkColorSpace::ColorSpaceFlags) 0;
- *outColorSpace = SkColorSpace::MakeRGB(gamma, gamut, flags);
+ *outColorSpace = SkColorSpace::MakeRGB(gamma, gamut);
if (commands.count() == 2) {
if (commands[1].equals("srgb")) {
@@ -327,7 +323,7 @@ static bool parse_option_gpu_color(const SkString& value,
};
SkMatrix44 wideGamutRGBMatrix(SkMatrix44::kUninitialized_Constructor);
wideGamutRGBMatrix.set3x3RowMajorf(gWideGamutRGB_toXYZD50);
- *outColorSpace = SkColorSpace::MakeRGB(gamma, wideGamutRGBMatrix, flags);
+ *outColorSpace = SkColorSpace::MakeRGB(gamma, wideGamutRGBMatrix);
} else if (commands[1].equals("narrow")) {
// NarrowGamut RGB (an artifically smaller than sRGB gamut)
SkColorSpacePrimaries primaries ={
@@ -338,7 +334,7 @@ static bool parse_option_gpu_color(const SkString& value,
};
SkMatrix44 narrowGamutRGBMatrix(SkMatrix44::kUninitialized_Constructor);
primaries.toXYZD50(&narrowGamutRGBMatrix);
- *outColorSpace = SkColorSpace::MakeRGB(gamma, narrowGamutRGBMatrix, flags);
+ *outColorSpace = SkColorSpace::MakeRGB(gamma, narrowGamutRGBMatrix);
} else {
// Unknown color gamut
return false;