diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-28 17:58:28 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-28 17:58:28 +0000 |
| commit | 972f9cd7a063d0544f8c919fd12b9a3adbd12b24 (patch) | |
| tree | f72b7df8838068916ec1c61ed02db69342d9a21b /src/gpu/GrBufferAllocPool.cpp | |
| parent | 0e9e6a331394721bdc47607733880d4c67b595dd (diff) | |
SK_SUPPORT_LEGACY_GRTYPES to hide duplicate types from SkTypes.h
BUG=skia:
R=bsalomon@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/216503004
git-svn-id: http://skia.googlecode.com/svn/trunk@13982 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/GrBufferAllocPool.cpp')
| -rw-r--r-- | src/gpu/GrBufferAllocPool.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/GrBufferAllocPool.cpp b/src/gpu/GrBufferAllocPool.cpp index b34fe8a8e3..2dbf3eb283 100644 --- a/src/gpu/GrBufferAllocPool.cpp +++ b/src/gpu/GrBufferAllocPool.cpp @@ -28,7 +28,7 @@ GrBufferAllocPool::GrBufferAllocPool(GrGpu* gpu, bool frequentResetHint, size_t blockSize, int preallocBufferCnt) : - fBlocks(GrMax(8, 2*preallocBufferCnt)) { + fBlocks(SkTMax(8, 2*preallocBufferCnt)) { SkASSERT(NULL != gpu); fGpu = gpu; @@ -38,7 +38,7 @@ GrBufferAllocPool::GrBufferAllocPool(GrGpu* gpu, fBufferType = bufferType; fFrequentResetHint = frequentResetHint; fBufferPtr = NULL; - fMinBlockSize = GrMax(GrBufferAllocPool_MIN_BLOCK_SIZE, blockSize); + fMinBlockSize = SkTMax(GrBufferAllocPool_MIN_BLOCK_SIZE, blockSize); fBytesInUse = 0; @@ -258,7 +258,7 @@ void GrBufferAllocPool::putBack(size_t bytes) { bool GrBufferAllocPool::createBlock(size_t requestSize) { - size_t size = GrMax(requestSize, fMinBlockSize); + size_t size = SkTMax(requestSize, fMinBlockSize); SkASSERT(size >= GrBufferAllocPool_MIN_BLOCK_SIZE); VALIDATE(); |