diff options
author | msarett <msarett@google.com> | 2016-09-16 11:01:27 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-09-16 11:01:27 -0700 |
commit | c71a9b7f53938b4f33f36f48e867b8b72cc1cc61 (patch) | |
tree | 8fbb6b55eb00f5fb5b55e89d97076f199cc0e205 /gm/colorspacexform.cpp | |
parent | 046cb56c6c1bb40779c81b115271ed0e8196b48b (diff) |
Revert of Support Float32 output from SkColorSpaceXform (patchset #7 id:140001 of https://codereview.chromium.org/2339233003/ )
Reason for revert:
Hitting an assert
Original issue's description:
> Support Float32 output from SkColorSpaceXform
>
> * Adds Float32 support to SkColorSpaceXform
> * Changes API to allows clients to ask for F32, updates clients to
> new API
> * Adds Sk4f_load4 and Sk4f_store4 to SkNx
> * Make use of new xform in SkGr.cpp
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2339233003
> CQ_INCLUDE_TRYBOTS=master.client.skia:Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD-Trybot
>
> Committed: https://skia.googlesource.com/skia/+/43d6651111374b5d1e4ddd9030dcf079b448ec47
TBR=brianosman@google.com,mtklein@google.com,scroggo@google.com,mtklein@chromium.org,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/2347473007
Diffstat (limited to 'gm/colorspacexform.cpp')
-rw-r--r-- | gm/colorspacexform.cpp | 88 |
1 files changed, 0 insertions, 88 deletions
diff --git a/gm/colorspacexform.cpp b/gm/colorspacexform.cpp deleted file mode 100644 index b3d79c91f0..0000000000 --- a/gm/colorspacexform.cpp +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright 2013 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#include "gm.h" -#include "SkColor.h" -#include "SkColorSpaceXform.h" -#include "SkRect.h" - -class ColorSpaceXformGM : public skiagm::GM { -public: - ColorSpaceXformGM() {} - -protected: - void onOnceBeforeDraw() override { - SkColor colors[] = { - SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE, SK_ColorMAGENTA, SK_ColorCYAN, SK_ColorYELLOW, - SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE, SK_ColorMAGENTA, - }; - static_assert(kNumColors == SK_ARRAY_COUNT(colors), "Fix number of colors."); - - for (int i = 0; i < kNumColors; i++) { - fSRGBColors[i] = SkColor4f::FromColor(colors[i]); - - // FIXME (msarett): SkColorSpaceXform does not support BGRA. - colors[i] = SkSwizzle_RB(colors[i]); - } - - static constexpr float kWideGamutRGB_toXYZD50[]{ - 0.7161046f, 0.1009296f, 0.1471858f, - 0.2581874f, 0.7249378f, 0.0168748f, - 0.0000000f, 0.0517813f, 0.7734287f, - }; - - SkMatrix44 wideGamut(SkMatrix44::kUninitialized_Constructor); - wideGamut.set3x3RowMajorf(kWideGamutRGB_toXYZD50); - std::unique_ptr<SkColorSpaceXform> xform = SkColorSpaceXform::New( - SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named), - SkColorSpace::NewRGB(SkColorSpace::kLinear_RenderTargetGamma, wideGamut)); - - xform->apply(fWideGamutColors, colors, kNumColors, - SkColorSpaceXform::kRGBA_F32_ColorFormat, kOpaque_SkAlphaType); - } - - SkString onShortName() override { - return SkString("colorspacexform"); - } - - SkISize onISize() override { - return SkISize::Make(500, 200); - } - - void onDraw(SkCanvas* canvas) override { - auto drawColors = [canvas](SkColor4f* colors) { - SkRect r = SkRect::MakeXYWH(0.0f, 0.0f, 50.0f, 100.0f); - - canvas->save(); - for (int i = 0; i < kNumColors; i++) { - sk_sp<SkColorSpace> space = - SkColorSpace::NewNamed(SkColorSpace::kSRGB_Named)->makeLinearGamma(); - sk_sp<SkShader> s = SkShader::MakeColorShader(colors[i], space); - SkPaint paint; - paint.setShader(s); - canvas->drawRect(r, paint); - canvas->translate(50.0f, 0.0f); - } - canvas->restore(); - }; - - // Wide gamut colors should appear darker - we are simulating a more intense display. - drawColors(fSRGBColors); - canvas->translate(0.0f, 100.0f); - drawColors(fWideGamutColors); - } - -private: - static constexpr int kNumColors = 10; - - SkColor4f fSRGBColors[kNumColors]; - SkColor4f fWideGamutColors[kNumColors]; - - typedef skiagm::GM INHERITED; -}; - -DEF_GM(return new ColorSpaceXformGM;) |