diff options
author | 2017-05-19 15:45:48 -0400 | |
---|---|---|
committer | 2017-05-21 11:41:17 +0000 | |
commit | d34edf3dc902532f88842f35375c474f94f82d83 (patch) | |
tree | 06a38d69c351e6675467daeafc1439124561cbd0 /include/gpu/GrRenderTarget.h | |
parent | 76149aa5fba375ebedab3d0422e0677e0bb102a7 (diff) |
Revert "Revert "Remove GrSurfaceDesc member from GrSurface.""
This reverts commit 4b30a96a3e96b7f051e25025f4f17f3c54e04153.
Bug: skia:
Change-Id: I14d5b402c87df8fffbc29f16686fcfa18474fc48
Reviewed-on: https://skia-review.googlesource.com/17408
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'include/gpu/GrRenderTarget.h')
-rw-r--r-- | include/gpu/GrRenderTarget.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/gpu/GrRenderTarget.h b/include/gpu/GrRenderTarget.h index fdf6f9cddc..bd25f4fc0e 100644 --- a/include/gpu/GrRenderTarget.h +++ b/include/gpu/GrRenderTarget.h @@ -30,10 +30,10 @@ public: const GrRenderTarget* asRenderTarget() const override { return this; } // GrRenderTarget - bool isStencilBufferMultisampled() const { return fDesc.fSampleCnt > 0; } + bool isStencilBufferMultisampled() const { return fSampleCnt > 0; } GrFSAAType fsaaType() const { - if (!fDesc.fSampleCnt) { + if (!fSampleCnt) { SkASSERT(!(fFlags & Flags::kMixedSampled)); return GrFSAAType::kNone; } @@ -44,13 +44,13 @@ public: /** * Returns the number of samples/pixel in the stencil buffer (Zero if non-MSAA). */ - int numStencilSamples() const { return fDesc.fSampleCnt; } + int numStencilSamples() const { return fSampleCnt; } /** * Returns the number of samples/pixel in the color buffer (Zero if non-MSAA or mixed sampled). */ int numColorSamples() const { - return GrFSAAType::kMixedSamples == this->fsaaType() ? 0 : fDesc.fSampleCnt; + return GrFSAAType::kMixedSamples == this->fsaaType() ? 0 : fSampleCnt; } /** @@ -135,6 +135,7 @@ private: friend class GrRenderTargetPriv; friend class GrRenderTargetProxy; // for Flags + int fSampleCnt; GrStencilAttachment* fStencilAttachment; uint8_t fMultisampleSpecsID; Flags fFlags; |