Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(94)

Unified Diff: tools/flags/SkCommonFlagsConfig.cpp

Issue 1748823002: Revert of Progress on gamma-correctness in the GPU backend. Fixed conversion of color and profile type to pix… (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/flags/SkCommonFlagsConfig.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/flags/SkCommonFlagsConfig.cpp
diff --git a/tools/flags/SkCommonFlagsConfig.cpp b/tools/flags/SkCommonFlagsConfig.cpp
index 611950c3058e86b03295f5aea95fa75f12e09a49..c82e8de0036214b4a0398eeeb00bef325f773b12 100644
--- a/tools/flags/SkCommonFlagsConfig.cpp
+++ b/tools/flags/SkCommonFlagsConfig.cpp
@@ -23,11 +23,11 @@
static const char configHelp[] =
"Options: 565 8888 debug gpu gpudebug gpudft gpunull "
- "msaa16 msaa4 gpuf16 gpusrgb nonrendering null nullgpu nvprmsaa16 nvprmsaa4 "
+ "msaa16 msaa4 nonrendering null nullgpu nvprmsaa16 nvprmsaa4 "
"pdf pdf_poppler skp svg xps"
#if SK_ANGLE
#ifdef SK_BUILD_FOR_WIN
- " angle anglesrgb"
+ " angle"
#endif
" angle-gl"
#endif
@@ -47,7 +47,7 @@
"Possible backends and options:\n"
#if SK_SUPPORT_GPU
"\n"
- "gpu(api=string,color=string,dit=bool,nvpr=bool,samples=int)\tGPU backend\n"
+ "gpu(api=string,dit=bool,nvpr=bool,samples=int)\tGPU backend\n"
"\tapi\ttype: string\tdefault: native.\n"
"\t Select graphics API to use with gpu backend.\n"
"\t Options:\n"
@@ -69,12 +69,6 @@
#if SK_MESA
"\t\tmesa\t\t\tUse MESA.\n"
#endif
- "\tcolor\ttype: string\tdefault: 8888.\n"
- "\t Select framebuffer color format.\n"
- "\t Options:\n"
- "\t\t8888\t\t\tLinear 8888.\n"
- "\t\tf16 \t\t\tLinear 16-bit floating point.\n"
- "\t\tsrgb\t\t\tsRGB 8888.\n"
"\tdit\ttype: bool\tdefault: false.\n"
"\t Use device independent text.\n"
"\tnvpr\ttype: bool\tdefault: false.\n"
@@ -88,8 +82,6 @@
"\tmsaa16 \t= gpu(samples=16)\n"
"\tnvprmsaa4\t= gpu(nvpr=true,samples=4)\n"
"\tnvprmsaa16\t= gpu(nvpr=true,samples=16)\n"
- "\tgpuf16 \t= gpu(color=f16)\n"
- "\tgpusrgb \t= gpu(color=srgb)\n"
"\tgpudft \t= gpu(dit=true)\n"
"\tgpudebug \t= gpu(api=debug)\n"
"\tgpunull \t= gpu(api=null)\n"
@@ -98,7 +90,6 @@
#if SK_ANGLE
#ifdef SK_BUILD_FOR_WIN
"\tangle \t= gpu(api=angle)\n"
- "\tanglesrgb \t= gpu(api=angle,color=srgb)\n"
#endif
"\tangle-gl \t= gpu(api=angle-gl)\n"
#endif
@@ -124,8 +115,6 @@
{ "msaa16", "gpu", "samples=16" },
{ "nvprmsaa4", "gpu", "nvpr=true,samples=4,dit=true" },
{ "nvprmsaa16", "gpu", "nvpr=true,samples=16,dit=true" },
- { "gpuf16", "gpu", "color=f16" },
- { "gpusrgb", "gpu", "color=srgb" },
{ "gpudft", "gpu", "dit=true" },
{ "gpudebug", "gpu", "api=debug" },
{ "gpunull", "gpu", "api=null" },
@@ -134,7 +123,6 @@
#if SK_ANGLE
#ifdef SK_BUILD_FOR_WIN
, { "angle", "gpu", "api=angle" }
- , { "anglesrgb", "gpu", "api=angle,color=srgb" }
#endif
, { "angle-gl", "gpu", "api=angle-gl" }
#endif
@@ -161,15 +149,12 @@
#if SK_SUPPORT_GPU
SkCommandLineConfigGpu::SkCommandLineConfigGpu(
const SkString& tag, const SkTArray<SkString>& viaParts,
- ContextType contextType, bool useNVPR, bool useDIText, int samples,
- SkColorType colorType, SkColorProfileType profileType)
+ ContextType contextType, bool useNVPR, bool useDIText, int samples)
: SkCommandLineConfig(tag, SkString("gpu"), viaParts)
, fContextType(contextType)
, fUseNVPR(useNVPR)
, fUseDIText(useDIText)
- , fSamples(samples)
- , fColorType(colorType)
- , fProfileType(profileType) {
+ , fSamples(samples) {
}
static bool parse_option_int(const SkString& value, int* outInt) {
if (value.isEmpty()) {
@@ -244,26 +229,6 @@
return true;
}
#endif
- return false;
-}
-static bool parse_option_gpu_color(const SkString& value,
- SkColorType* outColorType,
- SkColorProfileType* outProfileType) {
- if (value.equals("8888")) {
- *outColorType = kRGBA_8888_SkColorType;
- *outProfileType = kLinear_SkColorProfileType;
- return true;
- }
- if (value.equals("f16")) {
- *outColorType = kRGBA_F16_SkColorType;
- *outProfileType = kLinear_SkColorProfileType;
- return true;
- }
- if (value.equals("srgb")) {
- *outColorType = kRGBA_8888_SkColorType;
- *outProfileType = kSRGB_SkColorProfileType;
- return true;
- }
return false;
}
@@ -279,9 +244,6 @@
bool useDIText = false;
bool seenSamples = false;
int samples = 0;
- bool seenColor = false;
- SkColorType colorType = kRGBA_8888_SkColorType;
- SkColorProfileType profileType = kLinear_SkColorProfileType;
SkTArray<SkString> optionParts;
SkStrSplit(options.c_str(), ",", kStrict_SkStrSplitMode, &optionParts);
@@ -306,16 +268,12 @@
} else if (key.equals("samples") && !seenSamples) {
valueOk = parse_option_int(value, &samples);
seenSamples = true;
- } else if (key.equals("color") && !seenColor) {
- valueOk = parse_option_gpu_color(value, &colorType, &profileType);
- seenColor = true;
}
if (!valueOk) {
return nullptr;
}
}
- return new SkCommandLineConfigGpu(tag, vias, contextType, useNVPR, useDIText, samples,
- colorType, profileType);
+ return new SkCommandLineConfigGpu(tag, vias, contextType, useNVPR, useDIText, samples);
}
#endif
« no previous file with comments | « tools/flags/SkCommonFlagsConfig.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698