diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2011-09-26 13:33:30 -0700 |
|---|---|---|
| committer | Teng-Hui Zhu <ztenghui@google.com> | 2011-09-26 13:42:11 -0700 |
| commit | 4fb354b62998af7a783f5137c9810eb584c40d9d (patch) | |
| tree | d49320319ff2402033843eca877afd07c050bdeb /Source/WebCore/platform/graphics/android/TransferQueue.cpp | |
| parent | 64df20b404601e03242b00707d8d2cd299e893d1 (diff) | |
| download | external_webkit-4fb354b62998af7a783f5137c9810eb584c40d9d.zip external_webkit-4fb354b62998af7a783f5137c9810eb584c40d9d.tar.gz external_webkit-4fb354b62998af7a783f5137c9810eb584c40d9d.tar.bz2 | |
Egl sync code path should be only activated when we are in GpuUpload mode
bug:5347539
Change-Id: I12b8b45792d5aa684295b897be308181a7d44631
Diffstat (limited to 'Source/WebCore/platform/graphics/android/TransferQueue.cpp')
| -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) |