summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authorkbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-13 22:55:50 +0000
committerkbr@chromium.org <kbr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-13 22:55:50 +0000
commit276f89060fa4b38582dcd76ebdf9454bb7d42c8e (patch)
tree0ff1c47fed812c196ae491a6c7295164d557e813 /gpu
parent91701aec11f289e96ce92b588b858b26179cb89c (diff)
downloadchromium_src-276f89060fa4b38582dcd76ebdf9454bb7d42c8e.zip
chromium_src-276f89060fa4b38582dcd76ebdf9454bb7d42c8e.tar.gz
chromium_src-276f89060fa4b38582dcd76ebdf9454bb7d42c8e.tar.bz2
Support dynamic switching between integrated and discrete GPUs on Mac OS X.
Change Chrome to allocate most OpenGL contexts with the kCGLPFAAllowOfflineRenderers flag, and specify NSSupportsAutomaticGraphicsSwitching in the Info.plist for the main executable and helper apps. This keeps Chrome on the integrated GPU except when using WebGL, accelerated 2D Canvas, Pepper 3D, and Core Animation-based plugins (except Flash). Chrome shares resources between OpenGL contexts in order to display WebGL and other content in the compositor, and resource sharing doesn't work between contexts allocated on different GPUs. Therefore, when the first context for a given renderer requests the discrete GPU, the channel is dropped and all contexts are reallocated on the discrete GPU. Similarly, when the last context requesting the discrete GPU for a given renderer is shut down, all contexts are dropped and reallocated on the integrated GPU. Currently dynamic GPU switching is only supported on the latest Mac OS X 10.7 update and MacBook Pros with dual AMD / Intel GPUs, though this will improve in future OS updates. Tested with WebGL, CSS 3D, Flash and Unity3D content and observed desired GPU switching behavior. Also added a layout test to WebKit under https://bugs.webkit.org/show_bug.cgi?id=69776 which when run in Chrome catches an assertion failure related to the destruction of contexts. The intent is to add it as a UI layout test on the GPU bots. BUG=88788 TEST=none Review URL: http://codereview.chromium.org/8233027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105399 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
-rw-r--r--gpu/demos/framework/window.cc3
-rw-r--r--gpu/gles2_conform_support/egl/display.cc4
2 files changed, 5 insertions, 2 deletions
diff --git a/gpu/demos/framework/window.cc b/gpu/demos/framework/window.cc
index efae079..8474d92 100644
--- a/gpu/demos/framework/window.cc
+++ b/gpu/demos/framework/window.cc
@@ -73,7 +73,8 @@ bool Window::CreateRenderContext(gfx::PluginWindowHandle hwnd) {
if (!surface_.get())
return false;
- context_ = gfx::GLContext::CreateGLContext(NULL, surface_.get());
+ context_ = gfx::GLContext::CreateGLContext(
+ NULL, surface_.get(), gfx::PreferDiscreteGpu);
if (!context_.get())
return false;
diff --git a/gpu/gles2_conform_support/egl/display.cc b/gpu/gles2_conform_support/egl/display.cc
index b3cebcc..fad076b 100644
--- a/gpu/gles2_conform_support/egl/display.cc
+++ b/gpu/gles2_conform_support/egl/display.cc
@@ -117,7 +117,9 @@ EGLSurface Display::CreateWindowSurface(EGLConfig config,
if (!gl_surface_.get())
return EGL_NO_SURFACE;
- gl_context_ = gfx::GLContext::CreateGLContext(NULL, gl_surface_.get());
+ gl_context_ = gfx::GLContext::CreateGLContext(NULL,
+ gl_surface_.get(),
+ gfx::PreferDiscreteGpu);
if (!gl_context_.get())
return EGL_NO_SURFACE;