Revert "Revert "Add API for flushing surfaces with gpu semaphores""

This reverts commit 7292231905c34ed290ba479338f26b56ae2a7792.

This change relands the original plus the follow on change:
https://skia-review.googlesource.com/20059.

Additionally it adds a blacklist for the mac intel bots which
don't see to respect the added fences on the GPU.

Original change's description:
> Revert "Add API for flushing surfaces with gpu semaphores"
> 
> This reverts commit 66366c697853e906d961ae691e2bc5209cdcfa62.
> 
> Reason for revert: Failing test on mac bots
> 
> Original change's description:
> > Add API for flushing surfaces with gpu semaphores
> > 
> > BUG=skia:
> > 
> > Change-Id: Ia4bfef784cd5f2516ceccafce958be18a86f91d1
> > Reviewed-on: https://skia-review.googlesource.com/11488
> > Commit-Queue: Greg Daniel <egdaniel@google.com>
> > Reviewed-by: Brian Salomon <bsalomon@google.com>
> > Reviewed-by: Forrest Reiling <freiling@google.com>
> 
> TBR=egdaniel@google.com,jvanverth@google.com,bsalomon@google.com,brianosman@google.com,freiling@google.com
> 
> Change-Id: I75633a2732d2d48b1926f9ad818a9f1a9196d211
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:
> Reviewed-on: https://skia-review.googlesource.com/20063
> Commit-Queue: Greg Daniel <egdaniel@google.com>
> Reviewed-by: Greg Daniel <egdaniel@google.com>

TBR=egdaniel@google.com,jvanverth@google.com,bsalomon@google.com,brianosman@google.com,freiling@google.com

Change-Id: I4dc6c0e1deb0398eeb165a34f0a26af7a58259f1
Reviewed-on: https://skia-review.googlesource.com/20141
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

1 files changed, 1 insertions, 31 deletions

diff --git a/dm/DM.cpp b/dm/DM.cpp
index d92b5ae3ce..58ccb1f4e8 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -1432,36 +1432,6 @@ bool IsRenderingGLContextType(sk_gpu_test::GrContextFactory::ContextType type) {
 bool IsNullGLContextType(sk_gpu_test::GrContextFactory::ContextType type) {
     return type == GrContextFactory::kNullGL_ContextType;
 }
-const char* ContextTypeName(GrContextFactory::ContextType contextType) {
-    switch (contextType) {
-        case GrContextFactory::kGL_ContextType:
-            return "OpenGL";
-        case GrContextFactory::kGLES_ContextType:
-            return "OpenGLES";
-        case GrContextFactory::kANGLE_D3D9_ES2_ContextType:
-            return "ANGLE D3D9 ES2";
-        case GrContextFactory::kANGLE_D3D11_ES2_ContextType:
-            return "ANGLE D3D11 ES2";
-        case GrContextFactory::kANGLE_D3D11_ES3_ContextType:
-            return "ANGLE D3D11 ES3";
-        case GrContextFactory::kANGLE_GL_ES2_ContextType:
-            return "ANGLE GL ES2";
-        case GrContextFactory::kANGLE_GL_ES3_ContextType:
-            return "ANGLE GL ES3";
-        case GrContextFactory::kCommandBuffer_ContextType:
-            return "Command Buffer";
-        case GrContextFactory::kMESA_ContextType:
-            return "Mesa";
-        case GrContextFactory::kNullGL_ContextType:
-            return "Null GL";
-        case GrContextFactory::kDebugGL_ContextType:
-            return "Debug GL";
-        case GrContextFactory::kVulkan_ContextType:
-            return "Vulkan";
-    }
-    SkDEBUGFAIL("Unreachable");
-    return "Unknown";
-}
 #else
 bool IsGLContextType(int) { return false; }
 bool IsVulkanContextType(int) { return false; }
@@ -1494,7 +1464,7 @@ void RunWithGPUTestContexts(GrContextTestFn* test, GrContextTypeFilterFn* contex
         if (contextTypeFilter && !(*contextTypeFilter)(contextType)) {
             continue;
         }
-        ReporterContext ctx(reporter, SkString(ContextTypeName(contextType)));
+        ReporterContext ctx(reporter, SkString(GrContextFactory::ContextTypeName(contextType)));
         if (ctxInfo.grContext()) {
             (*test)(reporter, ctxInfo);
         }