From 2256d9d378365850ba247e7e02631cf458a4fca2 Mon Sep 17 00:00:00 2001 From: bjarni Date: Sat, 8 Dec 2007 15:21:37 +0000 Subject: [PATCH] (svn r11599) -Change: [OSX] 10.4 will now use quickdraw for window mode instead of quartz The reason is that quickdraw is way faster (try fast forward) 10.5 will still use quartz as it can't handle quickdraw. --- src/video/cocoa/cocoa_v.mm | 3 ++- src/video/cocoa/wnd_quartz.mm | 4 ++-- src/video/cocoa/wnd_quickdraw.mm | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/video/cocoa/cocoa_v.mm b/src/video/cocoa/cocoa_v.mm index d039d30ad8..db8ef2c5bb 100644 --- a/src/video/cocoa/cocoa_v.mm +++ b/src/video/cocoa/cocoa_v.mm @@ -233,7 +233,8 @@ static CocoaSubdriver *QZ_CreateWindowSubdriver(int width, int height, int bpp) CocoaSubdriver *ret; #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4 - if (MacOSVersionIsAtLeast(10, 4, 0)) { + /* The reason for the version mismatch is due to the fact that the 10.4 binary needs to work on 10.5 as well. */ + if (MacOSVersionIsAtLeast(10, 5, 0)) { ret = QZ_CreateWindowQuartzSubdriver(width, height, bpp); if (ret != NULL) return ret; } diff --git a/src/video/cocoa/wnd_quartz.mm b/src/video/cocoa/wnd_quartz.mm index 044f3c67f1..493e802604 100644 --- a/src/video/cocoa/wnd_quartz.mm +++ b/src/video/cocoa/wnd_quartz.mm @@ -782,8 +782,8 @@ CocoaSubdriver *QZ_CreateWindowQuartzSubdriver(int width, int height, int bpp) { WindowQuartzSubdriver *ret; - if (!MacOSVersionIsAtLeast(10, 4, 0)) { - DEBUG(driver, 0, "The cocoa quartz subdriver requires Mac OS X 10.4 or later."); + if (!MacOSVersionIsAtLeast(10, 5, 0)) { + DEBUG(driver, 0, "The cocoa quartz subdriver requires Mac OS X 10.5 or later."); return NULL; } diff --git a/src/video/cocoa/wnd_quickdraw.mm b/src/video/cocoa/wnd_quickdraw.mm index 9a19c7a3d8..dc1dc34b26 100644 --- a/src/video/cocoa/wnd_quickdraw.mm +++ b/src/video/cocoa/wnd_quickdraw.mm @@ -798,8 +798,8 @@ CocoaSubdriver *QZ_CreateWindowQuickdrawSubdriver(int width, int height, int bpp { WindowQuickdrawSubdriver *ret; - if (MacOSVersionIsAtLeast(10, 4, 0)) { - DEBUG(driver, 0, "The cocoa quickdraw subdriver is not recommended for Mac OS X 10.4 or later."); + if (MacOSVersionIsAtLeast(10, 5, 0)) { + DEBUG(driver, 0, "The cocoa quickdraw subdriver is not recommended for Mac OS X 10.5 or later."); } if (bpp != 8 && bpp != 32) {