Implemented new fence syncs which replaces the old sync points.

components/mus/gles2/command_buffer_local.cc

 // Copyright 2015 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 "components/mus/gles2/command_buffer_local.h"
 
 #include "base/bind.h"
 #include "components/mus/gles2/command_buffer_local_client.h"
 #include "components/mus/gles2/gpu_memory_tracker.h"
 #include "components/mus/gles2/mojo_gpu_memory_buffer.h"
@@ skipping 14 matching lines @@
 namespace mus {
 
 const unsigned int GL_MAP_CHROMIUM = 0x78F1;
 
 CommandBufferLocal::CommandBufferLocal(CommandBufferLocalClient* client,
                                        gfx::AcceleratedWidget widget,
                                        const scoped_refptr<GpuState>& gpu_state)
     : widget_(widget),
       gpu_state_(gpu_state),
       client_(client),
+      next_fence_sync_release_(1),
       weak_factory_(this) {}
 
 CommandBufferLocal::~CommandBufferLocal() {
   command_buffer_.reset();
   if (decoder_.get()) {
     bool have_context = decoder_->GetGLContext()->MakeCurrent(surface_.get());
     decoder_->Destroy(have_context);
     decoder_.reset();
   }
 }
@@ skipping 40 matching lines @@
   DCHECK(result);
 
   decoder_.reset(::gpu::gles2::GLES2Decoder::Create(context_group.get()));
   scheduler_.reset(new gpu::GpuScheduler(command_buffer_.get(), decoder_.get(),
                                          decoder_.get()));
   decoder_->set_engine(scheduler_.get());
   decoder_->SetResizeCallback(
       base::Bind(&CommandBufferLocal::OnResize, base::Unretained(this)));
   decoder_->SetWaitSyncPointCallback(
       base::Bind(&CommandBufferLocal::OnWaitSyncPoint, base::Unretained(this)));
+  decoder_->SetFenceSyncReleaseCallback(
+      base::Bind(&CommandBufferLocal::OnFenceSyncRelease,
+                 base::Unretained(this)));
+  decoder_->SetWaitFenceSyncCallback(
+      base::Bind(&CommandBufferLocal::OnWaitFenceSync,
+                 base::Unretained(this)));
 
   gpu::gles2::DisallowedFeatures disallowed_features;
 
   // TODO(piman): attributes.
   std::vector<int32> attrib_vector;
   if (!decoder_->Initialize(surface_, context_, false /* offscreen */,
                             gfx::Size(1, 1), disallowed_features,
                             attrib_vector))
     return false;
 
@@ skipping 108 matching lines @@
 gpu::CommandBufferNamespace CommandBufferLocal::GetNamespaceID() const {
   NOTIMPLEMENTED();
   return gpu::CommandBufferNamespace::INVALID;
 }
 
 uint64_t CommandBufferLocal::GetCommandBufferID() const {
   NOTIMPLEMENTED();
   return 0;
 }
 
+uint32_t CommandBufferLocal::GenerateFenceSyncRelease() {
+  return next_fence_sync_release_++;
+}
+
+bool CommandBufferLocal::IsFenceSyncRelease(uint32_t release) {
+  return release > 0 && release < next_fence_sync_release_;
+}
+
+bool CommandBufferLocal::IsFenceSyncFlushed(uint32_t release) {
+  return IsFenceSyncRelease(release);
+}
+
 void CommandBufferLocal::PumpCommands() {
   if (!decoder_->MakeCurrent()) {
     command_buffer_->SetContextLostReason(decoder_->GetContextLostReason());
     command_buffer_->SetParseError(::gpu::error::kLostContext);
     return;
   }
   scheduler_->PutChanged();
 }
 
 void CommandBufferLocal::OnResize(gfx::Size size, float scale_factor) {
@@ skipping 13 matching lines @@
     return true;
   if (gpu_state_->sync_point_manager()->IsSyncPointRetired(sync_point))
     return true;
   scheduler_->SetScheduled(false);
   gpu_state_->sync_point_manager()->AddSyncPointCallback(
       sync_point, base::Bind(&CommandBufferLocal::OnSyncPointRetired,
                              weak_factory_.GetWeakPtr()));
   return scheduler_->scheduled();
 }
 
+void CommandBufferLocal::OnFenceSyncRelease(uint32_t release) {
+  // TODO(dyen): Implement once CommandBufferID has been figured out and
+  // we have a SyncPointClient. It would probably look like what is commented
+  // out below:
+  // if (!sync_point_client_->client_state()->IsFenceSyncReleased(release))
+  //   sync_point_client_->ReleaseFenceSync(release);
+  NOTIMPLEMENTED();
+}
+
+bool CommandBufferLocal::OnWaitFenceSync(
+    gpu::CommandBufferNamespace namespace_id,
+    uint64_t command_buffer_id,
+    uint32_t release) {
+  gpu::SyncPointManager* sync_point_manager = gpu_state_->sync_point_manager();
+  DCHECK(sync_point_manager);
+
+  scoped_refptr<gpu::SyncPointClientState> release_state =
+      sync_point_manager->GetSyncPointClientState(namespace_id,
+                                                  command_buffer_id);
+
+  if (!release_state.get())

[dcheng, 2015/09/28 07:39:33]

No .get()

[David Yen, 2015/09/28 17:38:18]

Done.

+    return true;
+
+  if (release_state->IsFenceSyncReleased(release))
+    return true;
+
+  // TODO(dyen): Implement once CommandBufferID has been figured out and
+  // we have a SyncPointClient. It would probably look like what is commented
+  // out below:
+  // sync_point_client_->Wait(
+  //     release_state,
+  //     release,
+  //     base::Bind(&CommandBufferLocal::OnSyncPointRetired,
+  //                weak_factory_.GetWeakPtr()));
+  NOTIMPLEMENTED();
+  return scheduler_->scheduled();
+}
+
 void CommandBufferLocal::OnParseError() {
   gpu::CommandBuffer::State state = command_buffer_->GetLastState();
   OnContextLost(state.context_lost_reason);
 }
 
 void CommandBufferLocal::OnContextLost(uint32_t reason) {
   if (client_)
     client_->DidLoseContext();
 }
 
 void CommandBufferLocal::OnSyncPointRetired() {
   scheduler_->SetScheduled(true);
 }
 
 }  // namespace mus