diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-07-11 08:52:13 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-11 13:39:21 +0000 |
| commit | 815486c42f1ca66c81e12d8ccc9fb142e3c10544 (patch) | |
| tree | 56a3b7633ac476463c5f185e614e1e94e9685ffa /src/gpu/ops/GrLatticeOp.h | |
| parent | 8e8c755f56e5dbaf0f87d88a775632010b32e974 (diff) | |
Convert NonAALatticeOp to non-legacy GrMeshDrawOp.
Also adds a test factory and fixes a bug in the lattice iter validator where it compared each div value against the start rather than the previous div.
Bug: skia:
Change-Id: I30e9ddfcbaab7829a2f646ad851f99d1e518ab4a
Reviewed-on: https://skia-review.googlesource.com/21871
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/ops/GrLatticeOp.h')
| -rw-r--r-- | src/gpu/ops/GrLatticeOp.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gpu/ops/GrLatticeOp.h b/src/gpu/ops/GrLatticeOp.h index 65aa622894..cce8f322d8 100644 --- a/src/gpu/ops/GrLatticeOp.h +++ b/src/gpu/ops/GrLatticeOp.h @@ -8,19 +8,19 @@ #ifndef GLatticeOp_DEFINED #define GLatticeOp_DEFINED -#include "GrColor.h" -#include "SkRefCnt.h" +#include <memory> +#include "GrTypes.h" -class GrLegacyMeshDrawOp; +class GrDrawOp; +class GrPaint; class SkLatticeIter; class SkMatrix; struct SkRect; namespace GrLatticeOp { -std::unique_ptr<GrLegacyMeshDrawOp> MakeNonAA(GrColor color, const SkMatrix& viewMatrix, - int imageWidth, int imageHeight, - std::unique_ptr<SkLatticeIter> iter, - const SkRect& dst); +std::unique_ptr<GrDrawOp> MakeNonAA(GrPaint&& paint, const SkMatrix& viewMatrix, int imageWidth, + int imageHeight, std::unique_ptr<SkLatticeIter> iter, + const SkRect& dst); }; #endif |