AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use CGL rather than AGL on the Mac.

Browse Source 
Review URL: https://codereview.appspot.com/7307106

git-svn-id: http://skia.googlecode.com/svn/trunk@7736 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
bsalomon@google.com 2013-02-14 15:10:59 +00:00
parent f4eeeabcdc
commit 682e1f9245
2 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/gpu/gl/SkNativeGLContext.h
View File

@ -11,7 +11,7 @@
#include "SkGLContext.h"
#if defined(SK_BUILD_FOR_MAC)
#include <AGL/agl.h>
#include <OpenGL/OpenGL.h>
#elif defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_NACL)
#include <GLES2/gl2.h>
#include <EGL/egl.h>
@ -38,7 +38,7 @@ public:
private:
#if defined(SK_BUILD_FOR_MAC)
AGLContext fOldAGLContext;
CGLContextObj fOldCGLContext;
#elif defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_NACL)
EGLContext fOldEGLContext;
EGLDisplay fOldDisplay;
@ -62,7 +62,7 @@ protected:
private:
#if defined(SK_BUILD_FOR_MAC)
AGLContext fContext;
CGLContextObj fContext;
#elif defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_NACL)
EGLContext fContext;
EGLDisplay fDisplay;

51
src/gpu/gl/mac/SkNativeGLContext_mac.cpp
View File

@ -8,11 +8,11 @@
#include "gl/SkNativeGLContext.h"
SkNativeGLContext::AutoContextRestore::AutoContextRestore() {
fOldAGLContext = aglGetCurrentContext();
fOldCGLContext = CGLGetCurrentContext();
}
SkNativeGLContext::AutoContextRestore::~AutoContextRestore() {
aglSetCurrentContext(fOldAGLContext);
CGLSetCurrentContext(fOldCGLContext);
}
///////////////////////////////////////////////////////////////////////////////
@ -26,38 +26,39 @@ SkNativeGLContext::~SkNativeGLContext() {
}
void SkNativeGLContext::destroyGLContext() {
if (fContext) {
aglDestroyContext(fContext);
if (NULL != fContext) {
CGLReleaseContext(fContext);
}
}
const GrGLInterface* SkNativeGLContext::createGLContext() {
GLint major, minor;
// AGLContext ctx;
aglGetVersion(&major, &minor);
//SkDebugf("---- agl version %d %d\n", major, minor);
const GLint pixelAttrs[] = {
AGL_RGBA,
AGL_ACCELERATED,
AGL_NONE
SkASSERT(NULL == fContext);
CGLPixelFormatAttribute attributes[] = {
#if 0
kCGLPFAOpenGLProfile, kCGLOGLPVersion_3_2_Core,
#endif
(CGLPixelFormatAttribute)0
};
AGLPixelFormat format = aglChoosePixelFormat(NULL, 0, pixelAttrs);
if (NULL == format) {
SkDebugf("Format could not be found.\n");
this->destroyGLContext();
CGLPixelFormatObj pixFormat;
GLint npix;
CGLChoosePixelFormat(attributes, &pixFormat, &npix);
if (NULL == pixFormat) {
SkDebugf("CGLChoosePixelFormat failed.");
return NULL;
}
fContext = aglCreateContext(format, NULL);
CGLCreateContext(pixFormat, NULL, &fContext);
CGLReleasePixelFormat(pixFormat);
if (NULL == fContext) {
SkDebugf("Context could not be created.\n");
this->destroyGLContext();
SkDebugf("CGLCreateContext failed.");
return NULL;
}
aglDestroyPixelFormat(format);
aglSetCurrentContext(fContext);
CGLSetCurrentContext(fContext);
const GrGLInterface* interface = GrGLCreateNativeInterface();
if (NULL == interface) {
@ -70,5 +71,5 @@ const GrGLInterface* SkNativeGLContext::createGLContext() {
}
void SkNativeGLContext::makeCurrent() const {
aglSetCurrentContext(fContext);
CGLSetCurrentContext(fContext);
}