Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(364)

Side by Side Diff: src/gpu/batches/GrMSAAPathRenderer.cpp

Issue 2136643002: Revert of Add choke point for modifying non-AA rect draws (e.g., applying clipping) (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/gpu/batches/GrDefaultPathRenderer.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2016 Google Inc. 2 * Copyright 2016 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "GrMSAAPathRenderer.h" 8 #include "GrMSAAPathRenderer.h"
9 9
10 #include "GrAuditTrail.h" 10 #include "GrAuditTrail.h"
(...skipping 640 matching lines...) Expand 10 before | Expand all | Expand 10 after
651 } 651 }
652 } else { 652 } else {
653 bounds = path.getBounds(); 653 bounds = path.getBounds();
654 } 654 }
655 const SkMatrix& viewM = (reverse && viewMatrix.hasPerspective()) ? S kMatrix::I() : 655 const SkMatrix& viewM = (reverse && viewMatrix.hasPerspective()) ? S kMatrix::I() :
656 v iewMatrix; 656 v iewMatrix;
657 SkAutoTUnref<GrDrawBatch> batch( 657 SkAutoTUnref<GrDrawBatch> batch(
658 GrRectBatchFactory::CreateNonAAFill(paint.getColor(), viewM, bounds, nullptr, 658 GrRectBatchFactory::CreateNonAAFill(paint.getColor(), viewM, bounds, nullptr,
659 &localMatrix)); 659 &localMatrix));
660 660
661 SkASSERT(GrPipelineBuilder::kBoth_DrawFace == drawFace[p]);
662 GrPipelineBuilder pipelineBuilder(paint, drawContext->mustUseHWAA(pa int)); 661 GrPipelineBuilder pipelineBuilder(paint, drawContext->mustUseHWAA(pa int));
663 pipelineBuilder.setDrawFace(drawFace[p]); 662 pipelineBuilder.setDrawFace(drawFace[p]);
664 if (passes[p]) { 663 if (passes[p]) {
665 pipelineBuilder.setUserStencil(passes[p]); 664 pipelineBuilder.setUserStencil(passes[p]);
666 } else { 665 } else {
667 pipelineBuilder.setUserStencil(userStencilSettings); 666 pipelineBuilder.setUserStencil(userStencilSettings);
668 } 667 }
669 668
670 drawContext->drawBatch(pipelineBuilder, clip, batch); 669 drawContext->drawBatch(pipelineBuilder, clip, batch);
671 } else { 670 } else {
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
726 725
727 GrPaint paint; 726 GrPaint paint;
728 paint.setXPFactory(GrDisableColorXPFactory::Make()); 727 paint.setXPFactory(GrDisableColorXPFactory::Make());
729 paint.setAntiAlias(args.fIsAA); 728 paint.setAntiAlias(args.fIsAA);
730 729
731 this->internalDrawPath(args.fDrawContext, paint, &GrUserStencilSettings::kUn used, *args.fClip, 730 this->internalDrawPath(args.fDrawContext, paint, &GrUserStencilSettings::kUn used, *args.fClip,
732 *args.fViewMatrix, *args.fShape, true); 731 *args.fViewMatrix, *args.fShape, true);
733 } 732 }
734 733
735 //////////////////////////////////////////////////////////////////////////////// /////////////////// 734 //////////////////////////////////////////////////////////////////////////////// ///////////////////
OLDNEW
« no previous file with comments | « src/gpu/batches/GrDefaultPathRenderer.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698