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 /include/gpu | |
| 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 'include/gpu')
| -rw-r--r-- | include/gpu/GrDrawContext.h | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/include/gpu/GrDrawContext.h b/include/gpu/GrDrawContext.h index 80f4da12cf..72de15deae 100644 --- a/include/gpu/GrDrawContext.h +++ b/include/gpu/GrDrawContext.h @@ -33,7 +33,6 @@ class GrRenderTarget; class GrStyle; class GrSurface; struct GrUserStencilSettings; -class SkColorSpaceXform; class SkDrawFilter; struct SkIPoint; struct SkIRect; @@ -337,7 +336,7 @@ public: } const SkSurfaceProps& surfaceProps() const { return fSurfaceProps; } SkColorSpace* getColorSpace() const { return fColorSpace.get(); } - SkColorSpaceXform* getColorXformFromSRGB() const { return fColorXformFromSRGB.get(); } + GrColorSpaceXform* getColorXformFromSRGB() const { return fColorXformFromSRGB.get(); } GrSurfaceOrigin origin() const { return fRenderTarget->origin(); } bool wasAbandoned() const; @@ -418,22 +417,22 @@ private: GrDrawTarget* getDrawTarget(); - GrDrawingManager* fDrawingManager; - sk_sp<GrRenderTarget> fRenderTarget; + GrDrawingManager* fDrawingManager; + sk_sp<GrRenderTarget> fRenderTarget; // In MDB-mode the drawTarget can be closed by some other drawContext that has picked // it up. For this reason, the drawTarget should only ever be accessed via 'getDrawTarget'. - GrDrawTarget* fDrawTarget; - GrContext* fContext; - GrInstancedPipelineInfo fInstancedPipelineInfo; + GrDrawTarget* fDrawTarget; + GrContext* fContext; + GrInstancedPipelineInfo fInstancedPipelineInfo; - sk_sp<SkColorSpace> fColorSpace; - std::unique_ptr<SkColorSpaceXform> fColorXformFromSRGB; - SkSurfaceProps fSurfaceProps; - GrAuditTrail* fAuditTrail; + sk_sp<SkColorSpace> fColorSpace; + sk_sp<GrColorSpaceXform> fColorXformFromSRGB; + SkSurfaceProps fSurfaceProps; + GrAuditTrail* fAuditTrail; // In debug builds we guard against improper thread handling - SkDEBUGCODE(mutable GrSingleOwner* fSingleOwner;) + SkDEBUGCODE(mutable GrSingleOwner* fSingleOwner;) }; #endif |