diff options
| author | boliu <boliu@chromium.org> | 2015-01-21 03:04:55 -0800 |
|---|---|---|
| committer | Bo Liu <boliu@google.com> | 2015-01-22 22:01:21 -0800 |
| commit | 86ae9e78f67cc23d71b432d4fadab78889e9b837 (patch) | |
| tree | 894c2d16adee2148ed681ae9ab165cc4caa270f8 | |
| parent | 5b55ba83cd285de6db26c1b73c0fb5e530560602 (diff) | |
| download | chromium_org-86ae9e78f67cc23d71b432d4fadab78889e9b837.tar.gz | |
Cherry-pick: gpu: Allow virtual context for in-process gpu thread
Clean cherry-pick of chromium
crrev.com/d6552661356cafdc55df5e5d6abf378c9065c04c
Note crbug.com/450396 not an issue in m39.
BUG: 18926944
Original description:
Virtual context is turned on according to FeatureInfo::Workarounds.
Note that this doesn't work on Android WebView until crbug.com/450396
is fixed.
Change-Id: Ib6c997f3929293023288188c4766c1a4b032c407
| -rw-r--r-- | gpu/command_buffer/service/in_process_command_buffer.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gpu/command_buffer/service/in_process_command_buffer.cc b/gpu/command_buffer/service/in_process_command_buffer.cc index ed259e43c3..a27dc2b32b 100644 --- a/gpu/command_buffer/service/in_process_command_buffer.cc +++ b/gpu/command_buffer/service/in_process_command_buffer.cc @@ -371,7 +371,11 @@ bool InProcessCommandBuffer::InitializeOnGpuThread( return false; } - if (service_->UseVirtualizedGLContexts()) { + if (service_->UseVirtualizedGLContexts() || + decoder_->GetContextGroup() + ->feature_info() + ->workarounds() + .use_virtualized_gl_contexts) { context_ = gl_share_group_->GetSharedContext(); if (!context_.get()) { context_ = gfx::GLContext::CreateGLContext( |