Change ozone async swap to fix overlay scheduling

ui/gl/gl_surface_ozone.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 "ui/gl/gl_surface.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/worker_pool.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_image.h"
 #include "ui/gl/gl_image_linux_dma_buffer.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface_egl.h"
 #include "ui/gl/gl_surface_osmesa.h"
 #include "ui/gl/gl_surface_stub.h"
@@ skipping 93 matching lines @@
 class GL_EXPORT GLSurfaceOzoneSurfaceless : public SurfacelessEGL {
  public:
   GLSurfaceOzoneSurfaceless(scoped_ptr<ui::SurfaceOzoneEGL> ozone_surface,
                             AcceleratedWidget widget)
       : SurfacelessEGL(gfx::Size()),
         ozone_surface_(ozone_surface.Pass()),
         widget_(widget),
         has_implicit_external_sync_(
             HasEGLExtension("EGL_ARM_implicit_external_sync")),
         last_swap_buffers_result_(true),
-        weak_factory_(this) {}
+        weak_factory_(this) {
+    unsubmitted_frames_.push_back(new PendingFrame());
+  }
 
   bool Initialize() override {
     if (!SurfacelessEGL::Initialize())
       return false;
     vsync_provider_ = ozone_surface_->CreateVSyncProvider();
     if (!vsync_provider_)
       return false;
     return true;
   }
   bool Resize(const gfx::Size& size) override {
@@ skipping 11 matching lines @@
       if (!fence)
         return false;
 
       EGLDisplay display = GetDisplay();
       WaitForFence(display, fence);
       eglDestroySyncKHR(display, fence);
     } else if (ozone_surface_->IsUniversalDisplayLinkDevice()) {
       glFinish();
     }
 
+    unsubmitted_frames_.back()->ScheduleOverlayPlanes(widget_);
+    unsubmitted_frames_.back()->overlays.clear();
+
     return ozone_surface_->OnSwapBuffers();
   }
   bool ScheduleOverlayPlane(int z_order,
                             OverlayTransform transform,
                             GLImage* image,
                             const Rect& bounds_rect,
                             const RectF& crop_rect) override {
-    return image->ScheduleOverlayPlane(
-        widget_, z_order, transform, bounds_rect, crop_rect);
+    unsubmitted_frames_.back()->overlays.push_back(PendingFrame::Overlay(
+        z_order, transform, image, bounds_rect, crop_rect));
+    return true;
   }
   bool IsOffscreen() override { return false; }
   VSyncProvider* GetVSyncProvider() override { return vsync_provider_.get(); }
   bool SupportsPostSubBuffer() override { return true; }
   bool PostSubBuffer(int x, int y, int width, int height) override {
     // The actual sub buffer handling is handled at higher layers.
     SwapBuffers();
     return true;
   }
   bool SwapBuffersAsync(const SwapCompletionCallback& callback) override {
     glFlush();
     // TODO: the following should be replaced by a per surface flush as it gets
     // implemented in GL drivers.
     if (has_implicit_external_sync_) {
       // If last swap failed, don't try to schedule new ones.
       if (!last_swap_buffers_result_) {
         last_swap_buffers_result_ = true;
         return false;
       }
 
       EGLSyncKHR fence = InsertFence();
       if (!fence)
         return false;
 
       base::Closure fence_wait_task =
           base::Bind(&WaitForFence, GetDisplay(), fence);
 
+      PendingFrame* frame = unsubmitted_frames_.back();
+      frame->callback = callback;
       base::Closure fence_retired_callback =
           base::Bind(&GLSurfaceOzoneSurfaceless::FenceRetired,
-                     weak_factory_.GetWeakPtr(), fence, callback);
+                     weak_factory_.GetWeakPtr(), fence, frame);
 
       base::WorkerPool::PostTaskAndReply(FROM_HERE, fence_wait_task,
                                          fence_retired_callback, false);
+      unsubmitted_frames_.push_back(new PendingFrame());
       return true;
     } else if (ozone_surface_->IsUniversalDisplayLinkDevice()) {
       glFinish();
     }

[alexst (slow to review), 2015/04/02 19:48:53]

