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 39 matching lines @@
 
 // Specifies if the background should be transparent.
 const char kTransparentBackground[] = "transparent-background";
 
 // Use drm buffer instead of shared memory.
 const char kUseDrm[] = "use-drm";
 
 // Specifies if client should be fullscreen.
 const char kFullscreen[] = "fullscreen";
 
+// Specifies if no-roundtrip dmabuf import path should be used.
+const char kNoRoundtripImport[] = "no-roundtrip-import";

[reveman, 2017/04/28 17:21:24]

No need for this flag. Please refactor the code so it works in an ideal way for
this new type of buffer import.

+
 }  // namespace switches
 
 namespace {
 
 // Buffer format.
 const int32_t kShmFormat = WL_SHM_FORMAT_ARGB8888;
 const SkColorType kColorType = kBGRA_8888_SkColorType;
 #if defined(OZONE_PLATFORM_GBM)
 const GrPixelConfig kGrPixelConfig = kBGRA_8888_GrPixelConfig;
 #endif
@@ skipping 97 matching lines @@
     return false;
   }
 
   use_drm = command_line.HasSwitch(switches::kUseDrm);
   if (use_drm)
     use_drm_value = command_line.GetSwitchValueASCII(switches::kUseDrm);
 
   fullscreen = command_line.HasSwitch(switches::kFullscreen);
   transparent_background =
       command_line.HasSwitch(switches::kTransparentBackground);
+  immed = command_line.HasSwitch(switches::kNoRoundtripImport);
   return true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ClientBase::Globals, public:
 
 ClientBase::Globals::Globals() {}
 
 ClientBase::Globals::~Globals() {}
 
 ////////////////////////////////////////////////////////////////////////////////
 // ClientBase::Buffer, public:
 
 ClientBase::Buffer::Buffer() {}
 
 ClientBase::Buffer::~Buffer() {}
 
 ////////////////////////////////////////////////////////////////////////////////
 // ClientBase, public:
 
 bool ClientBase::Init(const InitParams& params) {
   width_ = params.width;
   height_ = params.height;
   scale_ = params.scale;
   fullscreen_ = params.fullscreen;
   transparent_background_ = params.transparent_background;
+  immed_ = params.immed;
 
   display_.reset(wl_display_connect(nullptr));
   if (!display_) {
     LOG(ERROR) << "wl_display_connect failed";
     return false;
   }
   wl_registry* registry = wl_display_get_registry(display_.get());
   wl_registry_add_listener(registry, &g_registry_listener, &globals_);
 
   wl_display_roundtrip(display_.get());
@@ skipping 93 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());
+  if (!immed_)
+    wl_display_roundtrip(display_.get());
   for (size_t i = 0; i < buffers_.size(); ++i) {
     if (!buffers_[i]->buffer) {
       LOG(ERROR) << "LinuxBufferParamsCreated was not called on the buffer.";
       return false;
     }
 
     wl_buffer_add_listener(buffers_[i]->buffer.get(), &g_buffer_listener,
                            buffers_[i].get());
   }
 
@@ skipping 63 matching lines @@
         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);
+    if (immed_)
+      buffer->buffer.reset(zwp_linux_buffer_params_v1_create_immed(
+          buffer->params.get(), width_, height_, drm_format, 0));
+    else
+      zwp_linux_buffer_params_v1_create(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