Merge branch 'osx-video-fix'

This commit is contained in:
Dan Sumorok 2013-05-14 06:37:47 -04:00
commit 0e667be7be

View File

@ -1636,6 +1636,11 @@ bool VideoInit(bool classic)
ErrorAlert(STR_UNSUPP_DEPTH_ERR); ErrorAlert(STR_UNSUPP_DEPTH_ERR);
return false; return false;
} }
// 15-bit color does not seem to work on OS X
int *list_end = std::remove(avail_depths, avail_depths + num_depths,
15);
num_depths = list_end - avail_depths;
std::sort(avail_depths, avail_depths + num_depths); std::sort(avail_depths, avail_depths + num_depths);
#ifdef ENABLE_FBDEV_DGA #ifdef ENABLE_FBDEV_DGA