summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBo Liu <boliu@chromium.org>2015-01-23 14:42:41 -0800
committerBo Liu <boliu@chromium.org>2015-01-23 22:45:15 +0000
commit050e498e3594ac4b2a9b64f31cc0ddecb91ba03c (patch)
tree39ac6196921f6e47275f3caaccf889aea726e39f
parent0cd6e5785bb0bb2b3a0cb159999bc8bc4724ba0e (diff)
downloadchromium_src-050e498e3594ac4b2a9b64f31cc0ddecb91ba03c.zip
chromium_src-050e498e3594ac4b2a9b64f31cc0ddecb91ba03c.tar.gz
chromium_src-050e498e3594ac4b2a9b64f31cc0ddecb91ba03c.tar.bz2
gpu: Allow virtual context for in-process gpu thread
Virtual context is turned on according to FeatureInfo::Workarounds. Note that this doesn't work on Android WebView until crbug.com/450396 is fixed. Review URL: https://codereview.chromium.org/828083005 Cr-Commit-Position: refs/heads/master@{#312308} (cherry picked from commit d6552661356cafdc55df5e5d6abf378c9065c04c) TBR=boliu@chromium.org BUG=451528 Review URL: https://codereview.chromium.org/874483006 Cr-Commit-Position: refs/branch-heads/2272@{#100} Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
-rw-r--r--gpu/command_buffer/service/in_process_command_buffer.cc6
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 c312345..c671073 100644
--- a/gpu/command_buffer/service/in_process_command_buffer.cc
+++ b/gpu/command_buffer/service/in_process_command_buffer.cc
@@ -437,7 +437,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(