aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/VerticesTest.cpp
diff options
context:
space:
mode:
authorGravatar Mike Reed <reed@google.com>2017-03-15 18:35:07 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-03-15 18:35:18 +0000
commit7d9f9e30204ee8a380443b868e4cc281319a2051 (patch)
tree6aa2a27cec7dcbc13c5be57604bfe509bf81c104 /tests/VerticesTest.cpp
parenta4c41b3e83bc684b3535d36590519d6fb676742d (diff)
Revert[2] "store vertices arrays inline with object""
This reverts commit 9e62df6ecd1000860ad19ab9425579dfb7002ba0. Reason for revert: behavior in reader32 fixed Fix is here: https://skia-review.googlesource.com/c/9729/ Original change's description: > 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> > TBR=bsalomon@google.com,reviews@skia.org,reed@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia:6366 Change-Id: I1f12108fff8f551d66455cfadd6d5dd9412e9aa8 Reviewed-on: https://skia-review.googlesource.com/9760 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'tests/VerticesTest.cpp')
-rw-r--r--tests/VerticesTest.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/VerticesTest.cpp b/tests/VerticesTest.cpp
index 8cf55142f3..9621d80cd0 100644
--- a/tests/VerticesTest.cpp
+++ b/tests/VerticesTest.cpp
@@ -53,8 +53,8 @@ DEF_TEST(Vertices, reporter) {
int vCount = 4;
int iCount = 6;
- const uint32_t texFlags[] = { 0, SkVertices::kHasTexs_Flag };
- const uint32_t colFlags[] = { 0, SkVertices::kHasColors_Flag };
+ const uint32_t texFlags[] = { 0, SkVertices::kHasTexCoords_BuilderFlag };
+ const uint32_t colFlags[] = { 0, SkVertices::kHasColors_BuilderFlag };
for (auto texF : texFlags) {
for (auto colF : colFlags) {
uint32_t flags = texF | colF;