[aseprite] 174/250: Disable GPU acceleration on Skia/OSX

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 7e7d3b9dc83672930bae8a672be553bc85589cbc
Author: David Capello <davidcapello at gmail.com>
Date:   Wed Oct 14 13:35:26 2015 -0300

    Disable GPU acceleration on Skia/OSX
---
 src/she/skia/skia_system.h      | 8 ++++++--
 src/she/skia/skia_window_osx.mm | 3 +++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/she/skia/skia_system.h b/src/she/skia/skia_system.h
index 8cdc3d0..f5e5213 100644
--- a/src/she/skia/skia_system.h
+++ b/src/she/skia/skia_system.h
@@ -47,8 +47,12 @@ public:
     return Capabilities(
       int(Capabilities::MultipleDisplays) |
       int(Capabilities::CanResizeDisplay) |
-      int(Capabilities::DisplayScale) |
-      int(Capabilities::GpuAccelerationSwitch));
+      int(Capabilities::DisplayScale)
+#ifdef _WIN32
+      // GPU acceleration is available on Windows at this moment
+      | int(Capabilities::GpuAccelerationSwitch)
+#endif
+      );
   }
 
   EventQueue* eventQueue() override {
diff --git a/src/she/skia/skia_window_osx.mm b/src/she/skia/skia_window_osx.mm
index c936725..f3e5688 100644
--- a/src/she/skia/skia_window_osx.mm
+++ b/src/she/skia/skia_window_osx.mm
@@ -123,6 +123,9 @@ public:
     bool gpu = she::instance()->gpuAcceleration();
     (void)gpu;
 
+    // Disable GPU acceleration because it isn't ready yet.
+    gpu = false;
+
 #if SK_SUPPORT_GPU
     if (gpu && attachGL()) {
       m_backend = Backend::GL;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git