diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2011-09-26 15:37:44 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-26 15:37:44 -0700 |
| commit | 5259655ef2fe61e0ad98eb315506754ecce8b2ac (patch) | |
| tree | 5a64fe770ffc3f623d3861435e20a228c094606f | |
| parent | 3b58743809928df91d08dfff82ba99fb83ef95e6 (diff) | |
| parent | 4fb354b62998af7a783f5137c9810eb584c40d9d (diff) | |
| download | external_webkit-5259655ef2fe61e0ad98eb315506754ecce8b2ac.zip external_webkit-5259655ef2fe61e0ad98eb315506754ecce8b2ac.tar.gz external_webkit-5259655ef2fe61e0ad98eb315506754ecce8b2ac.tar.bz2 | |
Merge "Egl sync code path should be only activated when we are in GpuUpload mode"
| -rw-r--r-- | Source/WebCore/platform/graphics/android/TransferQueue.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/TransferQueue.cpp b/Source/WebCore/platform/graphics/android/TransferQueue.cpp index dcc34d2..fa7f5b6 100644 --- a/Source/WebCore/platform/graphics/android/TransferQueue.cpp +++ b/Source/WebCore/platform/graphics/android/TransferQueue.cpp @@ -211,7 +211,8 @@ bool TransferQueue::readyForUpdate() // Disable this wait until we figure out why this didn't work on some // drivers b/5332112. #if 0 - if (m_currentDisplay != EGL_NO_DISPLAY) { + if (m_currentUploadType == GpuUpload + && m_currentDisplay != EGL_NO_DISPLAY) { // Check the GPU fence EGLSyncKHR syncKHR = m_transferQueue[getNextTransferQueueIndex()].m_syncKHR; if (syncKHR != EGL_NO_SYNC_KHR) |