exo: Implement zcr_linux_explicit_synchronization_v1

components/exo/surface.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/exo/surface.h"
 
 #include <utility>
 
 #include "base/callback_helpers.h"
 #include "base/logging.h"
@@ skipping 242 matching lines @@
 }
 
 void Surface::Attach(Buffer* buffer) {
   TRACE_EVENT1("exo", "Surface::Attach", "buffer",
                buffer ? buffer->GetSize().ToString() : "null");
 
   has_pending_contents_ = true;
   pending_buffer_.Reset(buffer ? buffer->AsWeakPtr() : base::WeakPtr<Buffer>());
 }
 
+void Surface::FenceAcquire(std::unique_ptr<gfx::GpuFence> fence) {
+  // A better representation would be good here.

[reveman, 2016/10/09 19:03:17]

TRACE_EVENT1(... "fence", !!fence) would be good enough I think

[fooishbar, 2016/10/12 15:41:56]

Done.

+  TRACE_EVENT1("exo", "Surface::FenceAcquire", "fence", fence.get());
+
+  pending_acquire_fence_ = std::move(fence);
+
+  DLOG(WARNING) << "Surface " << GetSurfaceId().ToString() << ": new acquire-fence";

[reveman, 2016/10/09 19:03:17]

Please remove this debug log before landing this change.

[fooishbar, 2016/10/12 15:41:55]

Done.

+}
+
 void Surface::Damage(const gfx::Rect& damage) {
   TRACE_EVENT1("exo", "Surface::Damage", "damage", damage.ToString());
 
   pending_damage_.op(gfx::RectToSkIRect(damage), SkRegion::kUnion_Op);
 }
 
 void Surface::RequestFrameCallback(const FrameCallback& callback) {
   TRACE_EVENT0("exo", "Surface::RequestFrameCallback");
 
   pending_frame_callbacks_.push_back(callback);
@@ skipping 186 matching lines @@
   has_pending_layer_changes_ = false;
 
   state_ = pending_state_;
   pending_state_.only_visible_on_secure_output = false;
 
   // We update contents if Attach() has been called since last commit.
   if (has_pending_contents_) {
     has_pending_contents_ = false;
 
     current_buffer_ = std::move(pending_buffer_);
+    acquire_fence_ = std::move(pending_acquire_fence_);
 
     UpdateResource(true);
   }
 
   cc::LocalFrameId old_local_frame_id = local_frame_id_;
   if (needs_commit_to_new_surface_ || local_frame_id_.is_null()) {
     needs_commit_to_new_surface_ = false;
     local_frame_id_ = factory_owner_->id_allocator_->GenerateId();
     factory_owner_->surface_factory_->Create(local_frame_id_);
   }
@@ skipping 229 matching lines @@
       layer_size, contents_surface_to_layer_scale, layer_size);
 }
 
 void Surface::UpdateResource(bool client_usage) {
   std::unique_ptr<cc::SingleReleaseCallback> texture_mailbox_release_callback;
 
   cc::TextureMailbox texture_mailbox;
   if (current_buffer_.buffer()) {
     texture_mailbox_release_callback =
         current_buffer_.buffer()->ProduceTextureMailbox(
-            &texture_mailbox, state_.only_visible_on_secure_output,
+            &texture_mailbox, std::move(acquire_fence_),

[reveman, 2016/10/09 19:03:17]

I think we need to keep the ownership of the acquire fence here in the surface
instance and just pass a raw pointer to ProduceTextureMailbox() in case we need
to produce a new texture mailbox. this can happen in rare circumstances when the
GPU process has crashed. 

[fooishbar, 2016/10/12 15:41:56]

Phew, that was my guess as to what probably made the most sense. OK great, I'll
do that for v2.

+            state_.only_visible_on_secure_output,
             client_usage);
   }
 
   if (texture_mailbox_release_callback) {
     cc::TransferableResource resource;
     resource.id = next_resource_id_++;
     resource.format = cc::RGBA_8888;
     resource.filter =
         texture_mailbox.nearest_neighbor() ? GL_NEAREST : GL_LINEAR;
     resource.size = texture_mailbox.size_in_pixels();
@@ skipping 120 matching lines @@
 
 int64_t Surface::GetPropertyInternal(const void* key,
                                      int64_t default_value) const {
   std::map<const void*, Value>::const_iterator iter = prop_map_.find(key);
   if (iter == prop_map_.end())
     return default_value;
   return iter->second.value;
 }
 
 }  // namespace exo