diff options
| author |  brianosman <brianosman@google.com> | 2016-12-01 10:42:03 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-12-01 10:42:04 -0800 |
| commit | 0a2782c98c45127a10d6392c539e7bce72dc5513 (patch) | |
| tree | 3153ea6fada6cd2761e0ac876cdb1c7b2fcb73a0 /tools/flags | |
| parent | dd19ac7d10c7c00dd6e9b1f4c4c6aae729c7e6d4 (diff) | |
Revert of Enable sRGB on iOS, make sRGB decode support optional (patchset #11 id:200001 of https://codereview.chromium.org/2539993002/ )
Reason for revert:
ANGLE tests are failing
Original issue's description:
> Two (related) changes here:
>
> 1) Our older iOS devices failed our sRGB tests, due to precision issues
> with alpha. At this point, we only test on iPadMini 4, and that appears
> not to have any problems.
>
> 2) iOS devices still don't have the sRGB texture decode extension. But,
> some clients have no interest in mixing legacy/color-correct rendering,
> and would like to use sRGB on these devices. This GrContextOptions flag
> enables sRGB support in those cases.
>
> Adjust the test code to produce sRGB capable contexts on these devices,
> but only for configs that have a color space. (See comment).
>
> BUG=skia:4148
>
> Committed: https://skia.googlesource.com/skia/+/9db12d2341f3f8722c8b90b11dd4cce138a8a64e
TBR=bsalomon@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:4148
Review-Url: https://codereview.chromium.org/2547603002
Diffstat (limited to 'tools/flags')
| -rw-r--r-- | tools/flags/SkCommonFlagsConfig.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/tools/flags/SkCommonFlagsConfig.cpp b/tools/flags/SkCommonFlagsConfig.cpp index 5763e4a6ca..abd8bdb78d 100644 --- a/tools/flags/SkCommonFlagsConfig.cpp +++ b/tools/flags/SkCommonFlagsConfig.cpp @@ -185,19 +185,8 @@ SkCommandLineConfigGpu::SkCommandLineConfigGpu( if (useInstanced) { fContextOptions |= ContextOptions::kUseInstanced; } - // Subtle logic: If the config has a color space attached, we're going to be rendering to sRGB, - // so we need that capability. In addition, to get the widest test coverage, we DO NOT require - // that we can disable sRGB decode. (That's for rendering sRGB sources to legacy surfaces). - // - // If the config doesn't have a color space attached, we're going to be rendering in legacy - // mode. In that case, we can't allow a context to be created that has sRGB support without - // the ability to disable sRGB decode. Otherwise, all of our sRGB source resources will be - // treated as sRGB textures, but we will be unable to prevent the decode, causing them to be - // too dark. if (fColorSpace) { fContextOptions |= ContextOptions::kRequireSRGBSupport; - } else { - fContextOptions |= ContextOptions::kRequireSRGBDecodeDisableSupport; } } static bool parse_option_int(const SkString& value, int* outInt) { |