diff options
| author |  robertphillips <robertphillips@google.com> | 2016-05-28 08:51:06 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-05-28 08:51:06 -0700 |
| commit | 40ff8ed522d05a18a9ae92b2df96080677aed212 (patch) | |
| tree | 191565509662f219712b9ca7ce707946f18984e7 /src/gpu/GrPipelineBuilder.cpp | |
| parent | 97205a4b419e0b7b1864db1945c4098c01874bbc (diff) | |
Change parameters to GrPipelineBuilder's ctor
This is just plumbing prep to remove the GrRenderTarget from the GrPipelineBuilder.
Split out of: https://codereview.chromium.org/1988923002/ (Declassify GrClipMaskManager and Remove GrRenderTarget and GrDrawTarget from GrPipelineBuilder)
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2015333002
Review-Url: https://codereview.chromium.org/2015333002
Diffstat (limited to 'src/gpu/GrPipelineBuilder.cpp')
| -rw-r--r-- | src/gpu/GrPipelineBuilder.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/gpu/GrPipelineBuilder.cpp b/src/gpu/GrPipelineBuilder.cpp index fd97e58ab8..04967a780b 100644 --- a/src/gpu/GrPipelineBuilder.cpp +++ b/src/gpu/GrPipelineBuilder.cpp @@ -16,13 +16,13 @@ #include "effects/GrPorterDuffXferProcessor.h" GrPipelineBuilder::GrPipelineBuilder() - : fFlags(0x0), - fUserStencilSettings(&GrUserStencilSettings::kUnused), - fDrawFace(kBoth_DrawFace) { + : fFlags(0x0) + , fUserStencilSettings(&GrUserStencilSettings::kUnused) + , fDrawFace(kBoth_DrawFace) { SkDEBUGCODE(fBlockEffectRemovalCnt = 0;) } -GrPipelineBuilder::GrPipelineBuilder(const GrPaint& paint, GrRenderTarget* rt) +GrPipelineBuilder::GrPipelineBuilder(const GrPaint& paint, bool targetHasUnifiedMultisampling) : GrPipelineBuilder() { SkDEBUGCODE(fBlockEffectRemovalCnt = 0;) @@ -36,10 +36,8 @@ GrPipelineBuilder::GrPipelineBuilder(const GrPaint& paint, GrRenderTarget* rt) fXPFactory.reset(SkSafeRef(paint.getXPFactory())); - this->setRenderTarget(rt); - this->setState(GrPipelineBuilder::kHWAntialias_Flag, - rt->isUnifiedMultisampled() && paint.isAntiAlias()); + targetHasUnifiedMultisampling && paint.isAntiAlias()); this->setState(GrPipelineBuilder::kDisableOutputConversionToSRGB_Flag, paint.getDisableOutputConversionToSRGB()); this->setState(GrPipelineBuilder::kAllowSRGBInputs_Flag, |