diff options
| author | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-13 03:05:54 +0000 |
|---|---|---|
| committer | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-13 03:05:54 +0000 |
| commit | f4bbb49e49bfebc978e115348e37416d73fceb97 (patch) | |
| tree | b1ac20f1644a0938a63f5547b642b420c8475fcc | |
| parent | 0980292037b9b6e34c9517fe508c8b3f9d473397 (diff) | |
| download | chromium_src-f4bbb49e49bfebc978e115348e37416d73fceb97.zip chromium_src-f4bbb49e49bfebc978e115348e37416d73fceb97.tar.gz chromium_src-f4bbb49e49bfebc978e115348e37416d73fceb97.tar.bz2 | |
Enable async upload egl with mailbox synchronizer
With the workaround in r286800, mailbox synchronizer skips tile
textures, so is compatible with async transfer egl.
This is a partial revert of r286501.
BUG=399311
Review URL: https://codereview.chromium.org/463563002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289172 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | gpu/command_buffer/service/async_pixel_transfer_manager_android.cc | 4 |
1 files changed, 1 insertions, 3 deletions
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 618bd0e..ba1ad2e 100644 --- a/gpu/command_buffer/service/async_pixel_transfer_manager_android.cc +++ b/gpu/command_buffer/service/async_pixel_transfer_manager_android.cc @@ -10,7 +10,6 @@ #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/mailbox_synchronizer.h" #include "ui/gl/gl_context.h" #include "ui/gl/gl_implementation.h" @@ -64,8 +63,7 @@ AsyncPixelTransferManager* AsyncPixelTransferManager::Create( !IsBroadcom() && !IsImagination() && !IsNvidia31() && - !base::SysInfo::IsLowEndDevice() && - !gles2::MailboxSynchronizer::GetInstance()) { + !base::SysInfo::IsLowEndDevice()) { return new AsyncPixelTransferManagerEGL; } return new AsyncPixelTransferManagerIdle; |