From 7f56d3d2d865a9fed44c420bd3b9497118b7ed26 Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Mon, 9 Oct 2017 13:02:49 -0400 Subject: 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 Commit-Queue: Brian Salomon --- src/gpu/gl/GrGLCaps.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/gpu/gl/GrGLCaps.cpp') 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 -- cgit v1.2.3