Add support for clipstack to Gr. GrClip is now a list of rects and paths with set operations to combine them. The stencil buffer is used to perform the set operations to put the clip into the stencil buffer. Building Gr's clip from Skia's clipStack is currently disabled due to the fact that Skia's clipStack is relative to the root layer not the current layer. This will be fixed in a subsequent CL.
git-svn-id: http://skia.googlecode.com/svn/trunk@878 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gpu/include/GrPathIter.h b/gpu/include/GrPathIter.h
index 028faaa..140cbcb 100644
--- a/gpu/include/GrPathIter.h
+++ b/gpu/include/GrPathIter.h
@@ -30,7 +30,7 @@
class GrPathIter {
public:
/**
- Returned by next(). Indicates the next piece of the path.
+ Returned by next(). Indicates the next piece of the path.
*/
enum Command {
kMove_Command, //!< next() returns 1 pt
@@ -44,35 +44,35 @@
// Adds a cubic segment
kClose_Command, //!< next() returns 0 pts
kEnd_Command //!< next() returns 0 pts
- // Implictly closes the last
+ // Implictly closes the last
// point
};
-
+
enum ConvexHint {
- kNone_ConvexHint, //<! No hint about convexity
+ kNone_ConvexHint, //<! No hint about convexity
// of the path
kConvex_ConvexHint, //<! Path is one convex piece
- kNonOverlappingConvexPieces_ConvexHint, //<! Multiple convex pieces,
+ kNonOverlappingConvexPieces_ConvexHint, //<! Multiple convex pieces,
// pieces are known to be
// disjoint
- kSameWindingConvexPieces_ConvexHint, //<! Multiple convex pieces,
+ kSameWindingConvexPieces_ConvexHint, //<! Multiple convex pieces,
// may or may not intersect,
- // either all wind cw or all
+ // either all wind cw or all
// wind ccw.
- kConcave_ConvexHint //<! Path is known to be
+ kConcave_ConvexHint //<! Path is known to be
// concave
};
-
+
static int NumCommandPoints(Command cmd) {
static const int numPoints[] = {
1, 2, 3, 4, 0, 0
};
return numPoints[cmd];
}
-
+
virtual ~GrPathIter() {};
- /**
+ /**
Iterates through the path. Should not be called after
kEnd_Command has been returned once. This version retrieves the
points for the command.
@@ -85,14 +85,14 @@
/**
* If the host API has knowledge of the convexity of the path
* it can be communicated by this hint. Ganesh can make these
- * determinations itself. So it is not necessary to compute
+ * determinations itself. So it is not necessary to compute
* convexity status if it isn't already determined.
*
* @return a hint about the convexity of the path.
- */
- virtual ConvexHint hint() const { return kNone_ConvexHint; }
+ */
+ virtual ConvexHint convexHint() const { return kNone_ConvexHint; }
- /**
+ /**
Iterates through the path. Should not be called after
kEnd_Command has been returned once. This version does not retrieve the
points for the command.