exo: no-roundtrip dmabuf import

components/exo/wayland/server.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/wayland/server.h"
 
 #include <alpha-compositing-unstable-v1-server-protocol.h>
 #include <gaming-input-unstable-v1-server-protocol.h>
 #include <gaming-input-unstable-v2-server-protocol.h>
 #include <grp.h>
@@ skipping 628 matching lines @@
   const auto& inserted = linux_buffer_params->planes.insert(
       std::pair<uint32_t, LinuxBufferParams::Plane>(plane_idx,
                                                     std::move(plane)));
   if (!inserted.second) {  // The plane was already there.
     wl_resource_post_error(resource, ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_PLANE_SET,
                            "plane already set");
     return;
   }
 }
 
-void linux_buffer_params_create(wl_client* client,
-                                wl_resource* resource,
-                                int32_t width,
-                                int32_t height,
-                                uint32_t format,
-                                uint32_t flags) {
+void linux_buffer_params_create_impl(wl_client* client,

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

I think the code will be easier to read if you didn't add this _impl function
but instead some code duplication in immed and non-immed functions. if the code
duplication is too great then maybe add a utility function or two.

+                                     wl_resource* resource,
+                                     uint32_t buffer_id,
+                                     int32_t width,
+                                     int32_t height,
+                                     uint32_t format,
+                                     uint32_t flags) {
   if (width <= 0 || height <= 0) {
     wl_resource_post_error(resource,
                            ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_INVALID_DIMENSIONS,
                            "invalid width or height");
     return;
   }
 
   const auto* supported_format = std::find_if(
       std::begin(dmabuf_supported_formats), std::end(dmabuf_supported_formats),
       [format](const dmabuf_supported_format& supported_format) {
@@ skipping 40 matching lines @@
     LinuxBufferParams::Plane& plane = plane_it->second;
     planes.emplace_back(plane.stride, plane.offset, 0, 0);
     fds.push_back(std::move(plane.fd));
   }
 
   std::unique_ptr<Buffer> buffer =
       linux_buffer_params->display->CreateLinuxDMABufBuffer(
           gfx::Size(width, height), supported_format->buffer_format, planes,
           std::move(fds));
   if (!buffer) {
-    zwp_linux_buffer_params_v1_send_failed(resource);
-    return;
+    // buffer_id != 0 indicates a create_immed request. on import failure
+    // in that case, the protocol allows us to raise a fatal error from
+    // zwp_linux_dmabuf_v1 version 2+.
+    if (buffer_id == 0)
+      zwp_linux_buffer_params_v1_send_failed(resource);
+    else {
+      wl_resource_post_error(resource,
+                             ZWP_LINUX_BUFFER_PARAMS_V1_ERROR_INVALID_WL_BUFFER,
+                             "dmabuf import failed");
+      return;
+    }
   }
 
   wl_resource* buffer_resource =
-      wl_resource_create(client, &wl_buffer_interface, 1, 0);
+      wl_resource_create(client, &wl_buffer_interface, 1, buffer_id);
 
   buffer->set_release_callback(base::Bind(&HandleBufferReleaseCallback,
                                           base::Unretained(buffer_resource)));
 
   SetImplementation(buffer_resource, &buffer_implementation, std::move(buffer));
 
-  zwp_linux_buffer_params_v1_send_created(resource, buffer_resource);
+  // for a create_immed request, no event is triggered.
+  if (buffer_id == 0)
+    zwp_linux_buffer_params_v1_send_created(resource, buffer_resource);
+}
+
+void linux_buffer_params_create(wl_client* client,
+                                wl_resource* resource,
+                                int32_t width,
+                                int32_t height,
+                                uint32_t format,
+                                uint32_t flags) {
+  linux_buffer_params_create_impl(client, resource, 0, width, height, format,
+                                  flags);
+}
+
+void linux_buffer_params_create_immed(wl_client* client,
+                                      wl_resource* resource,
+                                      uint32_t buffer_id,
+                                      int32_t width,
+                                      int32_t height,
+                                      uint32_t format,
+                                      uint32_t flags) {
+  linux_buffer_params_create_impl(client, resource, buffer_id, width, height,
+                                  format, flags);
 }
 
 const struct zwp_linux_buffer_params_v1_interface
-    linux_buffer_params_implementation = {linux_buffer_params_destroy,
-                                          linux_buffer_params_add,
-                                          linux_buffer_params_create};
+    linux_buffer_params_implementation = {
+        linux_buffer_params_destroy, linux_buffer_params_add,
+        linux_buffer_params_create, linux_buffer_params_create_immed};
 
 ////////////////////////////////////////////////////////////////////////////////
 // linux_dmabuf_interface:
 
 void linux_dmabuf_destroy(wl_client* client, wl_resource* resource) {
   wl_resource_destroy(resource);
 }
 
 void linux_dmabuf_create_params(wl_client* client,
                                 wl_resource* resource,
                                 uint32_t id) {
   std::unique_ptr<LinuxBufferParams> linux_buffer_params =
       base::MakeUnique<LinuxBufferParams>(GetUserDataAs<Display>(resource));
 
   wl_resource* linux_buffer_params_resource =
-      wl_resource_create(client, &zwp_linux_buffer_params_v1_interface, 1, id);
+      wl_resource_create(client, &zwp_linux_buffer_params_v1_interface, 2, id);
 
   SetImplementation(linux_buffer_params_resource,
                     &linux_buffer_params_implementation,
                     std::move(linux_buffer_params));
 }
 
 const struct zwp_linux_dmabuf_v1_interface linux_dmabuf_implementation = {
     linux_dmabuf_destroy, linux_dmabuf_create_params};
 
 void bind_linux_dmabuf(wl_client* client,
                        void* data,
                        uint32_t version,
                        uint32_t id) {
   wl_resource* resource =
-      wl_resource_create(client, &zwp_linux_dmabuf_v1_interface, 1, id);
+      wl_resource_create(client, &zwp_linux_dmabuf_v1_interface, version, id);
 
   wl_resource_set_implementation(resource, &linux_dmabuf_implementation, data,
                                  nullptr);
 
   for (const auto& supported_format : dmabuf_supported_formats)
     zwp_linux_dmabuf_v1_send_format(resource, supported_format.dmabuf_format);
 }
 
 #endif
 
@@ skipping 3071 matching lines @@
 // Server, public:
 
 Server::Server(Display* display)
     : display_(display), wl_display_(wl_display_create()) {
   wl_global_create(wl_display_.get(), &wl_compositor_interface,
                    compositor_version, display_, bind_compositor);
   wl_global_create(wl_display_.get(), &wl_shm_interface, 1, display_, bind_shm);
 #if defined(USE_OZONE)
   wl_global_create(wl_display_.get(), &wl_drm_interface, drm_version, display_,
                    bind_drm);
-  wl_global_create(wl_display_.get(), &zwp_linux_dmabuf_v1_interface, 1,
+  wl_global_create(wl_display_.get(), &zwp_linux_dmabuf_v1_interface, 2,
                    display_, bind_linux_dmabuf);
 #endif
   wl_global_create(wl_display_.get(), &wl_subcompositor_interface, 1, display_,
                    bind_subcompositor);
   wl_global_create(wl_display_.get(), &wl_shell_interface, 1, display_,
                    bind_shell);
   wl_global_create(wl_display_.get(), &wl_output_interface, output_version,
                    display_, bind_output);
   wl_global_create(wl_display_.get(), &xdg_shell_interface, 1, display_,
                    bind_xdg_shell_v5);
@@ skipping 89 matching lines @@
   DCHECK(event_loop);
   wl_event_loop_dispatch(event_loop, timeout.InMilliseconds());
 }
 
 void Server::Flush() {
   wl_display_flush_clients(wl_display_.get());
 }
 
 }  // namespace wayland
 }  // namespace exo