aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests
diff options
context:
space:
mode:
authorGravatar Brian Salomon <bsalomon@google.com>2017-09-23 08:31:08 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-10-09 13:33:54 +0000
commitc203e65265ccf0dcf426eafa4fae97b2b99cba7d (patch)
tree38e1ce5ef2f7f1cc78fe4dfe604b97cd0ef66860 /tests
parent67ef5d76406d702e7afe4ec5b490a75d9bcaba10 (diff)
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>
Diffstat (limited to 'tests')
-rwxr-xr-xtests/TransferPixelsTest.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/TransferPixelsTest.cpp b/tests/TransferPixelsTest.cpp
index 722707ae9b..b59495f0f5 100755
--- a/tests/TransferPixelsTest.cpp
+++ b/tests/TransferPixelsTest.cpp
@@ -64,6 +64,10 @@ 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;