commit 7f56d3d2d865a9fed44c420bd3b9497118b7ed26
author Brian Salomon <bsalomon@google.com> Mon Oct 09 13:02:49 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Oct 09 20:24:04 2017 +0000
tree d8f5f15eb65e087d153a783cbfd10cb23939aab6
parent c795a4c8862dbab914561fadf7a3567c55362ae4

Revert "Revert "Disable GL buffer mapping on TSAN/Mac.""

This reverts commit 4e7cdd5a0052aa76bed6f80ec325be19e09e6ab1.

Bug: skia:7058
Change-Id: I3b92c35835cf7a8c04e9218194bf293b790413e0
Reviewed-on: https://skia-review.googlesource.com/57222
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

tests/TransferPixelsTest.cpp

diff --git a/tests/TransferPixelsTest.cpp b/tests/TransferPixelsTest.cpp
index 722707a..b59495f 100755
--- a/tests/TransferPixelsTest.cpp
+++ b/tests/TransferPixelsTest.cpp
@@ -64,6 +64,10 @@
 
 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;