Update GL mailbox synchronization to Chromium 49v5.7.0-alpha1

Chromium 49 switched to using SyncToken, making our old model based on
sync-points obsolete. This patch rewrites our syncing to instead take
advantage of new Chromium API for waiting on sync tokens. It also
moves the creation of the GLFences we use out of Chromium.

Task-number: QTBUG-51173
Change-Id: I04d726d4bc81bf6b7fe39bb2b5507e84a0b6991e
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

1 files changed, 0 insertions, 25 deletions

diff --git a/src/core/chromium_gpu_helper.cpp b/src/core/chromium_gpu_helper.cpp
index c955837b8..349506dbd 100644
--- a/src/core/chromium_gpu_helper.cpp
+++ b/src/core/chromium_gpu_helper.cpp
@@ -57,25 +57,6 @@
 #include "content/common/gpu/stream_texture_qnx.h"
 #endif
 
-static void addSyncPointCallbackDelegate(gpu::SyncPointManager *syncPointManager, uint32 sync_point, const base::Closure& callback)
-{
-    syncPointManager->AddSyncPointCallback(sync_point, callback);
-}
-
-QMap<uint32, gfx::TransferableFence> transferFences()
-{
-    QMap<uint32, gfx::TransferableFence> ret;
-    content::GpuChannelManager *gpuChannelManager = content::GpuChildThread::instance()->ChannelManager();
-    content::GpuChannelManager::SyncPointGLFences::iterator it = gpuChannelManager->sync_point_gl_fences_.begin();
-    content::GpuChannelManager::SyncPointGLFences::iterator end = gpuChannelManager->sync_point_gl_fences_.end();
-    for (; it != end; ++it) {
-        ret[it->first] = it->second->Transfer();
-        delete it->second;
-    }
-    gpuChannelManager->sync_point_gl_fences_.clear();
-    return ret;
-}
-
 base::MessageLoop *gpu_message_loop()
 {
     return content::GpuChildThread::instance()->message_loop();
@@ -87,12 +68,6 @@ gpu::SyncPointManager *sync_point_manager()
     return gpuChannelManager->sync_point_manager();
 }
 
-void AddSyncPointCallbackOnGpuThread(base::MessageLoop *gpuMessageLoop, gpu::SyncPointManager *syncPointManager, uint32 sync_point, const base::Closure& callback)
-{
-    // We need to set our callback from the GPU thread, where the SyncPointManager lives.
-    gpuMessageLoop->PostTask(FROM_HERE, base::Bind(&addSyncPointCallbackDelegate, syncPointManager, sync_point, callback));
-}
-
 gpu::gles2::MailboxManager *mailbox_manager()
 {
     content::GpuChannelManager *gpuChannelManager = content::GpuChildThread::instance()->ChannelManager();