6 files changed, 0 insertions, 44 deletions
diff --git a/components/mus/gles2/command_buffer_driver.cc b/components/mus/gles2/command_buffer_driver.cc
index d6a0dae..a909517 100644
--- a/components/mus/gles2/command_buffer_driver.cc
+++ b/components/mus/gles2/command_buffer_driver.cc
@@ -128,8 +128,6 @@ bool CommandBufferDriver::Initialize(
   sync_point_client_ = gpu_state_->sync_point_manager()->CreateSyncPointClient(
       sync_point_order_data_, GetNamespaceID(), command_buffer_id_);
   decoder_->set_engine(scheduler_.get());
-  decoder_->SetWaitSyncPointCallback(base::Bind(
-      &CommandBufferDriver::OnWaitSyncPoint, base::Unretained(this)));
   decoder_->SetFenceSyncReleaseCallback(base::Bind(
       &CommandBufferDriver::OnFenceSyncRelease, base::Unretained(this)));
   decoder_->SetWaitFenceSyncCallback(base::Bind(
@@ -444,19 +442,6 @@ void CommandBufferDriver::OnUpdateVSyncParameters(
   }
 }
 
-bool CommandBufferDriver::OnWaitSyncPoint(uint32_t sync_point) {
-  DCHECK(CalledOnValidThread());
-  DCHECK(scheduler_->scheduled());
-  if (!sync_point)
-    return true;
-
-  scheduler_->SetScheduled(false);
-  gpu_state_->sync_point_manager()->AddSyncPointCallback(
-      sync_point, base::Bind(&gpu::GpuScheduler::SetScheduled,
-                             scheduler_->AsWeakPtr(), true));
-  return scheduler_->scheduled();
-}
-
 void CommandBufferDriver::OnFenceSyncRelease(uint64_t release) {
   DCHECK(CalledOnValidThread());
   if (!sync_point_client_->client_state()->IsFenceSyncReleased(release))
diff --git a/components/mus/gles2/command_buffer_driver.h b/components/mus/gles2/command_buffer_driver.h
index b65a2e2..08ee3c1 100644
--- a/components/mus/gles2/command_buffer_driver.h
+++ b/components/mus/gles2/command_buffer_driver.h
@@ -111,7 +111,6 @@ class CommandBufferDriver : base::NonThreadSafe {
   // Callbacks:
   void OnUpdateVSyncParameters(const base::TimeTicks timebase,
                                const base::TimeDelta interval);
-  bool OnWaitSyncPoint(uint32_t sync_point);
   void OnFenceSyncRelease(uint64_t release);
   bool OnWaitFenceSync(gpu::CommandBufferNamespace namespace_id,
                        uint64_t command_buffer_id,
diff --git a/components/mus/gles2/command_buffer_impl.cc b/components/mus/gles2/command_buffer_impl.cc
index 3666522..aa8fa3b 100644
--- a/components/mus/gles2/command_buffer_impl.cc
+++ b/components/mus/gles2/command_buffer_impl.cc
@@ -67,9 +67,6 @@ void CommandBufferImpl::DidLoseContext(uint32_t reason) {
 }
 
 CommandBufferImpl::~CommandBufferImpl() {
-  // Retire all sync points.
-  for (uint32_t sync_point : sync_points_)
-    gpu_state_->sync_point_manager()->RetireSyncPoint(sync_point);
   if (observer_)
     observer_->OnCommandBufferImplDestroyed();
 }
diff --git a/components/mus/gles2/command_buffer_impl.h b/components/mus/gles2/command_buffer_impl.h
index e4ea15b..cbe91cf 100644
--- a/components/mus/gles2/command_buffer_impl.h
+++ b/components/mus/gles2/command_buffer_impl.h
@@ -94,7 +94,6 @@ class CommandBufferImpl : public mojom::CommandBuffer {
   scoped_refptr<GpuState> gpu_state_;
   scoped_ptr<CommandBufferDriver> driver_;
   scoped_ptr<mojo::Binding<CommandBuffer>> binding_;
-  std::deque<uint32_t> sync_points_;
   CommandBufferImplObserver* observer_;
   mojom::CommandBufferLostContextObserverPtr loss_observer_;
 
diff --git a/components/mus/gles2/command_buffer_local.cc b/components/mus/gles2/command_buffer_local.cc
index 9d2deab..421c4c3 100644
--- a/components/mus/gles2/command_buffer_local.cc
+++ b/components/mus/gles2/command_buffer_local.cc
@@ -293,25 +293,6 @@ int32_t CommandBufferLocal::CreateGpuMemoryBufferImage(size_t width,
   return CreateImage(buffer->AsClientBuffer(), width, height, internal_format);
 }
 
-uint32_t CommandBufferLocal::InsertSyncPoint() {
-  NOTREACHED();
-  return 0;
-}
-
-uint32_t CommandBufferLocal::InsertFutureSyncPoint() {
-  NOTREACHED();
-  return 0;
-}
-
-void CommandBufferLocal::RetireSyncPoint(uint32_t sync_point) {
-  NOTREACHED();
-}
-
-void CommandBufferLocal::SignalSyncPoint(uint32_t sync_point,
-                                         const base::Closure& callback) {
-  NOTREACHED();
-}
-
 void CommandBufferLocal::SignalQuery(uint32_t query_id,
                                      const base::Closure& callback) {
   DCHECK(CalledOnValidThread());
diff --git a/components/mus/gles2/command_buffer_local.h b/components/mus/gles2/command_buffer_local.h
index 73e1482..4743523 100644
--- a/components/mus/gles2/command_buffer_local.h
+++ b/components/mus/gles2/command_buffer_local.h
@@ -83,11 +83,6 @@ class CommandBufferLocal : public gpu::CommandBuffer,
                                      size_t height,
                                      unsigned internal_format,
                                      unsigned usage) override;
-  uint32_t InsertSyncPoint() override;
-  uint32_t InsertFutureSyncPoint() override;
-  void RetireSyncPoint(uint32_t sync_point) override;
-  void SignalSyncPoint(uint32_t sync_point,
-                       const base::Closure& callback) override;
   void SignalQuery(uint32_t query_id, const base::Closure& callback) override;
   void SetLock(base::Lock*) override;
   bool IsGpuChannelLost() override;