diff options
author | 2016-05-03 12:56:04 -0700 | |
---|---|---|
committer | 2016-05-03 12:56:04 -0700 | |
commit | 4f16e6361db190d3cf1b6e8a117071cb0b54d0f5 (patch) | |
tree | bef7d9392ca20101e6b32e308336b3e51534443b /include/gpu | |
parent | 50d3b57c8aaa0f026b981101c45ea30361382940 (diff) |
Revert of Add Gr*Proxy classes (patchset #10 id:220001 of https://codereview.chromium.org/1937553002/ )
Reason for revert:
ASAN
Original issue's description:
> Add Gr*Proxy classes
>
> This isn't wired in anywhere yet.
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1937553002
>
> Committed: https://skia.googlesource.com/skia/+/de5bf0cfeca908b81a28cc50065f7bc2da3d2fd1
>
> Committed: https://skia.googlesource.com/skia/+/92605b35efa0155c44d24bd8415b4cc1db8831db
TBR=bsalomon@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review-Url: https://codereview.chromium.org/1944953002
Diffstat (limited to 'include/gpu')
-rw-r--r-- | include/gpu/GrContext.h | 7 | ||||
-rw-r--r-- | include/gpu/GrRenderTarget.h | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h index 6f5ca981e5..cb407aa5bf 100644 --- a/include/gpu/GrContext.h +++ b/include/gpu/GrContext.h @@ -194,11 +194,16 @@ public: */ sk_sp<GrDrawContext> drawContext(sk_sp<GrRenderTarget> rt, const SkSurfaceProps* = nullptr); + enum BackingFit { + kTight_BackingFit, + kLoose_BackingFit + }; + /** * Create both a GrRenderTarget and a matching GrDrawContext to wrap it. * The created GrRenderTarget will always be budgeted. */ - sk_sp<GrDrawContext> newDrawContext(SkBackingFit fit, + sk_sp<GrDrawContext> newDrawContext(BackingFit fit, int width, int height, GrPixelConfig config, int sampleCnt = 0, diff --git a/include/gpu/GrRenderTarget.h b/include/gpu/GrRenderTarget.h index ff75af37e8..eb9f142211 100644 --- a/include/gpu/GrRenderTarget.h +++ b/include/gpu/GrRenderTarget.h @@ -11,7 +11,6 @@ #include "GrSurface.h" #include "SkRect.h" -class GrCaps; class GrDrawTarget; class GrStencilAttachment; class GrRenderTargetPriv; @@ -156,8 +155,6 @@ public: void setLastDrawTarget(GrDrawTarget* dt); GrDrawTarget* getLastDrawTarget() { return fLastDrawTarget; } - static SampleConfig ComputeSampleConfig(const GrCaps& caps, int sampleCnt); - protected: GrRenderTarget(GrGpu* gpu, const GrSurfaceDesc& desc, SampleConfig sampleConfig, GrStencilAttachment* stencil = nullptr) |