diff options
| author | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-16 02:40:02 +0000 |
|---|---|---|
| committer | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-16 02:40:02 +0000 |
| commit | 1d309bbb24b611dd7ea78b0b471de8cf96a9a797 (patch) | |
| tree | 495be525eb25a3fe3311a7c337882f754c2e7dda /ui/gl | |
| parent | 83a27f8f6783825195d11239d03c89d3828d9894 (diff) | |
| download | chromium_src-1d309bbb24b611dd7ea78b0b471de8cf96a9a797.zip chromium_src-1d309bbb24b611dd7ea78b0b471de8cf96a9a797.tar.gz chromium_src-1d309bbb24b611dd7ea78b0b471de8cf96a9a797.tar.bz2 | |
Only specify kCGLPFAAllowOfflineRenderers on systems that support dual GPUs
This was causing issues with silverlight on 10.6 machines.
BUG=132235
TEST=
Review URL: https://chromiumcodereview.appspot.com/10539178
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142570 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gl')
| -rw-r--r-- | ui/gl/gl_context_cgl.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ui/gl/gl_context_cgl.cc b/ui/gl/gl_context_cgl.cc index f10595f..8affe56 100644 --- a/ui/gl/gl_context_cgl.cc +++ b/ui/gl/gl_context_cgl.cc @@ -30,9 +30,10 @@ bool GLContextCGL::Initialize(GLSurface* compatible_surface, static_cast<GLContextCGL*>(share_group()->GetContext()) : NULL; std::vector<CGLPixelFormatAttribute> attribs; - // Allow offline renderers for every context, so that they can all be in the - // same share group. - attribs.push_back(kCGLPFAAllowOfflineRenderers); + // If the system supports dual gpus then allow offline renderers for every + // context, so that they can all be in the same share group. + if (SupportsDualGpus()) + attribs.push_back(kCGLPFAAllowOfflineRenderers); if (GetGLImplementation() == kGLImplementationAppleGL) { attribs.push_back(kCGLPFARendererID); attribs.push_back((CGLPixelFormatAttribute) kCGLRendererGenericFloatID); |