diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-10-09 13:02:49 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-09 20:24:04 +0000 |
| commit | 7f56d3d2d865a9fed44c420bd3b9497118b7ed26 (patch) | |
| tree | d8f5f15eb65e087d153a783cbfd10cb23939aab6 /src/gpu/gl | |
| parent | c795a4c8862dbab914561fadf7a3567c55362ae4 (diff) | |
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>
Diffstat (limited to 'src/gpu/gl')
| -rw-r--r-- | src/gpu/gl/GrGLCaps.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index af04dc7771..94c5f2e184 100644 --- a/src/gpu/gl/GrGLCaps.cpp +++ b/src/gpu/gl/GrGLCaps.cpp @@ -481,6 +481,14 @@ void GrGLCaps::init(const GrContextOptions& contextOptions, } } +#if defined(__has_feature) +#if defined(SK_BUILD_FOR_MAC) && __has_feature(thread_sanitizer) + // See skbug.com/7058 + fMapBufferType = kNone_MapBufferType; + fMapBufferFlags = kNone_MapFlags; +#endif +#endif + // We found that the Galaxy J5 with an Adreno 306 running 6.0.1 has a bug where // GL_INVALID_OPERATION thrown by glDrawArrays when using a buffer that was mapped. The same bug // did not reproduce on a Nexus7 2013 with a 320 running Android M with driver 127.0. It's |