fix viewmatrix mapping in AAFillRect

src/gpu/batches/GrAAFillRectBatch.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrAAFillRectBatch.h"
 
 #include "GrColor.h"
@@ skipping 202 matching lines @@
               { args.fViewMatrix[SkMatrix::kMScaleX], args.fViewMatrix[SkMatrix::kMSkewY] },
               { args.fViewMatrix[SkMatrix::kMSkewX],  args.fViewMatrix[SkMatrix::kMScaleY] }
             };
 
             vec[0].normalize();
             vec[0].scale(SK_ScalarHalf);
             vec[1].normalize();
             vec[1].scale(SK_ScalarHalf);
 
             // create the rotated rect
-            fan0Pos->setRectFan(args.fDevRect.fLeft, args.fDevRect.fTop,
-                                args.fDevRect.fRight, args.fDevRect.fBottom, vertexStride);
+            fan0Pos->setRectFan(args.fRect.fLeft, args.fRect.fTop,
+                                args.fRect.fRight, args.fRect.fBottom, vertexStride);
+            args.fViewMatrix.mapPointsWithStride(fan0Pos, vertexStride, 4);
 
             // Now create the inset points and then outset the original
             // rotated points
 
             // TL
             *((SkPoint*)((intptr_t)fan1Pos + 0 * vertexStride)) =
                 *((SkPoint*)((intptr_t)fan0Pos + 0 * vertexStride)) + vec[0] + vec[1];
             *((SkPoint*)((intptr_t)fan0Pos + 0 * vertexStride)) -= vec[0] + vec[1];
             // BL
             *((SkPoint*)((intptr_t)fan1Pos + 1 * vertexStride)) =
@@ skipping 86 matching lines @@
     };
 
     BatchTracker fBatch;
     SkSTArray<1, Geometry, true> fGeoData;
 };
 
 class AAFillRectBatchNoLocalMatrixImp {
 public:
     struct Geometry {
         SkMatrix fViewMatrix;
+        SkRect fRect;
         SkRect fDevRect;
         GrColor fColor;
     };
 
     inline static bool CanCombineLocalCoords(const SkMatrix& mine, const SkMatrix& theirs,
                                              bool usesLocalCoords) {
         // We apply the viewmatrix to the rect points on the cpu.  However, if the pipeline uses
         // local coords then we won't be able to batch.  We could actually upload the viewmatrix
         // using vertex attributes in these cases, but haven't investigated that
         return !usesLocalCoords || mine.cheapEqualTo(theirs);
@@ skipping 11 matching lines @@
     }
 
     inline static void FillInAttributes(intptr_t, size_t, SkPoint*, const Geometry&) {}
 };
 
 class AAFillRectBatchLocalMatrixImp {
 public:
     struct Geometry {
         SkMatrix fViewMatrix;
         SkMatrix fLocalMatrix;
+        SkRect fRect;
         SkRect fDevRect;
         GrColor fColor;
     };
 
     inline static bool CanCombineLocalCoords(const SkMatrix& mine, const SkMatrix& theirs,
                                              bool usesLocalCoords) {
         return true;
     }
 
     inline static GrDefaultGeoProcFactory::LocalCoords::Type LocalCoordsType() {
@@ skipping 28 matching lines @@
 namespace GrAAFillRectBatch {
 
 GrDrawBatch* Create(GrColor color,
                     const SkMatrix& viewMatrix,
                     const SkRect& rect,
                     const SkRect& devRect) {
     AAFillRectBatchNoLocalMatrix* batch = AAFillRectBatchNoLocalMatrix::Create();
     AAFillRectBatchNoLocalMatrix::Geometry& geo = *batch->geometry();
     geo.fColor = color;
     geo.fViewMatrix = viewMatrix;
+    geo.fRect = rect;
     geo.fDevRect = devRect;
     batch->init();
     return batch;
 }
 
 GrDrawBatch* Create(GrColor color,
                     const SkMatrix& viewMatrix,
                     const SkMatrix& localMatrix,
                     const SkRect& rect,
                     const SkRect& devRect) {
     AAFillRectBatchLocalMatrix* batch = AAFillRectBatchLocalMatrix::Create();
     AAFillRectBatchLocalMatrix::Geometry& geo = *batch->geometry();
     geo.fColor = color;
     geo.fViewMatrix = viewMatrix;
     geo.fLocalMatrix = localMatrix;
+    geo.fRect = rect;
     geo.fDevRect = devRect;
     batch->init();
     return batch;
 }
 
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef GR_TEST_UTILS
@@ skipping 15 matching lines @@
     AAFillRectBatchLocalMatrix::Geometry& geo = *batch->geometry();
     geo.fColor = GrRandomColor(random);
     geo.fViewMatrix = GrTest::TestMatrix(random);
     geo.fLocalMatrix = GrTest::TestMatrix(random);
     geo.fDevRect = GrTest::TestRect(random);
     batch->init();
     return batch;
 }
 
 #endif