diff options
| author |  Brian Salomon <bsalomon@google.com> | 2018-02-02 20:32:49 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-03 01:59:59 +0000 |
| commit | bdecacfbe47bc7211336bb847bb33c00ef85ea3e (patch) | |
| tree | fdaac47f9254d9a8e3de61604b899eae8cb718ff /include/private | |
| parent | 816acee9be62d9de323ff5144017451e443b3329 (diff) | |
Revert "Revert "Revert "Revert "Revert "Revert "Redefine the meaning of sample counts in GPU backend.""""""
This reverts commit 3a2cc2c2ec124de36d2544b2a523ef1dd317ca32.
Fix code with samplecnt=0 that slipped in between trybots/CQ and landing of previous version
Change-Id: Iab19f2e8d1e9901601c8c76244d7a88c5d707fab
Reviewed-on: https://skia-review.googlesource.com/103181
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'include/private')
| -rw-r--r-- | include/private/GrRenderTargetProxy.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/private/GrRenderTargetProxy.h b/include/private/GrRenderTargetProxy.h index 1cd3d5d1a2..efe282318f 100644 --- a/include/private/GrRenderTargetProxy.h +++ b/include/private/GrRenderTargetProxy.h @@ -26,7 +26,7 @@ public: bool instantiate(GrResourceProvider*) override; GrFSAAType fsaaType() const { - if (!fSampleCnt) { + if (fSampleCnt <= 1) { SkASSERT(!(fRenderTargetFlags & GrRenderTargetFlags::kMixedSampled)); return GrFSAAType::kNone; } @@ -42,15 +42,15 @@ public: bool needsStencil() const { return fNeedsStencil; } /** - * Returns the number of samples/pixel in the stencil buffer (Zero if non-MSAA). + * Returns the number of samples/pixel in the stencil buffer (One if non-MSAA). */ int numStencilSamples() const { return fSampleCnt; } /** - * Returns the number of samples/pixel in the color buffer (Zero if non-MSAA or mixed sampled). + * Returns the number of samples/pixel in the color buffer (One if non-MSAA or mixed sampled). */ int numColorSamples() const { - return GrFSAAType::kMixedSamples == this->fsaaType() ? 0 : fSampleCnt; + return GrFSAAType::kMixedSamples == this->fsaaType() ? 1 : fSampleCnt; } int maxWindowRectangles(const GrCaps& caps) const; |