diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-02-28 15:05:52 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-28 15:06:07 +0000 |
| commit | 2411c1112e7b3cb0126143e4c0a731aff7876dce (patch) | |
| tree | 5a99fa6e95b84291556e2e99b40ccc6790f42393 /src/gpu/GrBufferAllocPool.cpp | |
| parent | e30cf80c8893db8ec61d29322f1992591dad3b6b (diff) | |
Revert "Allow GrSurfaceProxy-derived classes to use flags when instantiating"
This reverts commit c8f1e3a5c08d58657dddccdeedbe5d6e8c16d891.
Reason for revert: check on ANGLE failure
Original change's description:
> Allow GrSurfaceProxy-derived classes to use flags when instantiating
>
> In some instances proxies must be created that, when instantiated, have no pending IO.
>
> This is split out of: (Add per-Flush callback to GrDrawingManager)
>
> https://skia-review.googlesource.com/c/8679/
>
> Change-Id: I68b5504d35ad436a4ae737ac4bb3c171fc9a5826
> Reviewed-on: https://skia-review.googlesource.com/8988
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Robert Phillips <robertphillips@google.com>
>
TBR=bsalomon@google.com,robertphillips@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I157417c443028b2148ee355ce69c946a96bb9407
Reviewed-on: https://skia-review.googlesource.com/9066
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu/GrBufferAllocPool.cpp')
| -rw-r--r-- | src/gpu/GrBufferAllocPool.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/GrBufferAllocPool.cpp b/src/gpu/GrBufferAllocPool.cpp index 38bde0dc9a..e3f30b0c1c 100644 --- a/src/gpu/GrBufferAllocPool.cpp +++ b/src/gpu/GrBufferAllocPool.cpp @@ -334,7 +334,7 @@ void* GrVertexBufferAllocPool::makeSpace(size_t vertexSize, SkASSERT(buffer); SkASSERT(startVertex); - size_t offset SK_INIT_TO_AVOID_WARNING; + size_t offset = 0; // assign to suppress warning void* ptr = INHERITED::makeSpace(vertexSize * vertexCount, vertexSize, buffer, @@ -359,7 +359,7 @@ void* GrIndexBufferAllocPool::makeSpace(int indexCount, SkASSERT(buffer); SkASSERT(startIndex); - size_t offset SK_INIT_TO_AVOID_WARNING; + size_t offset = 0; // assign to suppress warning void* ptr = INHERITED::makeSpace(indexCount * sizeof(uint16_t), sizeof(uint16_t), buffer, |