I think you are missing:

unsubmitted_frames_.back()->ScheduleOverlayPlanes(widget_);
unsubmitted_frames_.back()->overlays.clear();

On intel there is no sync ext, but we need to schedule overlays anyway.

     return ozone_surface_->OnSwapBuffersAsync(callback);
   }
   bool PostSubBufferAsync(int x,
                           int y,
                           int width,
                           int height,
                           const SwapCompletionCallback& callback) override {
     return SwapBuffersAsync(callback);
   }
 
  protected:
+  struct PendingFrame {
+    struct Overlay {
+      Overlay(int z_order,
+              OverlayTransform transform,
+              GLImage* image,
+              const Rect& bounds_rect,
+              const RectF& crop_rect)
+          : z_order(z_order),
+            transform(transform),
+            image(image),
+            bounds_rect(bounds_rect),
+            crop_rect(crop_rect) {}
+
+      bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget) const {
+        return image->ScheduleOverlayPlane(widget, z_order, transform,
+                                           bounds_rect, crop_rect);
+      }
+
+      int z_order;
+      OverlayTransform transform;
+      scoped_refptr<GLImage> image;
+      const Rect& bounds_rect;
+      const RectF& crop_rect;
+    };
+
+    PendingFrame() : ready(false) {}
+
+    bool ScheduleOverlayPlanes(gfx::AcceleratedWidget widget) {
+      for (const auto& overlay : overlays)
+        if (!overlay.ScheduleOverlayPlane(widget))
+          return false;
+      return true;
+    }
+    bool ready;
+    std::vector<Overlay> overlays;
+    SwapCompletionCallback callback;
+  };
+
   ~GLSurfaceOzoneSurfaceless() override {
     Destroy();  // EGL surface must be destroyed before SurfaceOzone
   }
 
+  void SubmitFrames() {
+    while (!unsubmitted_frames_.empty() && unsubmitted_frames_.front()->ready) {
+      PendingFrame* frame = unsubmitted_frames_.front();
+      last_swap_buffers_result_ =
+          last_swap_buffers_result_ && frame->ScheduleOverlayPlanes(widget_) &&
+          ozone_surface_->OnSwapBuffersAsync(frame->callback);
+      unsubmitted_frames_.erase(unsubmitted_frames_.begin());
+    }
+  }
+
   EGLSyncKHR InsertFence() {
     const EGLint attrib_list[] = {EGL_SYNC_CONDITION_KHR,
                                   EGL_SYNC_PRIOR_COMMANDS_IMPLICIT_EXTERNAL_ARM,
                                   EGL_NONE};
     return eglCreateSyncKHR(GetDisplay(), EGL_SYNC_FENCE_KHR, attrib_list);
   }
 
-  void FenceRetired(EGLSyncKHR fence, const SwapCompletionCallback& callback) {
+  void FenceRetired(EGLSyncKHR fence, PendingFrame* frame) {
     eglDestroySyncKHR(GetDisplay(), fence);
-    last_swap_buffers_result_ = ozone_surface_->OnSwapBuffersAsync(callback);
+    frame->ready = true;
+    SubmitFrames();
   }
 
   // The native surface. Deleting this is allowed to free the EGLNativeWindow.
   scoped_ptr<ui::SurfaceOzoneEGL> ozone_surface_;
   AcceleratedWidget widget_;
   scoped_ptr<VSyncProvider> vsync_provider_;
+  ScopedVector<PendingFrame> unsubmitted_frames_;
   bool has_implicit_external_sync_;
   bool last_swap_buffers_result_;
 
   base::WeakPtrFactory<GLSurfaceOzoneSurfaceless> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GLSurfaceOzoneSurfaceless);
 };
 
 // This provides surface-like semantics implemented through surfaceless.
 // A framebuffer is bound automatically.
@@ skipping 257 matching lines @@
       NOTREACHED();
       return NULL;
   }
 }
 
 EGLNativeDisplayType GetPlatformDefaultEGLNativeDisplay() {
   return ui::SurfaceFactoryOzone::GetInstance()->GetNativeDisplay();
 }
 
 }  // namespace gfx