Implemented new fence syncs which replaces the old sync points.

gpu/command_buffer/service/mailbox_manager_sync.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/command_buffer/service/mailbox_manager_sync.h"
 
 #include <algorithm>
 #include <queue>
 
 #include "base/memory/linked_ptr.h"
 #include "base/synchronization/lock.h"
 #include "gpu/command_buffer/service/texture_manager.h"
 #include "ui/gl/gl_fence.h"
 #include "ui/gl/gl_implementation.h"
 
 #if !defined(OS_MACOSX)
 #include "ui/gl/gl_fence_egl.h"
 #endif
 
 namespace gpu {
 namespace gles2 {
 
 namespace {
 
 base::LazyInstance<base::Lock> g_lock = LAZY_INSTANCE_INITIALIZER;
 
-typedef std::map<uint32, linked_ptr<gfx::GLFence>> SyncPointToFenceMap;
-base::LazyInstance<SyncPointToFenceMap> g_sync_point_to_fence =
+typedef std::pair<int, std::pair<uint32, uint32>> SyncToken;

[piman, 2015/09/10 23:55:32]

Can you use SyncToken from gles2_cmd_format.h instead?

+typedef std::map<SyncToken, linked_ptr<gfx::GLFence>> SyncTokenToFenceMap;
+base::LazyInstance<SyncTokenToFenceMap> g_sync_point_to_fence =
     LAZY_INSTANCE_INITIALIZER;
 #if !defined(OS_MACOSX)
-base::LazyInstance<std::queue<SyncPointToFenceMap::iterator>> g_sync_points =
+base::LazyInstance<std::queue<SyncTokenToFenceMap::iterator>> g_sync_points =
     LAZY_INSTANCE_INITIALIZER;
 #endif
 
-void CreateFenceLocked(uint32 sync_point) {
+void CreateFenceLocked(int channel_client_id, uint32 route_id, uint32 release) {
   g_lock.Get().AssertAcquired();
   if (gfx::GetGLImplementation() == gfx::kGLImplementationMockGL)
     return;
 
 #if !defined(OS_MACOSX)
-  std::queue<SyncPointToFenceMap::iterator>& sync_points = g_sync_points.Get();
-  SyncPointToFenceMap& sync_point_to_fence = g_sync_point_to_fence.Get();
-  if (sync_point) {
+  std::queue<SyncTokenToFenceMap::iterator>& sync_points = g_sync_points.Get();
+  SyncTokenToFenceMap& sync_point_to_fence = g_sync_point_to_fence.Get();
+  if (release) {
     while (!sync_points.empty() &&
            sync_points.front()->second->HasCompleted()) {
       sync_point_to_fence.erase(sync_points.front());
       sync_points.pop();
     }
     // Need to use EGL fences since we are likely not in a single share group.
     linked_ptr<gfx::GLFence> fence(make_linked_ptr(new gfx::GLFenceEGL));
     if (fence.get()) {
-      std::pair<SyncPointToFenceMap::iterator, bool> result =
-          sync_point_to_fence.insert(std::make_pair(sync_point, fence));
+      const SyncToken sync_token =
+          std::make_pair(channel_client_id, std::make_pair(route_id, release));
+      std::pair<SyncTokenToFenceMap::iterator, bool> result =
+          sync_point_to_fence.insert(std::make_pair(sync_token, fence));
       DCHECK(result.second);
       sync_points.push(result.first);
     }
     DCHECK(sync_points.size() == sync_point_to_fence.size());
   }
 #endif
 }
 
-void AcquireFenceLocked(uint32 sync_point) {
+void AcquireFenceLocked(int channel_client_id,
+                        uint32 route_id,
+                        uint32 release) {
+#if !defined(OS_MACOSX)
   g_lock.Get().AssertAcquired();
-  SyncPointToFenceMap::iterator fence_it =
-      g_sync_point_to_fence.Get().find(sync_point);
+  const SyncToken sync_token =
+      std::make_pair(channel_client_id, std::make_pair(route_id, release));
+
+  SyncTokenToFenceMap::iterator fence_it =
+      g_sync_point_to_fence.Get().find(sync_token);
   if (fence_it != g_sync_point_to_fence.Get().end()) {
     fence_it->second->ServerWait();
   }
+#endif
 }
 
 static const unsigned kNewTextureVersion = 1;
 
 }  // anonymous namespace
 
 base::LazyInstance<MailboxManagerSync::TextureGroup::MailboxToGroupMap>
     MailboxManagerSync::TextureGroup::mailbox_to_group_ =
         LAZY_INSTANCE_INITIALIZER;
 
@@ skipping 208 matching lines @@
   DCHECK_IMPLIES(gl_image, image_buffer.get());
   if (gl_image && !image_buffer->IsClient(gl_image)) {
     LOG(ERROR) << "MailboxSync: Incompatible attachment";
     return;
   }
 
   group->SetDefinition(TextureDefinition(texture, ++group_ref->version,
                                          gl_image ? image_buffer : NULL));
 }
 
-void MailboxManagerSync::PushTextureUpdates(uint32 sync_point) {
+void MailboxManagerSync::PushTextureUpdates(int channel_client_id,
+                                            uint32 route_id,
+                                            uint32 release) {
   base::AutoLock lock(g_lock.Get());
 
   for (TextureToGroupMap::iterator it = texture_to_group_.begin();
        it != texture_to_group_.end(); it++) {
     UpdateDefinitionLocked(it->first, &it->second);
   }
-  CreateFenceLocked(sync_point);
+  CreateFenceLocked(channel_client_id, route_id, release);
 }
 
-void MailboxManagerSync::PullTextureUpdates(uint32 sync_point) {
+void MailboxManagerSync::PullTextureUpdates(int channel_client_id,
+                                            uint32 route_id,
+                                            uint32 release) {
   using TextureUpdatePair = std::pair<Texture*, TextureDefinition>;
   std::vector<TextureUpdatePair> needs_update;
   {
     base::AutoLock lock(g_lock.Get());
-    AcquireFenceLocked(sync_point);
+    AcquireFenceLocked(channel_client_id, route_id, release);
 
     for (TextureToGroupMap::iterator it = texture_to_group_.begin();
          it != texture_to_group_.end(); it++) {
       const TextureDefinition& definition = it->second.group->GetDefinition();
       Texture* texture = it->first;
       unsigned& texture_version = it->second.version;
       if (texture_version == definition.version() ||
           definition.IsOlderThan(texture_version))
         continue;
       texture_version = definition.version();
       needs_update.push_back(TextureUpdatePair(texture, definition));
     }
   }
 
   if (!needs_update.empty()) {
     ScopedUpdateTexture scoped_update_texture;
     for (const TextureUpdatePair& pair : needs_update) {
       pair.second.UpdateTexture(pair.first);
     }
   }
 }
 
 }  // namespace gles2
 }  // namespace gpu