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

Unified Diff: tools/flags/SkCommonFlagsConfig.cpp

Issue 1857233002: Revert of Add predfined configs for msaa4, nvpr4, nvpr4dit, and srgb that explictly use OpenGL rather than GL… (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 8 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/dm_flags.py ('k') | tools/nanobench_flags.json » ('j') | 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 973f14eaa17d9db82d7a5ecf168ed42623a41d8f..7d43207c6bd54ce180b707b91b216a2226624b8c 100644
--- a/tools/flags/SkCommonFlagsConfig.cpp
+++ b/tools/flags/SkCommonFlagsConfig.cpp
@@ -26,9 +26,9 @@
;
static const char configHelp[] =
- "Options: 565 8888 debug gpu gl gpudebug gpudft gpunull "
- "msaa16 msaa4 glmsaa4 gpuf16 gpusrgb glsrgb nonrendering null nullgpu "
- "nvpr16 nvpr4 nvprdit16 nvprdit4 glnvpr4 glnvprdit4 pdf skp svg xps"
+ "Options: 565 8888 debug gpu gpudebug gpudft gpunull "
+ "msaa16 msaa4 gpuf16 gpusrgb nonrendering null nullgpu "
+ "nvpr16 nvpr4 nvprdit16 nvprdit4 pdf skp svg xps"
#if SK_ANGLE
#ifdef SK_BUILD_FOR_WIN
" angle"
@@ -87,19 +87,14 @@
"\n"
"Predefined configs:\n\n"
"\tgpu \t= gpu()\n"
- "\tgl \t= gpu(api=gl)\n"
"\tmsaa4 \t= gpu(samples=4)\n"
- "\tglmsaa4 \t= gpu(api=gl,samples=4)\n"
"\tmsaa16 \t= gpu(samples=16)\n"
"\tnvpr4 \t= gpu(nvpr=true,samples=4)\n"
- "\tglnvpr4 \t= gpu(api=gl,nvpr=true,samples=4)\n"
"\tnvpr16 \t= gpu(nvpr=true,samples=16)\n"
"\tnvprdit4 \t= gpu(nvpr=true,samples=4,dit=true)\n"
- "\tglnvprdit4\t= gpu(api=gl,nvpr=true,samples=4,dit=true)\n"
"\tnvprdit16 \t= gpu(nvpr=true,samples=16,dit=true)\n"
"\tgpuf16 \t= gpu(color=f16)\n"
"\tgpusrgb \t= gpu(color=srgb)\n"
- "\tglsrgb \t= gpu(api=gl,color=srgb)\n"
"\tgpudft \t= gpu(dit=true)\n"
"\tgpudebug \t= gpu(api=debug)\n"
"\tgpunull \t= gpu(api=null)\n"
@@ -129,19 +124,14 @@
} gPredefinedConfigs[] = {
#if SK_SUPPORT_GPU
{ "gpu", "gpu", "" },
- { "gl", "gpu", "api=gl" },
{ "msaa4", "gpu", "samples=4" },
- { "glmsaa4", "gpu", "api=gl,samples=4" },
{ "msaa16", "gpu", "samples=16" },
{ "nvpr4", "gpu", "nvpr=true,samples=4" },
- { "glnvpr4", "gpu", "api=gl,nvpr=true,samples=4" },
{ "nvpr16", "gpu", "nvpr=true,samples=16" },
{ "nvprdit4", "gpu", "nvpr=true,samples=4,dit=true" },
- { "glnvprdit4", "gpu", "api=gl,nvpr=true,samples=4,dit=true" },
{ "nvprdit16", "gpu", "nvpr=true,samples=16,dit=true" },
{ "gpuf16", "gpu", "color=f16" },
{ "gpusrgb", "gpu", "color=srgb" },
- { "glsrgb", "gpu", "api=gl,color=srgb" },
{ "gpudft", "gpu", "dit=true" },
{ "gpudebug", "gpu", "api=debug" },
{ "gpunull", "gpu", "api=null" },
« no previous file with comments | « tools/dm_flags.py ('k') | tools/nanobench_flags.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698