diff options
author | Brian Salomon <bsalomon@google.com> | 2017-10-09 15:18:31 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-09 15:18:45 +0000 |
commit | 4e7cdd5a0052aa76bed6f80ec325be19e09e6ab1 (patch) | |
tree | 4fbe9b12470af000124c1d310dafe21a817c3758 /tests/TransferPixelsTest.cpp | |
parent | c5eb97dd8875accf2b5db5343dace78d0d4c6f79 (diff) |
Revert "Disable GL buffer mapping on TSAN/Mac."
This reverts commit c203e65265ccf0dcf426eafa4fae97b2b99cba7d.
Reason for revert: <INSERT REASONING HERE>
Original change's description:
> Disable GL buffer mapping on TSAN/Mac.
>
> Also reverts 65e706379657d64371012c2e95ccf1354d741145 which disabled buffer mapping in GrResourceProvider::createPatternedIndexBuffer.
>
> Bug: skia:7058
> Change-Id: I6816abe53251e1cd8e92eae41b8cdbe45218a341
> Reviewed-on: https://skia-review.googlesource.com/50100
> Reviewed-by: Robert Phillips <robertphillips@google.com>
> Commit-Queue: Brian Salomon <bsalomon@google.com>
TBR=mtklein@google.com,bsalomon@google.com,robertphillips@google.com
Change-Id: Icf0cf40ba4d6e7081971eee2eea0a41033790df7
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:7058
Reviewed-on: https://skia-review.googlesource.com/57220
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'tests/TransferPixelsTest.cpp')
-rwxr-xr-x | tests/TransferPixelsTest.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/TransferPixelsTest.cpp b/tests/TransferPixelsTest.cpp index b59495f0f5..722707ae9b 100755 --- a/tests/TransferPixelsTest.cpp +++ b/tests/TransferPixelsTest.cpp @@ -64,10 +64,6 @@ bool does_full_buffer_contain_correct_values(GrColor* srcBuffer, void basic_transfer_test(skiatest::Reporter* reporter, GrContext* context, GrPixelConfig config, GrSurfaceOrigin origin, bool renderTarget) { - if (GrCaps::kNone_MapFlags == context->caps()->mapBufferFlags()) { - return; - } - // set up the data const int kTextureWidth = 16; const int kTextureHeight = 16; |