Remove command buffer sample app support.

This hasn't compiled for months. We are deemphasizing SampleApp in favor of viewer. Windowed command buffer is not currently something we currently plan to maintain.

TBR=reed@google.com

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2061233002

Review-Url: https://codereview.chromium.org/2061233002

7 files changed, 1 insertions, 124 deletions

diff --git a/include/views/SkOSWindow_Mac.h b/include/views/SkOSWindow_Mac.h
index 4558a58833..41766a0f53 100644
--- a/include/views/SkOSWindow_Mac.h
+++ b/include/views/SkOSWindow_Mac.h
@@ -27,9 +27,6 @@ public:
 #if SK_ANGLE
         kANGLE_BackEndType,
 #endif // SK_ANGLE
-#if SK_COMMAND_BUFFER
-        kCommandBuffer_BackEndType,
-#endif // SK_COMMAND_BUFFER
     };
 
     void    release();
diff --git a/include/views/SkOSWindow_SDL.h b/include/views/SkOSWindow_SDL.h
index 1ab51ca415..65685d1d21 100644
--- a/include/views/SkOSWindow_SDL.h
+++ b/include/views/SkOSWindow_SDL.h
@@ -23,9 +23,6 @@ public:
 #if SK_ANGLE
         kANGLE_BackEndType,
 #endif // SK_ANGLE
-#if SK_COMMAND_BUFFER
-        kCommandBuffer_BackEndType,
-#endif // SK_COMMAND_BUFFER
     };
 
     void release();
diff --git a/include/views/SkOSWindow_Unix.h b/include/views/SkOSWindow_Unix.h
index 2e1b9ccc81..9d1b8e0392 100644
--- a/include/views/SkOSWindow_Unix.h
+++ b/include/views/SkOSWindow_Unix.h
@@ -39,9 +39,6 @@ public:
 #if SK_ANGLE
         kANGLE_BackEndType,
 #endif // SK_ANGLE
-#if SK_COMMAND_BUFFER
-        kCommandBuffer_BackEndType,
-#endif // SK_COMMAND_BUFFER
     };
 
     bool attach(SkBackEndTypes attachType, int msaaSampleCount, bool deepColor, AttachmentInfo*);
diff --git a/include/views/SkOSWindow_Win.h b/include/views/SkOSWindow_Win.h
index 8d5378108e..7ed22a6514 100644
--- a/include/views/SkOSWindow_Win.h
+++ b/include/views/SkOSWindow_Win.h
@@ -18,10 +18,6 @@
 #include "EGL/egl.h"
 #endif
 
-#if SK_COMMAND_BUFFER
-class SkCommandBufferGLContext;
-#endif
-
 class SkOSWindow : public SkWindow {
 public:
     struct WindowInit {
@@ -41,9 +37,6 @@ public:
 #if SK_ANGLE
         kANGLE_BackEndType,
 #endif // SK_ANGLE
-#if SK_COMMAND_BUFFER
-        kCommandBuffer_BackEndType,
-#endif // SK_COMMAND_BUFFER
 #endif // SK_SUPPORT_GPU
     };
 
@@ -104,9 +97,6 @@ private:
     EGLConfig                         fConfig;
     SkAutoTUnref<const GrGLInterface> fANGLEInterface;
 #endif // SK_ANGLE
-#if SK_COMMAND_BUFFER
-    SkCommandBufferGLContext* fCommandBuffer;
-#endif // SK_COMMAND_BUFFER
 #endif // SK_SUPPORT_GPU
 
     bool                fFullscreen;
@@ -137,11 +127,6 @@ private:
     void presentANGLE();
 #endif // SK_ANGLE
 
-#if SK_COMMAND_BUFFER
-    bool attachCommandBuffer(int msaaSampleCount, AttachmentInfo* info);
-    void detachCommandBuffer();
-    void presentCommandBuffer();
-#endif // SK_COMMAND_BUFFER
 #endif // SK_SUPPORT_GPU
 
     typedef SkWindow INHERITED;
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index e4362c5a36..971044cf87 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -92,9 +92,7 @@ public:
 };
 #endif  // SAMPLE_PDF_FILE_VIEWER
 
-#if SK_COMMAND_BUFFER
-#define DEFAULT_TO_COMMAND_BUFFER 1
-#elif SK_ANGLE
+#if SK_ANGLE
 //#define DEFAULT_TO_ANGLE 1
 #else
 #define DEFAULT_TO_GPU 0 // if 1 default rendering is on GPU
