aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/gl
diff options
context:
space:
mode:
authorGravatar jvanverth <jvanverth@google.com>2014-06-11 13:59:22 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-06-11 13:59:22 -0700
commit66c9582d1bed717d72c9d3f789f761cb08e28264 (patch)
tree52d1799bb6ae95efb60aa35b69d497452b2c577e /src/gpu/gl
parent72abfc2b4e7caead660f6b6a05e60d05eaf1a66f (diff)
Fix a number of issues with iOS build.
Set pointer to root view in window (for SampleApp) Set up the correct function pointer for GL multisampling Remove use of SkBitmap::setConfig() Remove incomplete iOS implementation of SkFILE (use SkOSFile for now) R=caryclark@google.com, reed@google.com, bsalomon@google.com, tfarina@chromium.org Author: jvanverth@google.com Review URL: https://codereview.chromium.org/322403007
Diffstat (limited to 'src/gpu/gl')
-rw-r--r--src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp b/src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp
index d853e3663c..0408965694 100644
--- a/src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp
+++ b/src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp
@@ -139,7 +139,7 @@ const GrGLInterface* GrGLCreateNativeInterface() {
#endif
#if GL_APPLE_framebuffer_multisample
- functions->fRenderbufferStorageMultisample = glRenderbufferStorageMultisampleAPPLE;
+ functions->fRenderbufferStorageMultisampleES2APPLE = glRenderbufferStorageMultisampleAPPLE;
functions->fResolveMultisampleFramebuffer = glResolveMultisampleFramebufferAPPLE;
#endif