actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Transplant revision b18dc32.

Browse Source 
Original message is as follows:

[Xcode4.4] wrong code: NSBitsPerPixelFromDepth seems to like to return 0.
instead, use a reimplementation of CGGetDisplayBitsPerPixel
This commit is contained in:
Jason Felds
2013-02-10 20:31:40 -05:00
parent bc244cb72b
commit eaad585fa8
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/arch/LowLevelWindow/LowLevelWindow_MacOSX.mm
+20 -1
View File
@@ -501,6 +501,25 @@ int LowLevelWindow_MacOSX::ChangeDisplayMode( const VideoModeParams& p )
return 0; return 0;
} }
// http://lukassen.wordpress.com/2010/01/18/taming-snow-leopard-cgdisplaybitsperpixel-deprication/
static size_t GetDisplayBitsPerPixel( CGDirectDisplayID displayId )
{
CGDisplayModeRef mode = CGDisplayCopyDisplayMode(displayId);
size_t depth = 0;
CFStringRef pixEnc = CGDisplayModeCopyPixelEncoding(mode);
if(CFStringCompare(pixEnc, CFSTR(IO32BitDirectPixels), kCFCompareCaseInsensitive) == kCFCompareEqualTo)
depth = 32;
else if(CFStringCompare(pixEnc, CFSTR(IO16BitDirectPixels), kCFCompareCaseInsensitive) == kCFCompareEqualTo)
depth = 16;
else if(CFStringCompare(pixEnc, CFSTR(IO8BitIndexedPixels), kCFCompareCaseInsensitive) == kCFCompareEqualTo)
depth = 8;
return depth;
}
void LowLevelWindow_MacOSX::SetActualParamsFromMode( CFDictionaryRef mode ) void LowLevelWindow_MacOSX::SetActualParamsFromMode( CFDictionaryRef mode )
{ {
SInt32 rate; SInt32 rate;
@@ -527,7 +546,7 @@ void LowLevelWindow_MacOSX::SetActualParamsFromMode( CFDictionaryRef mode )
m_CurrentParams.height = int(size.height); m_CurrentParams.height = int(size.height);
} }
m_CurrentParams.bpp = CGDisplayBitsPerPixel( kCGDirectMainDisplay ); m_CurrentParams.bpp = GetDisplayBitsPerPixel( kCGDirectMainDisplay );
} }
static int GetIntValue( CFTypeRef r ) static int GetIntValue( CFTypeRef r )