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>

diff --git a/tools/gpu/GrContextFactory.cpp b/tools/gpu/GrContextFactory.cpp
index bd745bc..9c124bf 100644 (file)
--- 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 a232112..25ebee9 100644 (file)
--- 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