diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-06-13 08:11:36 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-13 13:12:17 +0000 |
| commit | c4f0a8245ccf0d14f6a6dffc73ff56b563012b69 (patch) | |
| tree | a595e5acd034b2d708122dea9a4d046610537c02 /src/gpu/GrRenderTarget.cpp | |
| parent | e8f28818a2c0fe967f9fc4cec4bb9dc78af78212 (diff) | |
Move Flags from GrRenderTarget to GrTypesPriv.h & rename
The motivation for this is to prevent GrRenderTarget.h appearing in GrRenderTargetProxy.h
Change-Id: I4ef126972c0780cbacb35fa2aa6290777c66eddf
Reviewed-on: https://skia-review.googlesource.com/19521
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu/GrRenderTarget.cpp')
| -rw-r--r-- | src/gpu/GrRenderTarget.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gpu/GrRenderTarget.cpp b/src/gpu/GrRenderTarget.cpp index 8b1fde6b46..ae63c23442 100644 --- a/src/gpu/GrRenderTarget.cpp +++ b/src/gpu/GrRenderTarget.cpp @@ -17,7 +17,8 @@ #include "GrStencilAttachment.h" #include "GrStencilSettings.h" -GrRenderTarget::GrRenderTarget(GrGpu* gpu, const GrSurfaceDesc& desc, Flags flags, +GrRenderTarget::GrRenderTarget(GrGpu* gpu, const GrSurfaceDesc& desc, + GrRenderTargetFlags flags, GrStencilAttachment* stencil) : INHERITED(gpu, desc) , fSampleCnt(desc.fSampleCnt) @@ -25,8 +26,9 @@ GrRenderTarget::GrRenderTarget(GrGpu* gpu, const GrSurfaceDesc& desc, Flags flag , fMultisampleSpecsID(0) , fFlags(flags) { SkASSERT(desc.fFlags & kRenderTarget_GrSurfaceFlag); - SkASSERT(!(fFlags & Flags::kMixedSampled) || fSampleCnt > 0); - SkASSERT(!(fFlags & Flags::kWindowRectsSupport) || gpu->caps()->maxWindowRectangles() > 0); + SkASSERT(!(fFlags & GrRenderTargetFlags::kMixedSampled) || fSampleCnt > 0); + SkASSERT(!(fFlags & GrRenderTargetFlags::kWindowRectsSupport) || + gpu->caps()->maxWindowRectangles() > 0); fResolveRect.setLargestInverted(); } |