diff options
| author |  Mike Reed <reed@google.com> | 2017-03-15 17:32:39 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-15 17:32:48 +0000 |
| commit | 9e62df6ecd1000860ad19ab9425579dfb7002ba0 (patch) | |
| tree | 535b75a7d94ce4adaf60620d8b7743624e3d7a3f /gm/vertices.cpp | |
| parent | d1e67e70ae566bd841a2926eb07446ad99c64e59 (diff) | |
Revert "store vertices arrays inline with object"
This reverts commit eaaebb19a17d213355e7a70e0cfabe4ba61929d4.
Reason for revert: may call SkReader32::read(null, 0) -- reader needs to handle this
Original change's description:
> store vertices arrays inline with object
>
> Also unify some of naming (esp. around texCoords)
>
> BUG=skia:6366
>
> Change-Id: I5a6793f029cccf0cd0a2c1d180b259ce4eab526f
> Reviewed-on: https://skia-review.googlesource.com/9705
> Commit-Queue: Mike Reed <reed@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
>
TBR=bsalomon@google.com,reed@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:6366
Change-Id: Ie421654bcd74d74f8be6676291e3d6e16e2a7a16
Reviewed-on: https://skia-review.googlesource.com/9727
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'gm/vertices.cpp')
| -rw-r--r-- | gm/vertices.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gm/vertices.cpp b/gm/vertices.cpp index 0d798270c4..864ac3dc8a 100644 --- a/gm/vertices.cpp +++ b/gm/vertices.cpp @@ -214,8 +214,7 @@ static void draw_batching(SkCanvas* canvas, bool useObject) { // Triangle fans can't batch so we convert to regular triangles, static constexpr int kNumTris = kMeshIndexCnt - 2; SkVertices::Builder builder(SkCanvas::kTriangles_VertexMode, kMeshVertexCnt, 3 * kNumTris, - SkVertices::kHasColors_BuilderFlag | - SkVertices::kHasTexCoords_BuilderFlag); + SkVertices::kHasColors_Flag | SkVertices::kHasTexs_Flag); SkPoint* pts = builder.positions(); SkPoint* texs = builder.texCoords(); |