From dd3b3f41829d32d7eaf3eb4903570d49c2ba9ff8 Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Mon, 24 Apr 2017 10:57:28 -0400 Subject: Rm makeRenderTargetContext in favor of deferred version (take 3) This is a reland of: https://skia-review.googlesource.com/c/13001/ (Rm makeRenderTargetContext in favor of deferred version) TBR=bsalomon@google.com Change-Id: If81f4d9fb889c091cd37ffde133d906fb3e37773 Reviewed-on: https://skia-review.googlesource.com/14027 Commit-Queue: Robert Phillips Reviewed-by: Greg Daniel --- include/gpu/GrCaps.h | 1 - include/gpu/GrContext.h | 34 +++++----------------------------- 2 files changed, 5 insertions(+), 30 deletions(-) (limited to 'include') diff --git a/include/gpu/GrCaps.h b/include/gpu/GrCaps.h index 8b005800cc..abd10a1c01 100644 --- a/include/gpu/GrCaps.h +++ b/include/gpu/GrCaps.h @@ -26,7 +26,6 @@ public: GrCaps(const GrContextOptions&); virtual SkString dump() const; - const GrShaderCaps* shaderCaps() const { return fShaderCaps.get(); } bool npotTextureTileSupport() const { return fNPOTTextureTileSupport; } diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h index 158699b837..ec07e96965 100644 --- a/include/gpu/GrContext.h +++ b/include/gpu/GrContext.h @@ -183,25 +183,13 @@ public: */ int getRecommendedSampleCount(GrPixelConfig config, SkScalar dpi) const; - /** - * Create both a GrRenderTarget and a matching GrRenderTargetContext to wrap it. - * We guarantee that "asTexture" will succeed for renderTargetContexts created - * via this entry point. + /* + * Create a new render target context backed by a deferred-style + * GrRenderTargetProxy. We guarantee that "asTextureProxy" will succeed for + * renderTargetContexts created via this entry point. */ - sk_sp makeRenderTargetContext( - SkBackingFit fit, - int width, int height, - GrPixelConfig config, - sk_sp colorSpace, - int sampleCnt = 0, - GrSurfaceOrigin origin = kBottomLeft_GrSurfaceOrigin, - const SkSurfaceProps* surfaceProps = nullptr, - SkBudgeted = SkBudgeted::kYes); - - // Create a new render target context as above but have it backed by a deferred-style - // GrRenderTargetProxy rather than one that is backed by an actual GrRenderTarget sk_sp makeDeferredRenderTargetContext( - SkBackingFit fit, + SkBackingFit fit, int width, int height, GrPixelConfig config, sk_sp colorSpace, @@ -215,18 +203,6 @@ public: * converted to 8888). It may also swizzle the channels (e.g., BGRA -> RGBA). * SRGB-ness will be preserved. */ - sk_sp makeRenderTargetContextWithFallback( - SkBackingFit fit, - int width, int height, - GrPixelConfig config, - sk_sp colorSpace, - int sampleCnt = 0, - GrSurfaceOrigin origin = kBottomLeft_GrSurfaceOrigin, - const SkSurfaceProps* surfaceProps = nullptr, - SkBudgeted budgeted = SkBudgeted::kYes); - - // Create a new render target context as above but have it backed by a deferred-style - // GrRenderTargetProxy rather than one that is backed by an actual GrRenderTarget sk_sp makeDeferredRenderTargetContextWithFallback( SkBackingFit fit, int width, int height, -- cgit v1.2.3