aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar bsalomon <bsalomon@google.com>2016-06-14 09:43:52 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-06-14 09:43:52 -0700
commit4999616c3af3ddd38b4d12213eeeaeabee4907c5 (patch)
tree74e086690d49ec3b92f3f4e3beaf83d27d37823e /src
parentbb9c4e411db3d8bdc9e853caf6ed2b45d90f02ff (diff)
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
Diffstat (limited to 'src')
-rw-r--r--src/views/win/SkOSWindow_win.cpp68
1 files changed, 0 insertions, 68 deletions
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);