Move AW renderer compositor context to gpu thread

gpu/command_buffer/service/async_pixel_transfer_manager_android.cc

 // Copyright 2013 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 "gpu/command_buffer/service/async_pixel_transfer_manager.h"
 
+#include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/sys_info.h"
 #include "gpu/command_buffer/service/async_pixel_transfer_manager_egl.h"
 #include "gpu/command_buffer/service/async_pixel_transfer_manager_idle.h"
 #include "gpu/command_buffer/service/async_pixel_transfer_manager_stub.h"
 #include "gpu/command_buffer/service/async_pixel_transfer_manager_sync.h"
+#include "gpu/command_buffer/service/gpu_switches.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_implementation.h"
 
 namespace gpu {
 namespace {
 
 enum GpuType {
   GPU_BROADCOM,
   GPU_IMAGINATION,
   GPU_NVIDIA_ES31,
@@ skipping 31 matching lines @@
 
   return GPU_OTHER;
 }
 
 bool AllowTransferThreadForGpu() {
   GpuType gpu = GetGpuType();
   return gpu != GPU_BROADCOM && gpu != GPU_IMAGINATION &&
          gpu != GPU_NVIDIA_ES31 && gpu != GPU_ADRENO_420;
 }
 
+bool TransferWithThreadedTextureMailboxes() {
+  base::CommandLine* cl = base::CommandLine::ForCurrentProcess();
+  // AsyncPixelTransferManagerEGL is not compatible with threaded texture
+  // mailbox sharing due to EGLImage limitations.
+  return cl->HasSwitch(switches::kEnableThreadedTextureMailboxes) &&
+         cl->HasSwitch(switches::kEnableAsyncPixelWithThreadedTextureMailboxes);

[no sievers, 2015/01/15 20:26:05]

Do we really need the other command line
(kEnableAsyncPixelWithThreadedTextureMailboxes)?

[boliu, 2015/01/21 02:08:01]

I wanted the new one as a fallback in case anything in the new paths breaks..

But I guess there is plenty of time until m42 branch. Just need to do a bit more
exhaustive testing before landing this. Removing the switch.

+}
+
 }
 
 // We only used threaded uploads when we can:
 // - Create EGLImages out of OpenGL textures (EGL_KHR_gl_texture_2D_image)
 // - Bind EGLImages to OpenGL textures (GL_OES_EGL_image)
 // - Use fences (to test for upload completion).
 // - The heap size is large enough.
 // TODO(kaanb|epenner): Remove the IsImagination() check pending the
 // resolution of crbug.com/249147
 // TODO(kaanb|epenner): Remove the IsLowEndDevice() check pending the
 // resolution of crbug.com/271929
 AsyncPixelTransferManager* AsyncPixelTransferManager::Create(
     gfx::GLContext* context) {
   DCHECK(context->IsCurrent(NULL));
+  bool threaded_texture_mailboxes = TransferWithThreadedTextureMailboxes();

[epenner, 2015/01/15 00:28:23]

Nit.

Mildly prefer reversing the bool to be "use_teximage2d_over_texsubimage2d", and
then having an additional variable here (to be self documenting):
bool use_teximage2d_over_texsubimage2d = !threaded_texture_mailboxes;

[boliu, 2015/01/21 02:08:01]

Done.

   switch (gfx::GetGLImplementation()) {
     case gfx::kGLImplementationEGLGLES2:
       DCHECK(context);
       if (!base::SysInfo::IsLowEndDevice() &&
           context->HasExtension("EGL_KHR_fence_sync") &&
           context->HasExtension("EGL_KHR_image") &&
           context->HasExtension("EGL_KHR_image_base") &&
           context->HasExtension("EGL_KHR_gl_texture_2D_image") &&
           context->HasExtension("GL_OES_EGL_image") &&
+          !threaded_texture_mailboxes &&
           AllowTransferThreadForGpu()) {
         TRACE_EVENT0("gpu", "AsyncPixelTransferManager_CreateWithThread");
         return new AsyncPixelTransferManagerEGL;
       }

[no sievers, 2015/01/15 20:26:05]

Can you put a comment that we do this because of how threaded mailboxes use
EGLimage and that causes problems with the orphaning on every upload if we used
texImage2D?

[boliu, 2015/01/21 02:08:01]

Done.

-      return new AsyncPixelTransferManagerIdle;
+      return new AsyncPixelTransferManagerIdle(threaded_texture_mailboxes);
     case gfx::kGLImplementationOSMesaGL: {
       TRACE_EVENT0("gpu", "AsyncPixelTransferManager_CreateIdle");
-      return new AsyncPixelTransferManagerIdle;
+      return new AsyncPixelTransferManagerIdle(false);
     }
     case gfx::kGLImplementationMockGL:
       return new AsyncPixelTransferManagerStub;
     default:
       NOTREACHED();
       return NULL;
   }
 }
 
 }  // namespace gpu