diff options
| author |  jvanverth <jvanverth@google.com> | 2014-06-11 13:59:22 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-06-11 13:59:22 -0700 |
| commit | 66c9582d1bed717d72c9d3f789f761cb08e28264 (patch) | |
| tree | 52d1799bb6ae95efb60aa35b69d497452b2c577e /src | |
| parent | 72abfc2b4e7caead660f6b6a05e60d05eaf1a66f (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')
| -rw-r--r-- | src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp | 2 | ||||
| -rwxr-xr-x | src/utils/ios/SkImageDecoder_iOS.mm | 3 |
2 files changed, 3 insertions, 2 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 diff --git a/src/utils/ios/SkImageDecoder_iOS.mm b/src/utils/ios/SkImageDecoder_iOS.mm index f347e060c8..5e4261ff1d 100755 --- a/src/utils/ios/SkImageDecoder_iOS.mm +++ b/src/utils/ios/SkImageDecoder_iOS.mm @@ -29,7 +29,8 @@ bool SkImageDecoder_iOS::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) { const int width = uimage.size.width; const int height = uimage.size.height; - bm->setConfig(SkBitmap::kARGB_8888_Config, width, height); + SkColorType ct = SkBitmapConfigToColorType(SkBitmap::kARGB_8888_Config); + bm->setInfo(SkImageInfo::Make(width, height, ct, kPremul_SkAlphaType), 0); if (SkImageDecoder::kDecodeBounds_Mode == mode) { return true; } |