diff options
author | Brian Osman <brianosman@google.com> | 2017-08-10 13:29:30 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-08-10 17:47:26 +0000 |
commit | 80488229ea6e37da9c85ffdb640b99fff3b11f2f (patch) | |
tree | df9ebf720ef3a73bf5ccf9760a6de6f15f5f438a /src/gpu/gl | |
parent | f7332d3238f3d9486aa47fa7635f9451d5c33b2c (diff) |
Revert "Revert "Support single line objects and arrays""
This reverts commit a5a69cfb480b99747ddc272149d35c6302abf1bf.
Bug: skia:
Change-Id: I08475d96255b9df13e5c86e1ef9c7f4739e51459
Reviewed-on: https://skia-review.googlesource.com/33202
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src/gpu/gl')
-rw-r--r-- | src/gpu/gl/GrGLCaps.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index b90eefb19a..6e7a94972a 100644 --- a/src/gpu/gl/GrGLCaps.cpp +++ b/src/gpu/gl/GrGLCaps.cpp @@ -1258,7 +1258,7 @@ void GrGLCaps::onDumpJSON(SkJSONWriter* writer) const { writer->beginArray("Stencil Formats"); for (int i = 0; i < fStencilFormats.count(); ++i) { - writer->beginObject(); + writer->beginObject(nullptr, false); writer->appendS32("stencil bits", fStencilFormats[i].fStencilBits); writer->appendS32("total bits", fStencilFormats[i].fTotalBits); writer->endObject(); @@ -1339,7 +1339,7 @@ void GrGLCaps::onDumpJSON(SkJSONWriter* writer) const { writer->beginArray("configs"); for (int i = 0; i < kGrPixelConfigCnt; ++i) { - writer->beginObject(); + writer->beginObject(nullptr, false); writer->appendHexU32("flags", fConfigTable[i].fFlags); writer->appendHexU32("b_internal", fConfigTable[i].fFormats.fBaseInternalFormat); writer->appendHexU32("s_internal", fConfigTable[i].fFormats.fSizedInternalFormat); |