Index: ui/gfx/gl/gl_implementation_mac.cc |
=================================================================== |
--- ui/gfx/gl/gl_implementation_mac.cc (revision 113194) |
+++ ui/gfx/gl/gl_implementation_mac.cc (working copy) |
@@ -20,6 +20,7 @@ |
void GetAllowedGLImplementations(std::vector<GLImplementation>* impls) { |
impls->push_back(kGLImplementationDesktopGL); |
+ impls->push_back(kGLImplementationAppleGL); |
impls->push_back(kGLImplementationOSMesaGL); |
} |
@@ -74,7 +75,8 @@ |
InitializeGLBindingsOSMESA(); |
break; |
} |
- case kGLImplementationDesktopGL: { |
+ case kGLImplementationDesktopGL: |
+ case kGLImplementationAppleGL: { |
base::NativeLibrary library = base::LoadNativeLibrary( |
FilePath(kOpenGLFrameworkPath), NULL); |
if (!library) { |
@@ -83,7 +85,7 @@ |
} |
AddGLNativeLibrary(library); |
- SetGLImplementation(kGLImplementationDesktopGL); |
+ SetGLImplementation(implementation); |
InitializeGLBindingsGL(); |
break; |
@@ -109,6 +111,7 @@ |
InitializeGLExtensionBindingsOSMESA(context); |
break; |
case kGLImplementationDesktopGL: |
+ case kGLImplementationAppleGL: |
InitializeGLExtensionBindingsGL(context); |
break; |
case kGLImplementationMockGL: |