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

Fix some mac compilation errors generated when building utils within

Browse Source 
chrome.

BUG=364
TEST=Build skia on mac, ran bench. Ensured both behaved as expected.
Review URL: http://codereview.appspot.com/5032045

git-svn-id: http://skia.googlecode.com/svn/trunk@2277 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
seanpaul@google.com 2011-09-16 20:46:40 +00:00
parent 6fb736fc2e
commit d4f299e496
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gpu/src/mac/GrGLDefaultInterface_mac.cpp
View File

@ -138,7 +138,7 @@ const GrGLInterface* GrGLDefaultInterface() {
interface->fBlitFramebuffer = glBlitFramebuffer;
#elif GL_EXT_framebuffer_object
interface->fGenFramebuffers = glGenFramebuffersEXT;
interface->fGetFramebufferAttachmentivParameter = glGetFramebufferAttachmentParameterivEXT;
interface->fGetFramebufferAttachmentParameteriv = glGetFramebufferAttachmentParameterivEXT;
interface->fGLGetRenderbufferParameteriv = glGetRenderbufferParameterivEXT;
interface->fBindFramebuffer = glBindFramebufferEXT;
interface->fFramebufferTexture2D = glFramebufferTexture2DEXT;
@ -146,7 +146,7 @@ const GrGLInterface* GrGLDefaultInterface() {
interface->fDeleteFramebuffers = glDeleteFramebuffersEXT;
interface->fRenderbufferStorage = glRenderbufferStorageEXT;
interface->fGenRenderbuffers = glGenRenderbuffersEXT;
interface->fDeleteRenderbuffers = glDeleteRenderbuffers;
interface->fDeleteRenderbuffers = glDeleteRenderbuffersEXT;
interface->fFramebufferRenderbuffer =
glFramebufferRenderbufferEXT;
interface->fBindRenderbuffer = glBindRenderbufferEXT;

20
src/utils/mac/SkEGLContext_mac.cpp
View File

@ -59,18 +59,18 @@ bool SkEGLContext::init(int width, int height) {
GLuint dsID;
glGenFramebuffersEXT(1, &fFBO);
glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fFBO);
glGenRenderbuffers(1, &cbID);
glBindRenderbuffer(GL_RENDERBUFFER, cbID);
glRenderbufferStorage(GL_RENDERBUFFER, GL_RGBA, width, height);
glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, cbID);
glGenRenderbuffers(1, &dsID);
glBindRenderbuffer(GL_RENDERBUFFER, dsID);
glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_STENCIL, width, height);
glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER, dsID);
glGenRenderbuffersEXT(1, &cbID);
glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, cbID);
glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_RGBA, width, height);
glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER_EXT, cbID);
glGenRenderbuffersEXT(1, &dsID);
glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, dsID);
glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_DEPTH_STENCIL, width, height);
glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_STENCIL_ATTACHMENT, GL_RENDERBUFFER_EXT, dsID);
glViewport(0, 0, width, height);
glClearStencil(0);
glClear(GL_STENCIL_BUFFER_BIT);
GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
return GL_FRAMEBUFFER_COMPLETE == status;
GLenum status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
return GL_FRAMEBUFFER_COMPLETE_EXT == status;
}