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 /gpu/demos | |
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 'gpu/demos')
-rw-r--r-- | gpu/demos/framework/window.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gpu/demos/framework/window.cc b/gpu/demos/framework/window.cc index 30ba86c..f609a55 100644 --- a/gpu/demos/framework/window.cc +++ b/gpu/demos/framework/window.cc @@ -61,7 +61,7 @@ bool Window::CreateRenderContext(gfx::PluginWindowHandle hwnd) { GpuScheduler* gpu_scheduler( new GpuScheduler(command_buffer.get(), NULL, NULL)); - if (!gpu_scheduler->Initialize(hwnd, gfx::Size(), + if (!gpu_scheduler->Initialize(hwnd, gfx::Size(), false, gpu::gles2::DisallowedExtensions(), NULL, std::vector<int32>(), NULL)) { |