diff options
author | brianosman <brianosman@google.com> | 2016-03-17 13:01:26 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-17 13:01:26 -0700 |
commit | c571c001cee4e0dfacd7bd17d5cd0a2900a853a9 (patch) | |
tree | b677d3cb745b52dd7f74507de78709c8437b3ecd /src/views | |
parent | b893a4c569d0719a395abffb266d1d61af847e2f (diff) |
Revert of sRGB support in Ganesh. Several pieces: (patchset #12 id:220001 of https://codereview.chromium.org/1789663002/ )
Reason for revert:
We're getting sRGB non-8888 configs?
Original issue's description:
> sRGB support in Ganesh. Several pieces:
>
> sRGB support now also requires GL_EXT_texture_sRGB_decode, which allows
> us to disable sRGB -> Linear conversion when reading textures. This gives
> us an easy way to support "legacy" L32 mode. We disable decoding based on
> the pixel config of the render target. Textures can override that behavior
> (specifically for format-conversion draws where we want that behavior).
>
> Added sBGRA pixel config, which is not-really-a-format. It's just sRGBA
> internally, and the external format is BGR order, so TexImage calls will
> swizzle correctly. This lets us interact with sRGB raster surfaces on BGR
> platforms.
>
> Devices without sRGB support behave like they always have: conversion from
> color type and profile type ignores sRGB and always returns linear pixel
> configs.
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1789663002
>
> Committed: https://skia.googlesource.com/skia/+/9e3f1bf4e5cd8fc59554f986f36d6b034e99f9eb
TBR=reed@google.com,bsalomon@google.com,robertphillips@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1814533003
Diffstat (limited to 'src/views')
-rw-r--r-- | src/views/SkWindow.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/views/SkWindow.cpp b/src/views/SkWindow.cpp index 056b3eab50..82c1a43c0a 100644 --- a/src/views/SkWindow.cpp +++ b/src/views/SkWindow.cpp @@ -329,13 +329,9 @@ GrRenderTarget* SkWindow::renderTarget(const AttachmentInfo& attachmentInfo, // TODO: Query the actual framebuffer for sRGB capable. However, to // preserve old (fake-linear) behavior, we don't do this. Instead, rely // on the flag (currently driven via 'C' mode in SampleApp). - // - // Also, we may not have real sRGB support (ANGLE, in particular), so check for - // that, and fall back to L32: - desc.fConfig = grContext->caps()->srgbSupport() && - (info().profileType() == kSRGB_SkColorProfileType || + desc.fConfig = (info().profileType() == kSRGB_SkColorProfileType || info().colorType() == kRGBA_F16_SkColorType) - ? kSkiaGamma8888_GrPixelConfig + ? kSRGBA_8888_GrPixelConfig // This may not be the right byte-order : kSkia8888_GrPixelConfig; desc.fOrigin = kBottomLeft_GrSurfaceOrigin; desc.fSampleCnt = attachmentInfo.fSampleCount; |