add origin to device
used for interpreting the clipstack when a device is a layer
git-svn-id: http://skia.googlecode.com/svn/trunk@894 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gpu/src/GrClip.cpp b/gpu/src/GrClip.cpp
index 924c01b..5ba991b 100644
--- a/gpu/src/GrClip.cpp
+++ b/gpu/src/GrClip.cpp
@@ -38,9 +38,10 @@
this->setFromRect(rect);
}
-GrClip::GrClip(GrClipIterator* iter, const GrRect* bounds)
+GrClip::GrClip(GrClipIterator* iter, GrScalar tx, GrScalar ty,
+ const GrRect* bounds)
: fList(fListMemory, kPreAllocElements) {
- this->setFromIterator(iter, bounds);
+ this->setFromIterator(iter, tx, ty, bounds);
}
GrClip::~GrClip() {}
@@ -86,7 +87,8 @@
}
}
-void GrClip::setFromIterator(GrClipIterator* iter, const GrRect* bounds) {
+void GrClip::setFromIterator(GrClipIterator* iter, GrScalar tx, GrScalar ty,
+ const GrRect* bounds) {
fList.reset();
int rectCount = 0;
@@ -104,6 +106,9 @@
switch (e.fType) {
case kRect_ClipType:
iter->getRect(&e.fRect);
+ if (tx || ty) {
+ e.fRect.offset(tx, ty);
+ }
++rectCount;
if (isectRectValid) {
if (1 == rectCount || kIntersect_SetOp == e.fOp) {
@@ -122,6 +127,9 @@
break;
case kPath_ClipType:
e.fPath.resetFromIter(iter->getPathIter());
+ if (tx || ty) {
+ e.fPath.offset(tx, ty);
+ }
e.fPathFill = iter->getPathFill();
isectRectValid = false;
break;
diff --git a/gpu/src/GrPath.cpp b/gpu/src/GrPath.cpp
index fc53ac2..019b2fd 100644
--- a/gpu/src/GrPath.cpp
+++ b/gpu/src/GrPath.cpp
@@ -84,12 +84,27 @@
///////////////////////////////////////////////////////////////////////////////
+void GrPath::offset(GrScalar tx, GrScalar ty) {
+ if (!tx && !ty) {
+ return; // nothing to do
+ }
+
+ GrPoint* iter = fPts.begin();
+ GrPoint* stop = fPts.end();
+ while (iter < stop) {
+ iter->offset(tx, ty);
+ ++iter;
+ }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
static bool check_two_vecs(const GrVec& prevVec,
const GrVec& currVec,
GrScalar turnDir,
int* xDir,
int* yDir,
- int* flipX,
+ int* flipX,
int* flipY) {
if (currVec.fX * *xDir < 0) {
++*flipX;
@@ -214,9 +229,9 @@
vec.setBetween(previousPt, pts[consumed]);
if (vec.fX || vec.fY) {
if (subPathPts >= 2) {
- if (0 == turnDir) {
+ if (0 == turnDir) {
firstVec = previousVec;
- init_from_two_vecs(firstVec, vec,
+ init_from_two_vecs(firstVec, vec,
&turnDir, &xDir, &yDir);
// here we aren't checking whether the x/y dirs
// change between the first and second edge. It
@@ -236,14 +251,14 @@
}
++consumed;
}
- if (subPathPts > 2 && (kClose_PathCmd == cmd ||
+ if (subPathPts > 2 && (kClose_PathCmd == cmd ||
(!subPathClosed && kEnd_PathCmd == cmd ))) {
// if an additional vector is needed to close the loop check
// that it validates against the previous vector.
GrVec vec;
vec.setBetween(previousPt, firstPt);
if (vec.fX || vec.fY) {
- if (!check_two_vecs(previousVec, vec, turnDir,
+ if (!check_two_vecs(previousVec, vec, turnDir,
&xDir, &yDir, &flipX, &flipY)) {
fConvexHint = kConcave_ConvexHint;
break;
@@ -251,7 +266,7 @@
previousVec = vec;
}
// check that closing vector validates against the first vector.
- if (!check_two_vecs(previousVec, firstVec, turnDir,
+ if (!check_two_vecs(previousVec, firstVec, turnDir,
&xDir, &yDir, &flipX, &flipY)) {
fConvexHint = kConcave_ConvexHint;
break;
@@ -309,7 +324,7 @@
testIter.reset(triRight);
testPath.resetFromIter(&testIter);
GrAssert(kConvex_ConvexHint == testPath.getConvexHint());
-
+
GrPath square;
square.moveTo(0, 0);
square.lineTo(1, 0);
@@ -335,7 +350,7 @@
square.lineTo(0, 1);
square.lineTo(0, 1);
square.close();
-
+
testIter.reset(redundantSquare);
testPath.resetFromIter(&testIter);
GrAssert(kConvex_ConvexHint == testPath.getConvexHint());
@@ -354,7 +369,7 @@
bowTie.lineTo(0, 1);
bowTie.lineTo(0, 1);
bowTie.close();
-
+
testIter.reset(bowTie);
testPath.resetFromIter(&testIter);
GrAssert(kConcave_ConvexHint == testPath.getConvexHint());