@@ -211,12 +209,6 @@ public:
                 fBackend = kANGLE_BackEndType;
                 break;
 #endif // SK_ANGLE
-#if SK_COMMAND_BUFFER
-            case kCommandBuffer_DeviceType:
-                // Command buffer is really the only other odd man out :D
-                fBackend = kCommandBuffer_BackEndType;
-                break;
-#endif // SK_COMMAND_BUFFER
             default:
                 SkASSERT(false);
                 break;
@@ -245,11 +237,6 @@ public:
                 glInterface.reset(sk_gpu_test::CreateANGLEGLInterface());
                 break;
 #endif // SK_ANGLE
-#if SK_COMMAND_BUFFER
-            case kCommandBuffer_DeviceType:
-                glInterface.reset(GrGLCreateCommandBufferInterface());
-                break;
-#endif // SK_COMMAND_BUFFER
             default:
                 SkASSERT(false);
                 break;
@@ -744,9 +731,6 @@ static inline SampleWindow::DeviceType cycle_devicetype(SampleWindow::DeviceType
 #if SK_ANGLE
         , SampleWindow::kANGLE_DeviceType
 #endif // SK_ANGLE
-#if SK_COMMAND_BUFFER
-        , SampleWindow::kCommandBuffer_DeviceType
-#endif // SK_COMMAND_BUFFER
 #endif // SK_SUPPORT_GPU
     };
     static_assert(SK_ARRAY_COUNT(gCT) == SampleWindow::kDeviceTypeCnt, "array_size_mismatch");
