diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/gpu/GrGLInterface.h | 9 | ||||
-rw-r--r-- | include/gpu/SkGLContext.h | 3 | ||||
-rw-r--r-- | include/gpu/SkMesaGLContext.h | 19 | ||||
-rw-r--r-- | include/gpu/SkNativeGLContext.h | 18 |
4 files changed, 2 insertions, 47 deletions
diff --git a/include/gpu/GrGLInterface.h b/include/gpu/GrGLInterface.h index 20b74ab21a..b3e0cf191b 100644 --- a/include/gpu/GrGLInterface.h +++ b/include/gpu/GrGLInterface.h @@ -69,17 +69,8 @@ struct GrGLInterface; const GrGLInterface* GrGLDefaultInterface(); -/** - * Creates a GrGLInterface for a "native" GL context (e.g. WGL on windows, - * GLX on linux, AGL on Mac). On platforms that have context-specific function - * pointers for GL extensions (e.g. windows) the returned interface is only - * valid for the context that was current at creation. - */ const GrGLInterface* GrGLCreateNativeInterface(); -/** - * Creates a GrGLInterface for an OSMesa context. - */ const GrGLInterface* GrGLCreateMesaInterface(); typedef unsigned int GrGLenum; diff --git a/include/gpu/SkGLContext.h b/include/gpu/SkGLContext.h index f92a7700c4..d36a9f9d43 100644 --- a/include/gpu/SkGLContext.h +++ b/include/gpu/SkGLContext.h @@ -20,9 +20,6 @@ public: SkGLContext(); virtual ~SkGLContext(); - /** - * Initializes the context and makes it current. - */ bool init(const int width, const int height); int getFBOID() const { return fFBO; } diff --git a/include/gpu/SkMesaGLContext.h b/include/gpu/SkMesaGLContext.h index b7578f367b..4351f66f33 100644 --- a/include/gpu/SkMesaGLContext.h +++ b/include/gpu/SkMesaGLContext.h @@ -13,9 +13,6 @@ #if SK_MESA class SkMesaGLContext : public SkGLContext { -private: - typedef intptr_t Context; - public: SkMesaGLContext(); @@ -23,28 +20,16 @@ public: virtual void makeCurrent() const SK_OVERRIDE; - class AutoContextRestore { - public: - AutoContextRestore(); - ~AutoContextRestore(); - - private: - Context fOldContext; - GLint fOldWidth; - GLint fOldHeight; - GLint fOldFormat; - void* fOldImage; - }; - protected: virtual const GrGLInterface* createGLContext() SK_OVERRIDE; void destroyGLContext() SK_OVERRIDE; private: + typedef intptr_t Context; Context fContext; GrGLubyte *fImage; }; #endif -#endif +#endif
\ No newline at end of file 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; |