Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Unified Diff: include/gpu/gl/SkGLContext.h

Issue 640283004: Refactor SkGLContext to be actually extendable (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: win compile fix. Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « include/gpu/gl/SkDebugGLContext.h ('k') | include/gpu/gl/SkMesaGLContext.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/gpu/gl/SkGLContext.h
diff --git a/include/gpu/gl/SkGLContext.h b/include/gpu/gl/SkGLContext.h
index 83c9146c9b48ffebfcebd987d6dd6a4e58ee450e..ceaced539b32dce0eb6715936cd618f1a3538cca 100644
--- a/include/gpu/gl/SkGLContext.h
+++ b/include/gpu/gl/SkGLContext.h
@@ -19,17 +19,11 @@ class SK_API SkGLContext : public SkRefCnt {
public:
SK_DECLARE_INST_COUNT(SkGLContext)
- SkGLContext();
- virtual ~SkGLContext();
-
- /**
- * Initializes the context and makes it current.
- */
- bool init(GrGLStandard forcedGpuAPI, const int width, const int height);
+ virtual ~SkGLContext() SK_OVERRIDE;
- int getFBOID() const { return fFBO; }
+ bool isValid() const { return NULL != gl(); }
- const GrGLInterface* gl() const { return fGL; }
+ const GrGLInterface* gl() const { return fGL.get(); }
virtual void makeCurrent() const = 0;
@@ -45,11 +39,6 @@ public:
*/
virtual void swapBuffers() const = 0;
- bool hasExtension(const char* extensionName) const {
- SkASSERT(fGL);
- return fGL->hasExtension(extensionName);
- }
-
/**
* This notifies the context that we are deliberately testing abandoning
* the context. It is useful for debugging contexts that would otherwise
@@ -59,35 +48,23 @@ public:
void testAbandon();
protected:
- /**
- * Subclass implements this to make a GL context. The returned GrGLInterface
- * should be populated with functions compatible with the context. The
- * format and size of backbuffers does not matter since an FBO will be
- * created.
- */
- virtual const GrGLInterface* createGLContext(GrGLStandard forcedGpuAPI) = 0;
-
- /**
- * Subclass should destroy the underlying GL context.
- */
- virtual void destroyGLContext() = 0;
+ SkGLContext();
-private:
- GrGLuint fFBO;
- GrGLuint fColorBufferID;
- GrGLuint fDepthStencilBufferID;
- const GrGLInterface* fGL;
+ /** Subclass provides the gl interface object if construction was
+ * successful. */
+ SkAutoTUnref<const GrGLInterface> fGL;
typedef SkRefCnt INHERITED;
};
/** Creates platform-dependent GL context object
+ * Returns a valid gl context object or NULL if such can not be created.
* Note: If Skia embedder needs a custom GL context that sets up the GL
* interface, this function should be implemented by the embedder.
* Otherwise, the default implementation for the platform should be compiled in
* the library.
*/
-SK_API SkGLContext* SkCreatePlatformGLContext();
+SK_API SkGLContext* SkCreatePlatformGLContext(GrGLStandard forcedGpuAPI);
/**
* Helper macros for using the GL context through the GrGLInterface. Example:
« no previous file with comments | « include/gpu/gl/SkDebugGLContext.h ('k') | include/gpu/gl/SkMesaGLContext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698