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

Unified Diff: src/gpu/gl/mac/SkCreatePlatformGLContext_mac.cpp

Issue 639793002: Revert of Make the Sk GL context class an abstract base class (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 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 | « src/gpu/gl/iOS/SkNativeGLContext_iOS.mm ('k') | src/gpu/gl/mac/SkNativeGLContext_mac.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/gl/mac/SkCreatePlatformGLContext_mac.cpp
diff --git a/src/gpu/gl/mac/SkCreatePlatformGLContext_mac.cpp b/src/gpu/gl/mac/SkCreatePlatformGLContext_mac.cpp
deleted file mode 100644
index 35ec2762968b9df918b26491b7a4485e9c8a592e..0000000000000000000000000000000000000000
--- a/src/gpu/gl/mac/SkCreatePlatformGLContext_mac.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-#include "gl/SkGLContext.h"
-#include "AvailabilityMacros.h"
-
-#include <OpenGL/OpenGL.h>
-
-namespace {
-class MacGLContext : public SkGLContext {
-public:
- MacGLContext();
-
- virtual ~MacGLContext();
-
- virtual void makeCurrent() const SK_OVERRIDE;
- virtual void swapBuffers() const SK_OVERRIDE;
-protected:
- virtual const GrGLInterface* createGLContext(GrGLStandard forcedGpuAPI) SK_OVERRIDE;
- virtual void destroyGLContext() SK_OVERRIDE;
-
-private:
- CGLContextObj fContext;
-};
-
-MacGLContext::MacGLContext()
- : fContext(NULL) {
-}
-
-MacGLContext::~MacGLContext() {
- this->destroyGLContext();
-}
-
-void MacGLContext::destroyGLContext() {
- if (fContext) {
- CGLReleaseContext(fContext);
- }
-}
-
-const GrGLInterface* MacGLContext::createGLContext(GrGLStandard forcedGpuAPI) {
- SkASSERT(NULL == fContext);
- if (kGLES_GrGLStandard == forcedGpuAPI) {
- return NULL;
- }
-
- CGLPixelFormatAttribute attributes[] = {
-#if MAC_OS_X_VERSION_10_7
- kCGLPFAOpenGLProfile, (CGLPixelFormatAttribute) kCGLOGLPVersion_3_2_Core,
-#endif
- kCGLPFADoubleBuffer,
- (CGLPixelFormatAttribute)0
- };
- CGLPixelFormatObj pixFormat;
- GLint npix;
-
- CGLChoosePixelFormat(attributes, &pixFormat, &npix);
-
- if (NULL == pixFormat) {
- SkDebugf("CGLChoosePixelFormat failed.");
- return NULL;
- }
-
- CGLCreateContext(pixFormat, NULL, &fContext);
- CGLReleasePixelFormat(pixFormat);
-
- if (NULL == fContext) {
- SkDebugf("CGLCreateContext failed.");
- return NULL;
- }
-
- CGLSetCurrentContext(fContext);
-
- const GrGLInterface* interface = GrGLCreateNativeInterface();
- if (NULL == interface) {
- SkDebugf("Context could not create GL interface.\n");
- this->destroyGLContext();
- return NULL;
- }
-
- return interface;
-}
-
-void MacGLContext::makeCurrent() const {
- CGLSetCurrentContext(fContext);
-}
-
-void MacGLContext::swapBuffers() const {
- CGLFlushDrawable(fContext);
-}
-
-} // anonymous namespace
-
-SkGLContext* SkCreatePlatformGLContext() {
- return SkNEW(MacGLContext);
-}
« no previous file with comments | « src/gpu/gl/iOS/SkNativeGLContext_iOS.mm ('k') | src/gpu/gl/mac/SkNativeGLContext_mac.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698