AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Minor fix to not save the modeling space rect

Browse Source 
BUG=skia:

Review URL: https://codereview.chromium.org/1292543002
This commit is contained in:
joshualitt 2015-08-13 07:12:50 -07:00 committed by Commit bot
parent 2d563030a8
commit 272b748792
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/gpu/batches/GrAAFillRectBatch.cpp
View File

@ -220,9 +220,8 @@ private:
vec[1].scale(SK_ScalarHalf);
// create the rotated rect
fan0Pos->setRectFan(args.fRect.fLeft, args.fRect.fTop,
args.fRect.fRight, args.fRect.fBottom, vertexStride);
args.fViewMatrix.mapPointsWithStride(fan0Pos, vertexStride, 4);
fan0Pos->setRectFan(args.fDevRect.fLeft, args.fDevRect.fTop,
args.fDevRect.fRight, args.fDevRect.fBottom, vertexStride);
// Now create the inset points and then outset the original
// rotated points
@ -329,7 +328,6 @@ class AAFillRectBatchNoLocalMatrixImp {
public:
struct Geometry {
SkMatrix fViewMatrix;
SkRect fRect;
SkRect fDevRect;
GrColor fColor;
};
@ -361,7 +359,6 @@ public:
struct Geometry {
SkMatrix fViewMatrix;
SkMatrix fLocalMatrix;
SkRect fRect;
SkRect fDevRect;
GrColor fColor;
};
@ -410,7 +407,6 @@ GrBatch* Create(GrColor color,
AAFillRectBatchNoLocalMatrix::Geometry& geo = *batch->geometry();
geo.fColor = color;
geo.fViewMatrix = viewMatrix;
geo.fRect = rect;
geo.fDevRect = devRect;
batch->init();
return batch;
@ -426,7 +422,6 @@ GrBatch* Create(GrColor color,
geo.fColor = color;
geo.fViewMatrix = viewMatrix;
geo.fLocalMatrix = localMatrix;
geo.fRect = rect;
geo.fDevRect = devRect;
batch->init();
return batch;
@ -445,7 +440,6 @@ BATCH_TEST_DEFINE(AAFillRectBatch) {
AAFillRectBatchNoLocalMatrix::Geometry& geo = *batch->geometry();
geo.fColor = GrRandomColor(random);
geo.fViewMatrix = GrTest::TestMatrix(random);
geo.fRect = GrTest::TestRect(random);
geo.fDevRect = GrTest::TestRect(random);
batch->init();
return batch;
@ -457,7 +451,6 @@ BATCH_TEST_DEFINE(AAFillRectBatchLocalMatrix) {
geo.fColor = GrRandomColor(random);
geo.fViewMatrix = GrTest::TestMatrix(random);
geo.fLocalMatrix = GrTest::TestMatrix(random);
geo.fRect = GrTest::TestRect(random);
geo.fDevRect = GrTest::TestRect(random);
batch->init();
return batch;