diff options
| author | leandrogracia@chromium.org <leandrogracia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-21 15:21:25 +0000 |
|---|---|---|
| committer | leandrogracia@chromium.org <leandrogracia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-21 15:21:25 +0000 |
| commit | a749a946d9eaeff53419a1a65bf59021ba1acf51 (patch) | |
| tree | f24257dc6c1143dda99f4bbc80a8458b02dfefc7 /content/gpu | |
| parent | fc84221d91cf6ce4321a4d64179806473efc1a51 (diff) | |
| download | chromium_src-a749a946d9eaeff53419a1a65bf59021ba1acf51.zip chromium_src-a749a946d9eaeff53419a1a65bf59021ba1acf51.tar.gz chromium_src-a749a946d9eaeff53419a1a65bf59021ba1acf51.tar.bz2 | |
Revert 93397 - Revert 93393 - Revert was broken. Restoring.
Crashing on Linux Touch: http://build.chromium.org/p/chromium/builders/Linux%20Touch/builds/2649/steps/compile/logs/stdio
Allow creating a gpu channel that uses software rendering
Where supported (on ANGLE with EGL_ANGLE_software_display), allow for the creation of gpu channels that use software rendering instead of hardware rendering.
BUG=
TEST=trybots, other later tests
Review URL: http://codereview.chromium.org/7383004
TBR=jbauman@chromium.org
Review URL: http://codereview.chromium.org/7468028
TBR=leandrogracia@chromium.org
Review URL: http://codereview.chromium.org/7468029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93398 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/gpu')
| -rw-r--r-- | content/gpu/gpu_info_collector.cc | 2 | ||||
| -rw-r--r-- | content/gpu/gpu_info_collector_win.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/content/gpu/gpu_info_collector.cc b/content/gpu/gpu_info_collector.cc index 93cd767..cd0918c 100644 --- a/content/gpu/gpu_info_collector.cc +++ b/content/gpu/gpu_info_collector.cc @@ -20,7 +20,7 @@ namespace { scoped_refptr<gfx::GLSurface> InitializeGLSurface() { scoped_refptr<gfx::GLSurface> surface( - gfx::GLSurface::CreateOffscreenGLSurface(gfx::Size(1, 1))); + gfx::GLSurface::CreateOffscreenGLSurface(false, gfx::Size(1, 1))); if (!surface.get()) { LOG(ERROR) << "gfx::GLContext::CreateOffscreenGLSurface failed"; return NULL; diff --git a/content/gpu/gpu_info_collector_win.cc b/content/gpu/gpu_info_collector_win.cc index 4e32805..dfae814 100644 --- a/content/gpu/gpu_info_collector_win.cc +++ b/content/gpu/gpu_info_collector_win.cc @@ -72,7 +72,7 @@ bool CollectGraphicsInfo(GPUInfo* gpu_info) { // Need to handle the case when running on top of real EGL/GLES2 drivers. egl::Display* display = static_cast<egl::Display*>( - gfx::GLSurfaceEGL::GetDisplay()); + gfx::GLSurfaceEGL::GetHardwareDisplay()); if (!display) { LOG(ERROR) << "gfx::BaseEGLContext::GetDisplay() failed"; return false; |