diff options
| author |  brianosman <brianosman@google.com> | 2016-02-29 13:55:40 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-02-29 13:55:40 -0800 |
| commit | e9c8442bfc3a44b00cd64529882d7a8bd4bc6030 (patch) | |
| tree | 7df7f62a6bde9e3bf51c05d6af7cf0211fb78e3b /src | |
| parent | 000958973f4b514cddbfdcc01ec167437b66de2c (diff) | |
Revert of Progress on gamma-correctness in the GPU backend. Fixed conversion of color and profile type to pix… (patchset #3 id:40001 of https://codereview.chromium.org/1746253002/ )
Reason for revert:
Fixing the build.
Original issue's description:
> Progress on gamma-correctness in the GPU backend. Fixed conversion of color and profile type to pixel config, which makes many things "just work".
>
> Added (color=8888|f16|srgb) option to gpu configurations, along with gpuf16, gpusrgb, and anglesrgb predefined configs. Runs the gpu backend in gamma-correct mode (with either FP16 linear or sRGB 8888 frambuffers).
>
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1746253002
>
> Committed: https://skia.googlesource.com/skia/+/eef980270d3385fee340eb1633962fe3ba8b7132
TBR=mtklein@google.com,egdaniel@google.com,bsalomon@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/1748823002
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpu/SkGr.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp index 4106d494b1..a3848c77e0 100644 --- a/src/gpu/SkGr.cpp +++ b/src/gpu/SkGr.cpp @@ -370,13 +370,12 @@ GrPixelConfig SkImageInfo2GrPixelConfig(SkColorType ct, SkAlphaType, SkColorProf case kARGB_4444_SkColorType: return kRGBA_4444_GrPixelConfig; case kRGBA_8888_SkColorType: - return (kSRGB_SkColorProfileType == pt) - ? kSRGBA_8888_GrPixelConfig - : kRGBA_8888_GrPixelConfig; + //if (kSRGB_SkColorProfileType == pt) { + // return kSRGBA_8888_GrPixelConfig; + //} + return kRGBA_8888_GrPixelConfig; case kBGRA_8888_SkColorType: - return (kSRGB_SkColorProfileType == pt) - ? kSRGBA_8888_GrPixelConfig // Does not preserve byte order! - : kBGRA_8888_GrPixelConfig; + return kBGRA_8888_GrPixelConfig; case kIndex_8_SkColorType: return kIndex_8_GrPixelConfig; case kGray_8_SkColorType: |