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/instanced | |
| 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/instanced')
| -rw-r--r-- | src/gpu/instanced/GLInstancedRendering.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gpu/instanced/GLInstancedRendering.cpp b/src/gpu/instanced/GLInstancedRendering.cpp index df51cd827c..bb733c2b81 100644 --- a/src/gpu/instanced/GLInstancedRendering.cpp +++ b/src/gpu/instanced/GLInstancedRendering.cpp @@ -37,7 +37,8 @@ GrCaps::InstancedSupport GLInstancedRendering::CheckSupport(const GrGLCaps& glCa // This method is only intended to be used for initializing fInstancedSupport in the caps. SkASSERT(GrCaps::InstancedSupport::kNone == glCaps.instancedSupport()); if (!glCaps.vertexArrayObjectSupport() || - (!glCaps.drawIndirectSupport() && !glCaps.drawInstancedSupport())) { + (!glCaps.drawIndirectSupport() && !glCaps.drawInstancedSupport()) || + GrGLCaps::kNone_MapBufferType == glCaps.mapBufferType()) { return GrCaps::InstancedSupport::kNone; } return InstanceProcessor::CheckSupport(*glCaps.shaderCaps(), glCaps); |