aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/GrBufferAllocPool.h
diff options
context:
space:
mode:
authorGravatar bsalomon <bsalomon@google.com>2015-08-19 08:26:51 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-08-19 08:26:51 -0700
commit7dea7b7df14f327f4af32a83af52ee695b4ab1e0 (patch)
tree86e0480d8269be4a77b9df3a9e25680585397515 /src/gpu/GrBufferAllocPool.h
parent93ab254b7e4ce82074e88e219a8e32b31086ca86 (diff)
Use calloc to allocate data that will be uploaded to vertex/index buffers in Chrome
BUG=chromium:454267 BUG=chromium:522315 Review URL: https://codereview.chromium.org/1300123002
Diffstat (limited to 'src/gpu/GrBufferAllocPool.h')
-rw-r--r--src/gpu/GrBufferAllocPool.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/GrBufferAllocPool.h b/src/gpu/GrBufferAllocPool.h
index bbcb8a5d7c..a3d8e45364 100644
--- a/src/gpu/GrBufferAllocPool.h
+++ b/src/gpu/GrBufferAllocPool.h
@@ -107,10 +107,10 @@ private:
void destroyBlock();
void deleteBlocks();
void flushCpuData(const BufferBlock& block, size_t flushSize);
+ void* resetCpuData(size_t newSize);
#ifdef SK_DEBUG
void validate(bool unusedBlockAllowed = false) const;
#endif
-
size_t fBytesInUse;
GrGpu* fGpu;
@@ -118,7 +118,7 @@ private:
BufferType fBufferType;
SkTArray<BufferBlock> fBlocks;
- SkAutoMalloc fCpuData;
+ void* fCpuData;
void* fBufferPtr;
size_t fGeometryBufferMapThreshold;
};