diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-10-12 18:12:11 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-10-12 18:12:11 +0000 |
| commit | 4d5cb45f3e3e62633304b4911d131cdd02dfd541 (patch) | |
| tree | 9e1e4f17fc073b41e435f4ebe47c87ad4b96fb6c | |
| parent | 674b34c2c366c1b2ae83d2d9a78d1ea9fbdfaaaa (diff) | |
Set SDK for Mac build to 10.6, ignore gyp/build, fixup gpu files to compile against 10.5 if needed
Review URL: http://codereview.appspot.com/5260041/
git-svn-id: http://skia.googlecode.com/svn/trunk@2470 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | gpu/src/mac/GrGLDefaultInterface_mac.cpp | 2 | ||||
| -rw-r--r-- | gyp/common_conditions.gypi | 1 | ||||
| -rw-r--r-- | src/utils/mac/SkEGLContext_mac.cpp | 7 |
3 files changed, 6 insertions, 4 deletions
diff --git a/gpu/src/mac/GrGLDefaultInterface_mac.cpp b/gpu/src/mac/GrGLDefaultInterface_mac.cpp index ef6b73c1cd..ba43975406 100644 --- a/gpu/src/mac/GrGLDefaultInterface_mac.cpp +++ b/gpu/src/mac/GrGLDefaultInterface_mac.cpp @@ -142,7 +142,7 @@ const GrGLInterface* GrGLDefaultInterface() { #elif GL_EXT_framebuffer_object interface->fGenFramebuffers = glGenFramebuffersEXT; interface->fGetFramebufferAttachmentParameteriv = glGetFramebufferAttachmentParameterivEXT; - interface->fGLGetRenderbufferParameteriv = glGetRenderbufferParameterivEXT; + interface->fGetRenderbufferParameteriv = glGetRenderbufferParameterivEXT; interface->fBindFramebuffer = glBindFramebufferEXT; interface->fFramebufferTexture2D = glFramebufferTexture2DEXT; interface->fCheckFramebufferStatus = glCheckFramebufferStatusEXT; diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index 19fad9e3b4..d627998a86 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -113,6 +113,7 @@ }, 'xcode_settings': { 'SYMROOT': '<(DEPTH)/xcodebuild', + 'SDKROOT': 'macosx10.6', }, }, ], diff --git a/src/utils/mac/SkEGLContext_mac.cpp b/src/utils/mac/SkEGLContext_mac.cpp index e175755ca0..bb96840089 100644 --- a/src/utils/mac/SkEGLContext_mac.cpp +++ b/src/utils/mac/SkEGLContext_mac.cpp @@ -62,11 +62,12 @@ bool SkEGLContext::init(int width, int height) { 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); + glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, 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); + glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_DEPTH_STENCIL_EXT, width, height); + glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, dsID); + glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_STENCIL_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, dsID); glViewport(0, 0, width, height); glClearStencil(0); glClear(GL_STENCIL_BUFFER_BIT); |