diff options
| author |  Greg Daniel <egdaniel@google.com> | 2017-05-18 18:13:40 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-18 18:13:48 +0000 |
| commit | 4b30a96a3e96b7f051e25025f4f17f3c54e04153 (patch) | |
| tree | 72e0561a19df0db0ca111ee58e4730b2068adb28 /src/gpu/GrRenderTarget.cpp | |
| parent | 14d54c207d7a175d14d34f5527af7cbfd579f4d5 (diff) | |
Revert "Remove GrSurfaceDesc member from GrSurface."
This reverts commit 84911546b9535a2fff6c5e07f588f175d5a04f45.
Reason for revert: Breaking bots possibly?
Original change's description:
> Remove GrSurfaceDesc member from GrSurface.
>
> Change-Id: I0fe979994e1e3fc457b952dfb5e0090c45fad771
> Reviewed-on: https://skia-review.googlesource.com/17273
> Commit-Queue: Brian Salomon <bsalomon@google.com>
> Reviewed-by: Robert Phillips <robertphillips@google.com>
>
TBR=bsalomon@google.com,robertphillips@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I404e509fcd3e3d5527b3bc6e286b7d436c12e879
Reviewed-on: https://skia-review.googlesource.com/17364
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'src/gpu/GrRenderTarget.cpp')
| -rw-r--r-- | src/gpu/GrRenderTarget.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/gpu/GrRenderTarget.cpp b/src/gpu/GrRenderTarget.cpp index 8b1fde6b46..61a6f92f22 100644 --- a/src/gpu/GrRenderTarget.cpp +++ b/src/gpu/GrRenderTarget.cpp @@ -19,13 +19,11 @@ GrRenderTarget::GrRenderTarget(GrGpu* gpu, const GrSurfaceDesc& desc, Flags flags, GrStencilAttachment* stencil) - : INHERITED(gpu, desc) - , fSampleCnt(desc.fSampleCnt) - , fStencilAttachment(stencil) - , fMultisampleSpecsID(0) - , fFlags(flags) { - SkASSERT(desc.fFlags & kRenderTarget_GrSurfaceFlag); - SkASSERT(!(fFlags & Flags::kMixedSampled) || fSampleCnt > 0); + : INHERITED(gpu, desc) + , fStencilAttachment(stencil) + , fMultisampleSpecsID(0) + , fFlags(flags) { + SkASSERT(!(fFlags & Flags::kMixedSampled) || fDesc.fSampleCnt > 0); SkASSERT(!(fFlags & Flags::kWindowRectsSupport) || gpu->caps()->maxWindowRectangles() > 0); fResolveRect.setLargestInverted(); } |