diff options
author | Brian Osman <brianosman@google.com> | 2018-03-01 20:10:11 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-03-01 20:10:15 +0000 |
commit | ded47a50143470d1acdafa03e878cc7da5608038 (patch) | |
tree | 45eb5ca0de078bd3abe6f56a121d5d76abe6ae96 /tools/flags/SkCommonFlagsConfig.cpp | |
parent | caf1ebb95f7fea81d416b81beb4b46c25643c714 (diff) |
Revert "Add 1010102 support to Ganesh"
This reverts commit 44b61204d9f5681b9474db017577d56f42a32d66.
Reason for revert: TSAN bot crashing
Original change's description:
> Add 1010102 support to Ganesh
>
> Adds gl1010102, gles1010102, vk1010102, and mtl1010102
> configs to DM.
>
> This uses the same saveLayer approach as CPU, switching
> to 8888 so that we have enough alpha precision.
>
> Change-Id: I9f5b63747ec01031c8db97dadfc42f77e4863ccb
> Reviewed-on: https://skia-review.googlesource.com/110500
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Brian Osman <brianosman@google.com>
TBR=mtklein@google.com,bsalomon@google.com,brianosman@google.com
Change-Id: I782e740763044c1ae78fb219161e37eec7617c74
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/111580
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'tools/flags/SkCommonFlagsConfig.cpp')
-rw-r--r-- | tools/flags/SkCommonFlagsConfig.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/tools/flags/SkCommonFlagsConfig.cpp b/tools/flags/SkCommonFlagsConfig.cpp index 7ff6ce6849..f9988f8769 100644 --- a/tools/flags/SkCommonFlagsConfig.cpp +++ b/tools/flags/SkCommonFlagsConfig.cpp @@ -46,11 +46,9 @@ static const struct { { "gl4444", "gpu", "api=gl,color=4444" }, { "gl565", "gpu", "api=gl,color=565" }, { "glf16", "gpu", "api=gl,color=f16" }, - { "gl1010102", "gpu", "api=gl,color=1010102" }, { "glsrgb", "gpu", "api=gl,color=srgb" }, { "glsrgbnl", "gpu", "api=gl,color=srgbnl" }, { "glesf16", "gpu", "api=gles,color=f16" }, - { "gles1010102", "gpu", "api=gles,color=1010102" }, { "glessrgb", "gpu", "api=gles,color=srgb" }, { "glessrgbnl", "gpu", "api=gles,color=srgbnl" }, { "glsrgb", "gpu", "api=gl,color=srgb" }, @@ -79,7 +77,6 @@ static const struct { { "mock", "gpu", "api=mock" } #ifdef SK_VULKAN ,{ "vk", "gpu", "api=vulkan" } - ,{ "vk1010102", "gpu", "api=vulkan,color=1010102" } ,{ "vksrgb", "gpu", "api=vulkan,color=srgb" } ,{ "vkwide", "gpu", "api=vulkan,color=f16_wide" } ,{ "vkmsaa4", "gpu", "api=vulkan,samples=4" } @@ -87,7 +84,6 @@ static const struct { #endif #ifdef SK_METAL ,{ "mtl", "gpu", "api=metal" } - ,{ "mtl1010102", "gpu", "api=metal,color=1010102" } ,{ "mtlsrgb", "gpu", "api=metal,color=srgb" } ,{ "mtlwide", "gpu", "api=metal,color=f16_wide" } ,{ "mtlmsaa4", "gpu", "api=metal,samples=4" } @@ -144,7 +140,6 @@ static const char configExtendedHelp[] = "\t\t4444\t\t\tLinear 4444.\n" "\t\t565\t\t\tLinear 565.\n" "\t\tf16{_gamut}\t\tLinear 16-bit floating point.\n" - "\t\t1010102\t\tLinear 1010102.\n" "\t\tsrgb{_gamut}\t\tsRGB 8888.\n" "\t gamut\ttype: string\tdefault: srgb.\n" "\t Select color gamut for f16 or sRGB format buffers.\n" @@ -326,10 +321,6 @@ static bool parse_option_gpu_color(const SkString& value, *alphaType = kOpaque_SkAlphaType; *outColorSpace = nullptr; return true; - } else if (value.equals("1010102")) { - *outColorType = kRGBA_1010102_SkColorType; - *outColorSpace = nullptr; - return true; } SkTArray<SkString> commands; |