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

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;

gyp/common_conditions.gypi

@@ -113,6 +113,7 @@
         },
         'xcode_settings': {
           'SYMROOT': '<(DEPTH)/xcodebuild',
+          'SDKROOT': 'macosx10.6',
         },
       },
     ],

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);