Re-land: cc: Implement shared worker contexts.

content/common/gpu/gpu_channel.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/gpu/gpu_channel.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
@@ skipping 52 matching lines @@
 // Once we trigger a preemption, the maximum duration that we will wait
 // before clearing the preemption.
 const int64 kMaxPreemptTimeMs = kVsyncIntervalMs;
 
 // Stop the preemption once the time for the longest pending IPC drops
 // below this threshold.
 const int64 kStopPreemptThresholdMs = kVsyncIntervalMs;
 
 const uint32_t kOutOfOrderNumber = static_cast<uint32_t>(-1);
 
+// Virtualize contexts by defualt on OS X to prevent performance regressions
+// when enabling FCM.
+// http://crbug.com/180463
+#if defined(OS_MACOSX)
+const bool kUseVirtualizedGLContext = true;
+#else
+const bool kUseVirtualizedGLContext = false;
+#endif
+
 }  // anonymous namespace
 
 struct GpuChannelMessage {
   uint32_t order_number;
   base::TimeTicks time_received;
   IPC::Message message;
 
   // TODO(dyen): Temporary sync point data, remove once new sync point lands.
   bool retire_sync_point;
   uint32 sync_point_number;
@@ skipping 675 matching lines @@
       stream_priority == GpuStreamPriority::REAL_TIME)
     return CREATE_COMMAND_BUFFER_FAILED;
 
   auto stream_it = streams_.find(stream_id);
   if (stream_it != streams_.end() &&
       stream_priority != GpuStreamPriority::INHERIT &&
       stream_priority != stream_it->second.priority()) {
     return CREATE_COMMAND_BUFFER_FAILED;
   }
 
-  // Virtualize compositor contexts on OS X to prevent performance regressions
-  // when enabling FCM.
-  // http://crbug.com/180463
-  bool use_virtualized_gl_context = false;
-#if defined(OS_MACOSX)
-  use_virtualized_gl_context = true;
-#endif
-
   scoped_ptr<GpuCommandBufferStub> stub(new GpuCommandBufferStub(
       this, task_runner_.get(), share_group, window, mailbox_manager_.get(),
       subscription_ref_set_.get(), pending_valuebuffer_state_.get(),
       gfx::Size(), disallowed_features_, init_params.attribs,
-      init_params.gpu_preference, use_virtualized_gl_context, stream_id,
-      route_id, surface_id, watchdog_, software_, init_params.active_url));
+      init_params.gpu_preference, kUseVirtualizedGLContext, stream_id, route_id,
+      surface_id, watchdog_, software_, init_params.active_url));
 
   if (preempted_flag_.get())
     stub->SetPreemptByFlag(preempted_flag_);
 
   if (!router_.AddRoute(route_id, stub.get())) {
     DLOG(ERROR) << "GpuChannel::CreateViewCommandBuffer(): "
                    "failed to add route";
     return CREATE_COMMAND_BUFFER_FAILED_AND_CHANNEL_LOST;
   }
 
@@ skipping 219 matching lines @@
       stream_priority != GpuStreamPriority::INHERIT &&
       stream_priority != stream_it->second.priority()) {
     *succeeded = false;
     return;
   }
 
   scoped_ptr<GpuCommandBufferStub> stub(new GpuCommandBufferStub(
       this, task_runner_.get(), share_group, gfx::GLSurfaceHandle(),
       mailbox_manager_.get(), subscription_ref_set_.get(),
       pending_valuebuffer_state_.get(), size, disallowed_features_,
-      init_params.attribs, init_params.gpu_preference, false,
+      init_params.attribs, init_params.gpu_preference, kUseVirtualizedGLContext,

[reveman, 2015/09/18 14:51:35]

Not sure exactly why non-virtualized contexts are causing drawing artifacts on
some mac machines when using GPU raster but we probably want to virtualize these
worker contexts for performance reasons anyhow. Do we need to limit this to
worker contexts or is it ok to virtualize all offscreen contexts like I'm doing
in this patch?

[ccameron, 2015/09/18 20:18:53]

When we initially switched to virtualized contexts, we virtualized only
compositor contexts because only they were causing problems WRT creating too
many GL contexts.

I have any good reason to keep doing things this way (kbr may have thoughts on
the issue, though). It may be wise to make this change in a separate patch, to
isolate failures / separate moving parts.

       init_params.stream_id, route_id, 0, watchdog_, software_,
       init_params.active_url));
 
   if (preempted_flag_.get())
     stub->SetPreemptByFlag(preempted_flag_);
 
   if (!router_.AddRoute(route_id, stub.get())) {
     DLOG(ERROR) << "GpuChannel::OnCreateOffscreenCommandBuffer(): "
                    "failed to add route";
     *succeeded = false;
@@ skipping 125 matching lines @@
 void GpuChannel::HandleUpdateValueState(
     unsigned int target, const gpu::ValueState& state) {
   pending_valuebuffer_state_->UpdateState(target, state);
 }
 
 uint32_t GpuChannel::GetUnprocessedOrderNum() const {
   return message_queue_->GetUnprocessedOrderNum();
 }
 
 }  // namespace content