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 /include/gpu/SkNativeGLContext.h | |
| 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 'include/gpu/SkNativeGLContext.h')
| -rw-r--r-- | include/gpu/SkNativeGLContext.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/include/gpu/SkNativeGLContext.h b/include/gpu/SkNativeGLContext.h index f2037cfb79..512e66a3ab 100644 --- a/include/gpu/SkNativeGLContext.h +++ b/include/gpu/SkNativeGLContext.h @@ -28,24 +28,6 @@ public: virtual void makeCurrent() const SK_OVERRIDE; - class AutoContextRestore { - public: - AutoContextRestore(); - ~AutoContextRestore(); - - private: - #if defined(SK_BUILD_FOR_MAC) - AGLContext fOldAGLContext; - #elif defined(SK_BUILD_FOR_UNIX) - GLXContext fOldGLXContext; - Display* fOldDisplay; - GLXDrawable fOldDrawable; - #elif defined(SK_BUILD_FOR_WIN32) - HDC fOldHDC; - HGLRC fOldHGLRC; - #endif - }; - protected: virtual const GrGLInterface* createGLContext() SK_OVERRIDE; void destroyGLContext() SK_OVERRIDE; |