diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-05-19 15:45:48 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-21 11:41:17 +0000 |
| commit | d34edf3dc902532f88842f35375c474f94f82d83 (patch) | |
| tree | 06a38d69c351e6675467daeafc1439124561cbd0 /src/gpu/GrRenderTarget.cpp | |
| 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 'src/gpu/GrRenderTarget.cpp')
| -rw-r--r-- | src/gpu/GrRenderTarget.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/gpu/GrRenderTarget.cpp b/src/gpu/GrRenderTarget.cpp index 61a6f92f22..8b1fde6b46 100644 --- a/src/gpu/GrRenderTarget.cpp +++ b/src/gpu/GrRenderTarget.cpp @@ -19,11 +19,13 @@ GrRenderTarget::GrRenderTarget(GrGpu* gpu, const GrSurfaceDesc& desc, Flags flags, GrStencilAttachment* stencil) - : INHERITED(gpu, desc) - , fStencilAttachment(stencil) - , fMultisampleSpecsID(0) - , fFlags(flags) { - SkASSERT(!(fFlags & Flags::kMixedSampled) || fDesc.fSampleCnt > 0); + : INHERITED(gpu, desc) + , fSampleCnt(desc.fSampleCnt) + , fStencilAttachment(stencil) + , fMultisampleSpecsID(0) + , fFlags(flags) { + SkASSERT(desc.fFlags & kRenderTarget_GrSurfaceFlag); + SkASSERT(!(fFlags & Flags::kMixedSampled) || fSampleCnt > 0); SkASSERT(!(fFlags & Flags::kWindowRectsSupport) || gpu->caps()->maxWindowRectangles() > 0); fResolveRect.setLargestInverted(); } |