diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-10-20 21:54:46 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-10-20 21:54:46 +0000 |
| commit | d92780b5586c27401454bb81a1e7e77018cc79f3 (patch) | |
| tree | e5cccf6d8dfdd2e427e42ac204de419635dd471f /src/gpu/win/SkNativeGLContext_win.cpp | |
| parent | d47fafe05743d61958397bcf7a4b2bf66d778e1d (diff) | |
Temporary revert of r2510. The test that it introduced fails on the Mac build bots. I suspect there is something wrong with the Mac bot machine's GL that is preventing context creation from succeeding. The OpenGL Driver monitor on the machine only shows a software rasterizer. aglChoosePixelFormat seems to fail regardless of input. It may just need a reboot. I'll investigate it more on Monday.
git-svn-id: http://skia.googlecode.com/svn/trunk@2511 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/win/SkNativeGLContext_win.cpp')
| -rw-r--r-- | src/gpu/win/SkNativeGLContext_win.cpp | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/gpu/win/SkNativeGLContext_win.cpp b/src/gpu/win/SkNativeGLContext_win.cpp index 5d518dd138..c19f7cca45 100644 --- a/src/gpu/win/SkNativeGLContext_win.cpp +++ b/src/gpu/win/SkNativeGLContext_win.cpp @@ -11,23 +11,12 @@ #define WIN32_LEAN_AND_MEAN #include <Windows.h> -SkNativeGLContext::AutoContextRestore::AutoContextRestore() { - fOldHGLRC = wglGetCurrentContext(); - fOldHDC = wglGetCurrentDC(); -} - -SkNativeGLContext::AutoContextRestore::~AutoContextRestore() { - wglMakeCurrent(fOldHDC, fOldHGLRC); -} - -/////////////////////////////////////////////////////////////////////////////// - ATOM SkNativeGLContext::gWC = 0; SkNativeGLContext::SkNativeGLContext() - : fWindow(NULL) - , fDeviceContext(NULL) - , fGlRenderContext(0) { + : fWindow(NULL) + , fDeviceContext(NULL) + , fGlRenderContext(0) { } SkNativeGLContext::~SkNativeGLContext() { |