From 4fb354b62998af7a783f5137c9810eb584c40d9d Mon Sep 17 00:00:00 2001 From: Teng-Hui Zhu Date: Mon, 26 Sep 2011 13:33:30 -0700 Subject: Egl sync code path should be only activated when we are in GpuUpload mode bug:5347539 Change-Id: I12b8b45792d5aa684295b897be308181a7d44631 --- Source/WebCore/platform/graphics/android/TransferQueue.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Source/WebCore/platform/graphics/android/TransferQueue.cpp') 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) -- cgit v1.1