commit 1171d314efc7e131b039c94126d26575cfb9e70c
author Brian Salomon <bsalomon@google.com> Thu Mar 19 08:47:44 2020 -0400
committer Brian Salomon <bsalomon@google.com> Thu Mar 19 13:10:59 2020 +0000
tree 6eeb94328d5aab4be2a15d108859ee86cdca8218
parent 6cafe73da93195b458eddce5b01c6db99e8be448

Revert "Revert "Revert "Don't build GL on Metal, Vulkan, Dawn, Direct3D bots"""

This reverts commit fb27c9a25fb585c2f397e79267872d82b5339227.

Revert "Remove MoltenVK support"

Reason: TSAN Vulkan bots hanging.

This reverts commit 6cafe73da93195b458eddce5b01c6db99e8be448.

Change-Id: I8ec9db35c112f3c8da8636dab2065e6f18de7d0b
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/277936
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

samplecode/SampleCCPRGeometry.cpp

diff --git a/samplecode/SampleCCPRGeometry.cpp b/samplecode/SampleCCPRGeometry.cpp
index 3b4c499..9b150e2 100644
--- a/samplecode/SampleCCPRGeometry.cpp
+++ b/samplecode/SampleCCPRGeometry.cpp
@@ -16,7 +16,6 @@
 #include "src/core/SkRectPriv.h"
 #include "src/gpu/GrClip.h"
 #include "src/gpu/GrContextPriv.h"
-#include "src/gpu/GrGpu.h"
 #include "src/gpu/GrMemoryPool.h"
 #include "src/gpu/GrRenderTargetContext.h"
 #include "src/gpu/GrRenderTargetContextPriv.h"
@@ -27,13 +26,10 @@
 #include "src/gpu/ccpr/GrGSCoverageProcessor.h"
 #include "src/gpu/ccpr/GrVSCoverageProcessor.h"
 #include "src/gpu/geometry/GrPathUtils.h"
+#include "src/gpu/gl/GrGLGpu.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/ops/GrDrawOp.h"
 
-#ifdef SK_GL
-#include "src/gpu/gl/GrGLGpu.h"
-#endif
-
 using TriPointInstance = GrCCCoverageProcessor::TriPointInstance;
 using QuadPointInstance = GrCCCoverageProcessor::QuadPointInstance;
 using PrimitiveType = GrCCCoverageProcessor::PrimitiveType;
@@ -333,7 +329,6 @@
                                                       const SkRect& chainBounds) {
     GrResourceProvider* rp = state->resourceProvider();
     GrContext* context = state->gpu()->getContext();
-#ifdef SK_GL
     GrGLGpu* glGpu = GrBackendApi::kOpenGL == context->backend()
                              ? static_cast<GrGLGpu*>(state->gpu())
                              : nullptr;
@@ -342,7 +337,6 @@
         // GR_GL_CALL(glGpu->glInterface(), PolygonMode(GR_GL_FRONT_AND_BACK, GR_GL_LINE));
         GR_GL_CALL(glGpu->glInterface(), Enable(GR_GL_LINE_SMOOTH));
     }
-#endif
 
     GrPipeline pipeline(GrScissorTest::kDisabled, SkBlendMode::kPlus,
                         state->drawOpArgs().outputSwizzle());
@@ -405,11 +399,9 @@
         stroker.drawStrokes(state, proc.get(), batchID, ibounds);
     }
 
-#ifdef SK_GL
     if (glGpu) {
         context->resetContext(kMisc_GrGLBackendState);
     }
-#endif
 }
 
 class CCPRGeometryView::Click : public Sample::Click {