exo: no-roundtrip dmabuf import

components/exo/wayland/clients/client_base.cc

 // Copyright 2017 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/wayland/clients/client_base.h"
 
 #include <fcntl.h>
 #include <linux-dmabuf-unstable-v1-client-protocol.h>
 #include <presentation-time-client-protocol.h>
 #include <wayland-client-core.h>
@@ skipping 94 matching lines @@
 void RegistryRemover(void* data, wl_registry* registry, uint32_t id) {
   LOG(WARNING) << "Got a registry losing event for " << id;
 }
 
 void BufferRelease(void* data, wl_buffer* /* buffer */) {
   ClientBase::Buffer* buffer = static_cast<ClientBase::Buffer*>(data);
   buffer->busy = false;
 }
 
 #if defined(OZONE_PLATFORM_GBM)
-void LinuxBufferParamsCreated(void* data,
-                              zwp_linux_buffer_params_v1* params,
-                              wl_buffer* new_buffer) {
-  ClientBase::Buffer* buffer = static_cast<ClientBase::Buffer*>(data);
-  buffer->buffer.reset(new_buffer);
-}
-
-void LinuxBufferParamsFailed(void* data, zwp_linux_buffer_params_v1* params) {
-  LOG(ERROR) << "Linux buffer params failed";
-}
-
 const GrGLInterface* GrGLCreateNativeInterface() {
   return GrGLAssembleInterface(nullptr, [](void* ctx, const char name[]) {
     return eglGetProcAddress(name);
   });
 }
-
-zwp_linux_buffer_params_v1_listener g_params_listener = {
-    LinuxBufferParamsCreated, LinuxBufferParamsFailed};
 #endif
 
 wl_registry_listener g_registry_listener = {RegistryHandler, RegistryRemover};
 
 wl_buffer_listener g_buffer_listener = {BufferRelease};
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // ClientBase::InitParams, public:
@@ skipping 162 matching lines @@
 #endif
   for (size_t i = 0; i < params.num_buffers; ++i) {
     auto buffer = CreateBuffer(params.drm_format);
     if (!buffer) {
       LOG(ERROR) << "Failed to create buffer";
       return false;
     }
     buffers_.push_back(std::move(buffer));
   }
 
-  wl_display_roundtrip(display_.get());
   for (size_t i = 0; i < buffers_.size(); ++i) {
+    // if the buffer handle doesn't exist, we would either be killed by the

[reveman, 2017/06/05 13:08:53]

nit: "If" as comments should have proper capitalization

+    // server or die here.
     if (!buffers_[i]->buffer) {
-      LOG(ERROR) << "LinuxBufferParamsCreated was not called on the buffer.";
+      LOG(ERROR) << "buffer handle uninitialized.";
       return false;
     }
 
     wl_buffer_add_listener(buffers_[i]->buffer.get(), &g_buffer_listener,
                            buffers_[i].get());
   }
 
   surface_.reset(static_cast<wl_surface*>(
       wl_compositor_create_surface(globals_.compositor.get())));
   if (!surface_) {
@@ skipping 51 matching lines @@
     buffer->bo.reset(gbm_bo_create(device_.get(), width_, height_, drm_format,
                                    GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING));
     if (!buffer->bo) {
       LOG(ERROR) << "Can't create gbm buffer";
       return nullptr;
     }
     base::ScopedFD fd(gbm_bo_get_plane_fd(buffer->bo.get(), 0));
 
     buffer->params.reset(
         zwp_linux_dmabuf_v1_create_params(globals_.linux_dmabuf.get()));
-    zwp_linux_buffer_params_v1_add_listener(buffer->params.get(),
-                                            &g_params_listener, buffer.get());
     for (size_t i = 0; i < gbm_bo_get_num_planes(buffer->bo.get()); ++i) {
       base::ScopedFD fd(gbm_bo_get_plane_fd(buffer->bo.get(), i));
       uint32_t stride = gbm_bo_get_plane_stride(buffer->bo.get(), i);
       uint32_t offset = gbm_bo_get_plane_offset(buffer->bo.get(), i);
       zwp_linux_buffer_params_v1_add(buffer->params.get(), fd.get(), i, offset,
                                      stride, 0, 0);
     }
-    zwp_linux_buffer_params_v1_create(buffer->params.get(), width_, height_,
-                                      drm_format, 0);
+    buffer->buffer.reset(zwp_linux_buffer_params_v1_create_immed(
+        buffer->params.get(), width_, height_, drm_format, 0));
 
     if (gbm_bo_get_num_planes(buffer->bo.get()) != 1)
       return buffer;
 
     EGLint khr_image_attrs[] = {EGL_DMA_BUF_PLANE0_FD_EXT,
                                 fd.get(),
                                 EGL_WIDTH,
                                 width_,
                                 EGL_HEIGHT,
                                 height_,
@@ skipping 52 matching lines @@
   buffer->sk_surface = SkSurface::MakeRasterDirect(
       SkImageInfo::Make(width_, height_, kColorType, kOpaque_SkAlphaType),
       static_cast<uint8_t*>(buffer->shared_memory->memory()), stride);
   DCHECK(buffer->sk_surface);
   return buffer;
 }
 
 }  // namespace clients
 }  // namespace wayland
 }  // namespace exo