From fc84221d91cf6ce4321a4d64179806473efc1a51 Mon Sep 17 00:00:00 2001 From: "leandrogracia@chromium.org" Date: Thu, 21 Jul 2011 15:07:06 +0000 Subject: Revert 93393 - 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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93397 0039d316-1c4b-4281-b951-d872f2087c98 --- content/gpu/gpu_info_collector.cc | 2 +- content/gpu/gpu_info_collector_win.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'content/gpu') diff --git a/content/gpu/gpu_info_collector.cc b/content/gpu/gpu_info_collector.cc index cd0918c..93cd767 100644 --- a/content/gpu/gpu_info_collector.cc +++ b/content/gpu/gpu_info_collector.cc @@ -20,7 +20,7 @@ namespace { scoped_refptr InitializeGLSurface() { scoped_refptr surface( - gfx::GLSurface::CreateOffscreenGLSurface(false, gfx::Size(1, 1))); + gfx::GLSurface::CreateOffscreenGLSurface(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 dfae814..4e32805 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( - gfx::GLSurfaceEGL::GetHardwareDisplay()); + gfx::GLSurfaceEGL::GetDisplay()); if (!display) { LOG(ERROR) << "gfx::BaseEGLContext::GetDisplay() failed"; return false; -- cgit v1.1