| commit | 9e38047c56f8dff4440fe00002264be692440902 | [log] [tgz] |
|---|---|---|
| author | Robert Phillips <robertphillips@google.com> | Fri Oct 28 12:15:03 2016 -0400 |
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | Mon Oct 31 18:27:01 2016 +0000 |
| tree | 828f65cd030f410a73707352aca6769184a855fa | |
| parent | 0186661e85737ac2f4805f876c8d2d4157126f68 [diff] [blame] |
Add GrNextSizePow2 GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4069 BUG=skia:5882 Change-Id: Ib9af5918716be594c3c07239eca179dbb4eb8566 Reviewed-on: https://skia-review.googlesource.com/4069 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
diff --git a/src/gpu/GrResourceProvider.cpp b/src/gpu/GrResourceProvider.cpp index 9739b05..a6958e5 100644 --- a/src/gpu/GrResourceProvider.cpp +++ b/src/gpu/GrResourceProvider.cpp
@@ -109,8 +109,8 @@ } // bin by pow2 with a reasonable min - static const uint32_t MIN_SIZE = 1 << 12; - size_t allocSize = SkTMax(MIN_SIZE, GrNextPow2(SkToUInt(size))); + static const size_t MIN_SIZE = 1 << 12; + size_t allocSize = SkTMax(MIN_SIZE, GrNextSizePow2(size)); GrScratchKey key; GrBuffer::ComputeScratchKeyForDynamicVBO(allocSize, intendedType, &key);