Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(178)

Unified Diff: gpu/command_buffer/service/async_pixel_transfer_manager_android.cc

Issue 888903002: Revert of Move AW renderer compositor context to gpu thread (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: gpu/command_buffer/service/async_pixel_transfer_manager_android.cc
diff --git a/gpu/command_buffer/service/async_pixel_transfer_manager_android.cc b/gpu/command_buffer/service/async_pixel_transfer_manager_android.cc
index 9b6b7e212c602268a40f971a3e80b39d6dcc7cf1..2389dc157152b9b4d7663f94aa7aa5cb1322db4b 100644
--- a/gpu/command_buffer/service/async_pixel_transfer_manager_android.cc
+++ b/gpu/command_buffer/service/async_pixel_transfer_manager_android.cc
@@ -77,16 +77,13 @@
AsyncPixelTransferManager* AsyncPixelTransferManager::Create(
gfx::GLContext* context) {
DCHECK(context->IsCurrent(NULL));
- base::CommandLine* cl = base::CommandLine::ForCurrentProcess();
-
// Threaded mailbox uses EGLImage which conflicts with EGL uploader.
// The spec only allows one EGL image per sibling group, but currently the
// image handle cannot be shared between the threaded mailbox code and
// AsyncPixelTransferManagerEGL.
bool uses_threaded_mailboxes =
- cl->HasSwitch(switches::kEnableThreadedTextureMailboxes);
- // TexImage2D orphans the EGLImage used for threaded mailbox sharing.
- bool use_teximage2d_over_texsubimage2d = !uses_threaded_mailboxes;
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableThreadedTextureMailboxes);
switch (gfx::GetGLImplementation()) {
case gfx::kGLImplementationEGLGLES2:
DCHECK(context);
@@ -96,16 +93,15 @@
context->HasExtension("EGL_KHR_image_base") &&
context->HasExtension("EGL_KHR_gl_texture_2D_image") &&
context->HasExtension("GL_OES_EGL_image") &&
- !uses_threaded_mailboxes && AllowTransferThreadForGpu()) {
+ !uses_threaded_mailboxes &&
+ AllowTransferThreadForGpu()) {
TRACE_EVENT0("gpu", "AsyncPixelTransferManager_CreateWithThread");
return new AsyncPixelTransferManagerEGL;
}
- return new AsyncPixelTransferManagerIdle(
- use_teximage2d_over_texsubimage2d);
+ return new AsyncPixelTransferManagerIdle;
case gfx::kGLImplementationOSMesaGL: {
TRACE_EVENT0("gpu", "AsyncPixelTransferManager_CreateIdle");
- return new AsyncPixelTransferManagerIdle(
- use_teximage2d_over_texsubimage2d);
+ return new AsyncPixelTransferManagerIdle;
}
case gfx::kGLImplementationMockGL:
return new AsyncPixelTransferManagerStub;

Powered by Google App Engine
This is Rietveld 408576698