summaryrefslogtreecommitdiffstats
path: root/gpu/command_buffer
diff options
context:
space:
mode:
authorepenner@chromium.org <epenner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-02 21:16:44 +0000
committerepenner@chromium.org <epenner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-02 21:16:44 +0000
commit9b7e1dee24fca3d38f6aff0f0810ea60198d8a4a (patch)
treef770f7c18ca15beb2409c9ee153d0a3d246d98ad /gpu/command_buffer
parent32cb0dff228821b69d5d05135c07c41a267cfbe8 (diff)
downloadchromium_src-9b7e1dee24fca3d38f6aff0f0810ea60198d8a4a.zip
chromium_src-9b7e1dee24fca3d38f6aff0f0810ea60198d8a4a.tar.gz
chromium_src-9b7e1dee24fca3d38f6aff0f0810ea60198d8a4a.tar.bz2
GPU: Use idle-uploads for new NVidia drivers.
To be efficient threaded we need fences, but we should disable the threaded version until we have them. BUG=369316 NOTRY=true No try since this is Android only and the failing test is on linux. Review URL: https://codereview.chromium.org/262803009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267920 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer')
-rw-r--r--gpu/command_buffer/service/async_pixel_transfer_manager_android.cc9
1 files changed, 9 insertions, 0 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 5795106..a2b2255 100644
--- a/gpu/command_buffer/service/async_pixel_transfer_manager_android.cc
+++ b/gpu/command_buffer/service/async_pixel_transfer_manager_android.cc
@@ -30,6 +30,14 @@ bool IsImagination() {
return false;
}
+bool IsNvidia31() {
+ const char* vendor = reinterpret_cast<const char*>(glGetString(GL_VENDOR));
+ const char* version = reinterpret_cast<const char*>(glGetString(GL_VERSION));
+ return vendor && version &&
+ std::string(vendor).find("NVIDIA") != std::string::npos &&
+ std::string(version).find("OpenGL ES 3.1") != std::string::npos;
+}
+
}
// We only used threaded uploads when we can:
@@ -54,6 +62,7 @@ AsyncPixelTransferManager* AsyncPixelTransferManager::Create(
context->HasExtension("GL_OES_EGL_image") &&
!IsBroadcom() &&
!IsImagination() &&
+ !IsNvidia31() &&
!base::android::SysUtils::IsLowEndDevice()) {
return new AsyncPixelTransferManagerEGL;
}