diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-05-15 21:23:13 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-17 13:27:12 +0000 |
| commit | 63e7973d1f01bd03216659b9d2267f83a752c8fb (patch) | |
| tree | ab2a84bb98d437e7cd48953a24979f31a88aa020 /include | |
| parent | 4d0dab9eca0d98de62c11bd31067dbf3f92e5c98 (diff) | |
Remove GrSurfaceProxy::desc()
Adds a numStencilSamples() getter.
Bug: skia:
Change-Id: I1e57f19b3cb490a6214ea436622ed8128a5a9303
Reviewed-on: https://skia-review.googlesource.com/16994
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/private/GrInstancedPipelineInfo.h | 2 | ||||
| -rw-r--r-- | include/private/GrSurfaceProxy.h | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/private/GrInstancedPipelineInfo.h b/include/private/GrInstancedPipelineInfo.h index c07425909a..b89f8632cf 100644 --- a/include/private/GrInstancedPipelineInfo.h +++ b/include/private/GrInstancedPipelineInfo.h @@ -18,7 +18,7 @@ struct GrInstancedPipelineInfo { GrInstancedPipelineInfo(const GrRenderTargetProxy* rtp) : fIsMultisampled(GrFSAAType::kNone != rtp->fsaaType()) , fIsMixedSampled(GrFSAAType::kMixedSamples == rtp->fsaaType()) - , fIsRenderingToFloat(GrPixelConfigIsFloatingPoint(rtp->desc().fConfig)) {} + , fIsRenderingToFloat(GrPixelConfigIsFloatingPoint(rtp->config())) {} bool canUseCoverageAA() const { return !fIsMultisampled || fIsMixedSampled; } diff --git a/include/private/GrSurfaceProxy.h b/include/private/GrSurfaceProxy.h index 2d60c8d648..8b3779c4e9 100644 --- a/include/private/GrSurfaceProxy.h +++ b/include/private/GrSurfaceProxy.h @@ -188,8 +188,6 @@ public: static sk_sp<GrTextureProxy> MakeWrappedBackend(GrContext*, GrBackendTexture&, GrSurfaceOrigin); - const GrSurfaceDesc& desc() const { return fDesc; } - GrSurfaceOrigin origin() const { SkASSERT(kTopLeft_GrSurfaceOrigin == fDesc.fOrigin || kBottomLeft_GrSurfaceOrigin == fDesc.fOrigin); @@ -198,6 +196,7 @@ public: int width() const { return fDesc.fWidth; } int height() const { return fDesc.fHeight; } GrPixelConfig config() const { return fDesc.fConfig; } + bool isMipMapped() const { return fDesc.fIsMipMapped; } class UniqueID { public: @@ -295,7 +294,7 @@ public: // Helper function that creates a temporary SurfaceContext to perform the copy // It always returns a kExact-backed proxy bc it is used when converting an SkSpecialImage - // to an SkImage. + // to an SkImage. The copy is is not a render target and not multisampled. static sk_sp<GrTextureProxy> Copy(GrContext*, GrSurfaceProxy* src, SkIRect srcRect, SkBudgeted); |