| Index: src/gpu/GrPipeline.cpp
|
| diff --git a/src/gpu/GrPipeline.cpp b/src/gpu/GrPipeline.cpp
|
| index e3c48649805dfff9409a0392414ae30e845caa10..d8e2e5d98ef28c3e81bc2ce81f4b14359df0edb4 100644
|
| --- a/src/gpu/GrPipeline.cpp
|
| +++ b/src/gpu/GrPipeline.cpp
|
| @@ -46,7 +46,7 @@ GrPipeline* GrPipeline::CreateAt(void* memory, const CreateArgs& args,
|
|
|
| GrXferProcessor::OptFlags optFlags = GrXferProcessor::kNone_OptFlags;
|
|
|
| - const GrXferProcessor* xpForOpts = xferProcessor ? xferProcessor.get() :
|
| + const GrXferProcessor* xpForOpts = xferProcessor ? xferProcessor.get() :
|
| &GrPorterDuffXPFactory::SimpleSrcOverXP();
|
| optFlags = xpForOpts->getOptimizations(args.fOpts,
|
| builder.getStencil().doesWrite(),
|
| @@ -92,8 +92,8 @@ GrPipeline* GrPipeline::CreateAt(void* memory, const CreateArgs& args,
|
| // information.
|
| int firstCoverageProcessorIdx = 0;
|
|
|
| - pipeline->adjustProgramFromOptimizations(builder, optFlags, args.fOpts.fColorPOI,
|
| - args.fOpts.fCoveragePOI, &firstColorProcessorIdx,
|
| + pipeline->adjustProgramFromOptimizations(builder, optFlags, args.fOpts.fColorPOI,
|
| + args.fOpts.fCoveragePOI, &firstColorProcessorIdx,
|
| &firstCoverageProcessorIdx);
|
|
|
| bool usesLocalCoords = false;
|
| @@ -134,7 +134,7 @@ GrPipeline* GrPipeline::CreateAt(void* memory, const CreateArgs& args,
|
| overrides->fFlags |= GrXPOverridesForBatch::kReadsLocalCoords_Flag;
|
| }
|
| if (SkToBool(optFlags & GrXferProcessor::kCanTweakAlphaForCoverage_OptFlag)) {
|
| - overrides->fFlags |= GrXPOverridesForBatch::kCanTweakAlphaForCoverage_Flag;
|
| + overrides->fFlags |= GrXPOverridesForBatch::kCanTweakAlphaForCoverage_Flag;
|
| }
|
|
|
| GrXPFactory::InvariantBlendedColor blendedColor;
|
| @@ -144,7 +144,7 @@ GrPipeline* GrPipeline::CreateAt(void* memory, const CreateArgs& args,
|
| GrPorterDuffXPFactory::SrcOverInvariantBlendedColor(args.fOpts.fColorPOI.color(),
|
| args.fOpts.fColorPOI.validFlags(),
|
| args.fOpts.fColorPOI.isOpaque(),
|
| - &blendedColor);
|
| + &blendedColor);
|
| }
|
| if (blendedColor.fWillBlendWithDst) {
|
| overrides->fFlags |= GrXPOverridesForBatch::kWillColorBlendWithDst_Flag;
|
| @@ -174,7 +174,7 @@ void GrPipeline::addDependenciesTo(GrRenderTarget* rt) const {
|
| const GrXferProcessor& xfer = this->getXferProcessor();
|
|
|
| for (int i = 0; i < xfer.numTextures(); ++i) {
|
| - GrTexture* texture = xfer.textureAccess(i).getTexture();
|
| + GrTexture* texture = xfer.textureAccess(i).getTexture();
|
| SkASSERT(rt->getLastDrawTarget());
|
| rt->getLastDrawTarget()->addDependency(texture);
|
| }
|
| @@ -228,4 +228,3 @@ bool GrPipeline::AreEqual(const GrPipeline& a, const GrPipeline& b,
|
| }
|
| return true;
|
| }
|
| -
|
|
|