@@ -913,9 +897,6 @@ SampleWindow::SampleWindow(void* hwnd, int argc, char** argv, DeviceManager* dev
 #if SK_ANGLE && DEFAULT_TO_ANGLE
     fDeviceType = kANGLE_DeviceType;
 #endif
-#if SK_COMMAND_BUFFER && DEFAULT_TO_COMMAND_BUFFER
-    fDeviceType = kCommandBuffer_DeviceType;
-#endif
 
     fUseClip = false;
     fUsePicture = false;
@@ -964,9 +945,6 @@ SampleWindow::SampleWindow(void* hwnd, int argc, char** argv, DeviceManager* dev
 #if SK_ANGLE
                                   "ANGLE",
 #endif
-#if SK_COMMAND_BUFFER
-                                  "Command Buffer",
-#endif
                                   nullptr);
     fAppMenu->assignKeyEquivalentToItem(itemID, 'd');
     itemID = fAppMenu->appendTriState("AA", "AA", sinkID, fAAState);
@@ -2100,9 +2078,6 @@ static const char* gDeviceTypePrefix[] = {
 #if SK_ANGLE
     "angle: ",
 #endif // SK_ANGLE
-#if SK_COMMAND_BUFFER
-    "command buffer: ",
-#endif // SK_COMMAND_BUFFER
 #endif // SK_SUPPORT_GPU
 };
 static_assert(SK_ARRAY_COUNT(gDeviceTypePrefix) == SampleWindow::kDeviceTypeCnt,
diff --git a/samplecode/SampleApp.h b/samplecode/SampleApp.h
index 7734ac93d9..371133b9a2 100644
--- a/samplecode/SampleApp.h
+++ b/samplecode/SampleApp.h
@@ -38,9 +38,6 @@ public:
 #if SK_ANGLE
         kANGLE_DeviceType,
 #endif // SK_ANGLE
-#if SK_COMMAND_BUFFER
-        kCommandBuffer_DeviceType,
-#endif // SK_COMMAND_BUFFER
 #endif // SK_SUPPORT_GPU
         kDeviceTypeCnt
     };
@@ -52,9 +49,6 @@ public:
     #if SK_ANGLE
             case kANGLE_DeviceType:
     #endif // SK_ANGLE
-    #if SK_COMMAND_BUFFER
-            case kCommandBuffer_DeviceType:
-    #endif // SK_COMMAND_BUFFER
                 return true;
             default:
                 return false;
diff --git a/src/views/win/SkOSWindow_win.cpp b/src/views/win/SkOSWindow_win.cpp
index c93d60b2d6..983b253c53 100644
--- a/src/views/win/SkOSWindow_win.cpp
+++ b/src/views/win/SkOSWindow_win.cpp
@@ -29,10 +29,6 @@
 #include <EGL/eglext.h>
 #endif // SK_ANGLE
 
-#if SK_COMMAND_BUFFER
-#include "gl/command_buffer/SkCommandBufferGLContext.h"
-#endif // SK_COMMAND_BUFFER
-
 const int kDefaultWindowWidth = 500;
 const int kDefaultWindowHeight = 500;
 
@@ -64,9 +60,6 @@ SkOSWindow::SkOSWindow(const void* winInit) {
     fContext = EGL_NO_CONTEXT;
     fSurface = EGL_NO_SURFACE;
 #endif
-#if SK_COMMAND_BUFFER
-    fCommandBuffer = nullptr;
-#endif // SK_COMMAND_BUFFER
 
     fHGLRC = NULL;
 #endif
@@ -95,10 +88,6 @@ SkOSWindow::~SkOSWindow() {
         fDisplay = EGL_NO_DISPLAY;
     }
 #endif // SK_ANGLE
-#if SK_COMMAND_BUFFER
-    delete fCommandBuffer;
-#endif // SK_COMMAND_BUFFER
-
 #endif // SK_SUPPORT_GPU
     this->closeWindow();
 }
@@ -610,48 +599,6 @@ void SkOSWindow::presentANGLE() {
 }
 #endif // SK_ANGLE
 
-#if SK_COMMAND_BUFFER
-
-bool SkOSWindow::attachCommandBuffer(int msaaSampleCount, AttachmentInfo* info) {
-    if (!fCommandBuffer) {
-        fCommandBuffer = SkCommandBufferGLContext::Create((HWND)fHWND, msaaSampleCount);
-        if (!fCommandBuffer)
-            return false;
-
-        SkAutoTUnref<const GrGLInterface> intf(GrGLCreateCommandBufferInterface());
-        if (intf) {
-            GL_CALL(intf, ClearStencil(0));
-            GL_CALL(intf, ClearColor(0, 0, 0, 0));
-            GL_CALL(intf, StencilMask(0xffffffff));
-            GL_CALL(intf, Clear(GL_STENCIL_BUFFER_BIT |GL_COLOR_BUFFER_BIT));
-        }
-    }
-
-    if (fCommandBuffer->makeCurrent()) {
-        info->fStencilBits = fCommandBuffer->getStencilBits();
-        info->fSampleCount = fCommandBuffer->getSampleCount();
-
-        SkAutoTUnref<const GrGLInterface> intf(GrGLCreateCommandBufferInterface());
-
-        if (intf ) {
-            GL_CALL(intf, Viewport(0, 0, SkScalarRoundToInt(this->width()),
-                                         SkScalarRoundToInt(this->height())));
-        }
-        return true;
-    }
-    return false;
-}
-
-void SkOSWindow::detachCommandBuffer() {
-    delete fCommandBuffer;
-    fCommandBuffer = nullptr;
-}
-
-void SkOSWindow::presentCommandBuffer() {
-    fCommandBuffer->presentCommandBuffer();
-}
-#endif // SK_COMMAND_BUFFER
-
 #endif // SK_SUPPORT_GPU
 
 // return true on success
@@ -677,11 +624,6 @@ bool SkOSWindow::attach(SkBackEndTypes attachType, int msaaSampleCount, bool dee
         result = attachANGLE(msaaSampleCount, info);
         break;
 #endif // SK_ANGLE
-#if SK_COMMAND_BUFFER
-    case kCommandBuffer_BackEndType:
-        result = attachCommandBuffer(msaaSampleCount, info);
-        break;
-#endif // SK_COMMAND_BUFFER
 #endif // SK_SUPPORT_GPU
     default:
         SkASSERT(false);
@@ -710,11 +652,6 @@ void SkOSWindow::release() {
         detachANGLE();
         break;
 #endif // SK_ANGLE
-#if SK_COMMAND_BUFFER
-    case kCommandBuffer_BackEndType:
-        detachCommandBuffer();
-        break;
-#endif // SK_COMMAND_BUFFER
 #endif // SK_SUPPORT_GPU
     default:
         SkASSERT(false);
@@ -737,11 +674,6 @@ void SkOSWindow::present() {
         presentANGLE();
         break;
 #endif // SK_ANGLE
-#if SK_COMMAND_BUFFER
-    case kCommandBuffer_BackEndType:
-        presentCommandBuffer();
-        break;
-#endif // SK_COMMAND_BUFFER
 #endif // SK_SUPPORT_GPU
     default:
         SkASSERT(false);