diff options
author | 2018-06-13 15:01:39 -0400 | |
---|---|---|
committer | 2018-06-14 14:10:47 +0000 | |
commit | e1bc7de7c07686b28b00b850e44e0722189f3592 (patch) | |
tree | 827ddab1abd7f6df76287bdab1ed65ccf6801e36 /src/gpu/ops | |
parent | b6b5b7a8082eddc6b198817ab0ea7d9c9f5dd4e4 (diff) |
Remove SK_MaxSizeT, SK_M{in|ax}U{16|32}, #defines.
sed 's/SK_MaxSizeT/SIZE_MAX/g'
sed 's/SK_MaxU32/UINT32_MAX/g'
sed 's/SK_MaxU16/UINT16_MAX/g'
SK_MinU32 and SK_MinU16 were unused
Change-Id: I6b6c824df47b05bde7e73b13a58e851a5f63fe0e
Reviewed-on: https://skia-review.googlesource.com/134607
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'src/gpu/ops')
-rw-r--r-- | src/gpu/ops/GrDrawVerticesOp.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/ops/GrDrawVerticesOp.cpp b/src/gpu/ops/GrDrawVerticesOp.cpp index b35fee08a3..55d97f6866 100644 --- a/src/gpu/ops/GrDrawVerticesOp.cpp +++ b/src/gpu/ops/GrDrawVerticesOp.cpp @@ -276,7 +276,7 @@ bool GrDrawVerticesOp::onCombineIfPossible(GrOp* t, const GrCaps& caps) { return false; } - if (fVertexCount + that->fVertexCount > SK_MaxU16) { + if (fVertexCount + that->fVertexCount > UINT16_MAX) { return false; } @@ -366,7 +366,7 @@ static void randomize_params(size_t count, size_t maxVertex, SkScalar min, SkSca colors->push_back(GrRandomColor(random)); } if (hasIndices) { - SkASSERT(maxVertex <= SK_MaxU16); + SkASSERT(maxVertex <= UINT16_MAX); indices->push_back(random->nextULessThan((uint16_t)maxVertex)); } } |