diff options
| author | kaanb@chromium.org <kaanb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-19 05:05:14 +0000 |
|---|---|---|
| committer | kaanb@chromium.org <kaanb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-19 05:05:14 +0000 |
| commit | 27a41fe44f2c76b55e75d351cd3b75d0e7aabdd7 (patch) | |
| tree | 74954f5cb00293c37c51f30b822ebc067aa9e81e /gpu | |
| parent | 16f2110ab00d1c05dc775b4a406e08525fb44c86 (diff) | |
| download | chromium_src-27a41fe44f2c76b55e75d351cd3b75d0e7aabdd7.zip chromium_src-27a41fe44f2c76b55e75d351cd3b75d0e7aabdd7.tar.gz chromium_src-27a41fe44f2c76b55e75d351cd3b75d0e7aabdd7.tar.bz2 | |
cc: Reland r233830. "Adding support for RGBA_4444 tile textures". r223830 had a bug in async_pixel_transfer_manager_egl.cc that wasn't directly related to the 4444 support. This patch includes the rest of the files in r223830. Changes to async_pixel_transfer_manager_egl.cc have been moved to the separate patch after fixing the bug: https://codereview.chromium.org/23533067/
BUG=272539
Review URL: https://chromiumcodereview.appspot.com/23447048
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224040 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/service/async_pixel_transfer_manager_android.cc | 6 |
1 files changed, 5 insertions, 1 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 8de7d58a..5aaabf4 100644 --- a/gpu/command_buffer/service/async_pixel_transfer_manager_android.cc +++ b/gpu/command_buffer/service/async_pixel_transfer_manager_android.cc @@ -4,6 +4,7 @@ #include "gpu/command_buffer/service/async_pixel_transfer_manager.h" +#include "base/android/sys_utils.h" #include "base/debug/trace_event.h" #include "gpu/command_buffer/service/async_pixel_transfer_manager_egl.h" #include "gpu/command_buffer/service/async_pixel_transfer_manager_idle.h" @@ -38,6 +39,8 @@ bool IsImagination() { // - 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) { TRACE_EVENT0("gpu", "AsyncPixelTransferManager::Create"); @@ -50,7 +53,8 @@ AsyncPixelTransferManager* AsyncPixelTransferManager::Create( context->HasExtension("EGL_KHR_gl_texture_2D_image") && context->HasExtension("GL_OES_EGL_image") && !IsBroadcom() && - !IsImagination()) { + !IsImagination() && + !base::android::SysUtils::IsLowEndDevice()) { return new AsyncPixelTransferManagerEGL; } LOG(INFO) << "Async pixel transfers not supported"; |