commit e994380d00bb03187f17bd705cac6c28fa624fa6
author Brian Salomon <bsalomon@google.com> Fri Jan 03 13:07:07 2020 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jan 03 19:49:07 2020 +0000
tree e80688e1032b9819417b6566245e71bde8907b2a
parent 91b4059e9f62827812f4cb24179342e3fa96cebf

Some GrTypes cleanup.

Remove some unused functions/macros.

Move two functions only used by GrBufferAllocPool there.

We only ever used GrSizeAlignUp with pow 2 alignments. Require that,
rename, move to GrTypesPriv.h (along with GrSizeDivRoundUp).

Change-Id: I1a7248952d1905f16f02de2028d65768b186acee
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/262061
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/GrMemoryPool.cpp

diff --git a/src/gpu/GrMemoryPool.cpp b/src/gpu/GrMemoryPool.cpp
index a474469..b2f627d 100644
--- a/src/gpu/GrMemoryPool.cpp
+++ b/src/gpu/GrMemoryPool.cpp
@@ -20,7 +20,7 @@
 
 std::unique_ptr<GrMemoryPool> GrMemoryPool::Make(size_t preallocSize, size_t minAllocSize) {
     preallocSize = std::max(preallocSize, kMinAllocationSize);
-    static constexpr size_t kPoolSize = GrSizeAlignUp(sizeof(GrMemoryPool), kAlignment);
+    static constexpr size_t kPoolSize = GrAlignTo(sizeof(GrMemoryPool), kAlignment);
     size_t size = kPoolSize + preallocSize;
     void* mem = operator new(size);
     void* preallocStart = static_cast<char*>(mem) + kPoolSize;
@@ -68,7 +68,7 @@
 void* GrMemoryPool::allocate(size_t size) {
     VALIDATE;
     size += kPerAllocPad;
-    size = GrSizeAlignUp(size, kAlignment);
+    size = GrAlignTo(size, kAlignment);
     if (fTail->fFreeSize < size) {
         size_t blockSize = size + kHeaderSize;
         blockSize = std::max(blockSize, fMinAllocSize);
@@ -220,17 +220,15 @@
 
 ////////////////////////////////////////////////////////////////////////////////////////
 
-static constexpr size_t kOpPoolSize =
-        GrSizeAlignUp(sizeof(GrOpMemoryPool), GrMemoryPool::kAlignment);
+static constexpr size_t kOpPoolSize = GrAlignTo(sizeof(GrOpMemoryPool), GrMemoryPool::kAlignment);
 
 GrOpMemoryPool::~GrOpMemoryPool() { this->pool()->~GrMemoryPool(); }
 
 std::unique_ptr<GrOpMemoryPool> GrOpMemoryPool::Make(size_t preallocSize, size_t minAllocSize) {
     preallocSize = std::max(preallocSize, GrMemoryPool::kMinAllocationSize);
     static constexpr size_t kOpPoolSize =
-            GrSizeAlignUp(sizeof(GrOpMemoryPool), GrMemoryPool::kAlignment);
-    static constexpr size_t kPoolSize =
-            GrSizeAlignUp(sizeof(GrMemoryPool), GrMemoryPool::kAlignment);
+            GrAlignTo(sizeof(GrOpMemoryPool), GrMemoryPool::kAlignment);
+    static constexpr size_t kPoolSize = GrAlignTo(sizeof(GrMemoryPool), GrMemoryPool::kAlignment);
     size_t size = kOpPoolSize + kPoolSize + preallocSize;
     void* mem = operator new(size);
     void* memPoolPtr = static_cast<char*>(mem) + kOpPoolSize;