diff options
author | brianosman <brianosman@google.com> | 2016-03-01 13:44:28 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-03-01 13:44:28 -0800 |
commit | 744898aa48e055401e5ef203d5f633e69825bf20 (patch) | |
tree | ac08a96d6f809ee67c65e85babc2db25e304959e /dm/DMSrcSink.h | |
parent | e7be3e5c7999230673c8272a2c73cb7261e735c6 (diff) |
Revert of Progress on gamma-correctness in the GPU backend. Fixed conversion of color and profile type to pix… (patchset #1 id:1 of https://codereview.chromium.org/1750383002/ )
Reason for revert:
GM breakage. Changes to SkGr.cpp appear to be altering behavior on a variety of tests. Debugging...
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=1750383002
>
> Committed: https://skia.googlesource.com/skia/+/a6f58194733c1c50e4fe5f98585e42344f29b6f0
TBR=mtklein@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/1755553003
Diffstat (limited to 'dm/DMSrcSink.h')
-rw-r--r-- | dm/DMSrcSink.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/dm/DMSrcSink.h b/dm/DMSrcSink.h index babe14d135..bbf47cffd8 100644 --- a/dm/DMSrcSink.h +++ b/dm/DMSrcSink.h @@ -213,8 +213,7 @@ public: class GPUSink : public Sink { public: GPUSink(GrContextFactory::GLContextType, GrContextFactory::GLContextOptions, - int samples, bool diText, SkColorType colorType, SkColorProfileType profileType, - bool threaded); + int samples, bool diText, bool threaded); Error draw(const Src&, SkBitmap*, SkWStream*, SkString*) const override; bool serial() const override { return !fThreaded; } @@ -225,8 +224,6 @@ private: GrContextFactory::GLContextOptions fContextOptions; int fSampleCount; bool fUseDIText; - SkColorType fColorType; - SkColorProfileType fProfileType; bool fThreaded; }; |