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

Side by Side Diff: src/gpu/GrStencilAndCoverPathRenderer.cpp

Issue 269903002: Revert of fix the error that path is inversed for stroke and strokeAndFill styles (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 7 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/core/SkStroke.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 /* 2 /*
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 Google Inc.
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 9
10 #include "GrStencilAndCoverPathRenderer.h" 10 #include "GrStencilAndCoverPathRenderer.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 GrDrawTarget* target, 64 GrDrawTarget* target,
65 bool antiAlias) { 65 bool antiAlias) {
66 SkASSERT(!antiAlias); 66 SkASSERT(!antiAlias);
67 SkASSERT(!stroke.isHairlineStyle()); 67 SkASSERT(!stroke.isHairlineStyle());
68 68
69 GrDrawState* drawState = target->drawState(); 69 GrDrawState* drawState = target->drawState();
70 SkASSERT(drawState->getStencil().isDisabled()); 70 SkASSERT(drawState->getStencil().isDisabled());
71 71
72 SkAutoTUnref<GrPath> p(fGpu->getContext()->createPath(path, stroke)); 72 SkAutoTUnref<GrPath> p(fGpu->getContext()->createPath(path, stroke));
73 73
74 if (path.isInverseFillType() && SkStrokeRec::kFill_Style == stroke.getStyle( )) { 74 if (path.isInverseFillType()) {
75 GR_STATIC_CONST_SAME_STENCIL(kInvertedStencilPass, 75 GR_STATIC_CONST_SAME_STENCIL(kInvertedStencilPass,
76 kZero_StencilOp, 76 kZero_StencilOp,
77 kZero_StencilOp, 77 kZero_StencilOp,
78 // We know our rect will hit pixels outside the clip and the user bi ts will be 0 78 // We know our rect will hit pixels outside the clip and the user bi ts will be 0
79 // outside the clip. So we can't just fill where the user bits are 0 . We also need to 79 // outside the clip. So we can't just fill where the user bits are 0 . We also need to
80 // check that the clip bit is set. 80 // check that the clip bit is set.
81 kEqualIfInClip_StencilFunc, 81 kEqualIfInClip_StencilFunc,
82 0xffff, 82 0xffff,
83 0x0000, 83 0x0000,
84 0xffff); 84 0xffff);
85 85
86 *drawState->stencil() = kInvertedStencilPass; 86 *drawState->stencil() = kInvertedStencilPass;
87 } else { 87 } else {
88 GR_STATIC_CONST_SAME_STENCIL(kStencilPass, 88 GR_STATIC_CONST_SAME_STENCIL(kStencilPass,
89 kZero_StencilOp, 89 kZero_StencilOp,
90 kZero_StencilOp, 90 kZero_StencilOp,
91 kNotEqual_StencilFunc, 91 kNotEqual_StencilFunc,
92 0xffff, 92 0xffff,
93 0x0000, 93 0x0000,
94 0xffff); 94 0xffff);
95 95
96 *drawState->stencil() = kStencilPass; 96 *drawState->stencil() = kStencilPass;
97 } 97 }
98 98
99 target->drawPath(p, path.getFillType()); 99 target->drawPath(p, path.getFillType());
100 100
101 target->drawState()->stencil()->setDisabled(); 101 target->drawState()->stencil()->setDisabled();
102 return true; 102 return true;
103 } 103 }
OLDNEW
« no previous file with comments | « src/core/SkStroke.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698