diff options
| author |  Greg Daniel <egdaniel@google.com> | 2017-01-24 13:13:30 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-24 18:57:36 +0000 |
| commit | bfd97c59350c112ad85301eb6ff6005ae4fd9e8c (patch) | |
| tree | 393b3df755b72da3680bcaaa4df299dc556484e1 /tools | |
| parent | cf3525a95eea54d00727392463a6fe648914c3ea (diff) | |
Remove sentinal GLContext used in early days of Vulkan in our tools
I've ran this through multiple variations of dm and nanobench on Linux
and no longer see any crash/hangs. I forget what the original repo case
for the bug was, but I'm at least not seeing it now with updated drivers.
BUG=skia:
Change-Id: I6b7129a4c4d67938baa35d2e2c720cb078fc4c18
Reviewed-on: https://skia-review.googlesource.com/7441
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/gpu/GrContextFactory.cpp | 9 | ||||
| -rw-r--r-- | tools/gpu/GrContextFactory.h | 1 |
2 files changed, 0 insertions, 10 deletions
diff --git a/tools/gpu/GrContextFactory.cpp b/tools/gpu/GrContextFactory.cpp index bd745bcfcd..9c124bffa2 100644 --- a/tools/gpu/GrContextFactory.cpp +++ b/tools/gpu/GrContextFactory.cpp @@ -191,15 +191,6 @@ ContextInfo GrContextFactory::getContextInfo(ContextType type, ContextOptions op return ContextInfo(); } - // There is some bug (either in Skia or the NV Vulkan driver) where VkDevice - // destruction will hang occaisonally. For some reason having an existing GL - // context fixes this. - if (!fSentinelGLContext) { - fSentinelGLContext.reset(CreatePlatformGLTestContext(kGL_GrGLStandard)); - if (!fSentinelGLContext) { - fSentinelGLContext.reset(CreatePlatformGLTestContext(kGLES_GrGLStandard)); - } - } backendContext = testCtx->backendContext(); break; #endif diff --git a/tools/gpu/GrContextFactory.h b/tools/gpu/GrContextFactory.h index a232112d75..25ebee90e0 100644 --- a/tools/gpu/GrContextFactory.h +++ b/tools/gpu/GrContextFactory.h @@ -163,7 +163,6 @@ private: bool fAbandoned; }; SkTArray<Context, true> fContexts; - std::unique_ptr<GLTestContext> fSentinelGLContext; const GrContextOptions fGlobalOptions; }; } // namespace sk_gpu_test |