Add format modifier IDs for EGL_EXT_image_dma_buf_import extension

ui/ozone/platform/drm/gpu/gbm_buffer.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/ozone/platform/drm/gpu/gbm_buffer.h"
 
 #include <drm.h>
 #include <fcntl.h>
 #include <gbm.h>
 #include <xf86drm.h>
@@ skipping 14 matching lines @@
 #include "ui/ozone/public/surface_factory_ozone.h"
 
 namespace ui {
 
 GbmBuffer::GbmBuffer(const scoped_refptr<GbmDevice>& gbm,
                      gbm_bo* bo,
                      gfx::BufferFormat format,
                      gfx::BufferUsage usage,
                      std::vector<base::ScopedFD>&& fds,
                      const gfx::Size& size,
-                     const std::vector<int>& strides)
+                     const std::vector<int>& strides,
+                     const std::vector<uint64_t>& modifiers)
     : GbmBufferBase(gbm, bo, format, usage),
       format_(format),
       usage_(usage),
       fds_(std::move(fds)),
       size_(size),
-      strides_(strides) {}
+      strides_(strides),
+      modifiers_(modifiers) {}
 
 GbmBuffer::~GbmBuffer() {
   if (bo())
     gbm_bo_destroy(bo());
 }
 
 bool GbmBuffer::AreFdsValid() const {
   if (fds_.empty())
     return false;
 
   for (const auto& fd : fds_) {
     if (fd.get() == -1)
       return false;
   }
   return true;
 }
 
 int GbmBuffer::GetFd(size_t plane) const {
   DCHECK_LT(plane, fds_.size());
   return fds_[plane].get();
 }
 
 int GbmBuffer::GetStride(size_t plane) const {
   DCHECK_LT(plane, strides_.size());
   return strides_[plane];
 }
 
+uint64_t GbmBuffer::GetFormatModifier(size_t plane) const {
+  DCHECK_LT(plane, modifiers_.size());
+  return modifiers_[plane];
+}
+
 // TODO(reveman): This should not be needed once crbug.com/597932 is fixed,
 // as the size would be queried directly from the underlying bo.
 gfx::Size GbmBuffer::GetSize() const {
   return size_;
 }
 
 // static
 scoped_refptr<GbmBuffer> GbmBuffer::CreateBuffer(
     const scoped_refptr<GbmDevice>& gbm,
     gfx::BufferFormat format,
@@ skipping 25 matching lines @@
   base::ScopedFD fd(gbm_bo_get_fd(bo));
   if (!fd.is_valid()) {
     PLOG(ERROR) << "Failed to export buffer to dma_buf";
     gbm_bo_destroy(bo);
     return nullptr;
   }
   std::vector<base::ScopedFD> fds;
   fds.emplace_back(std::move(fd));
   std::vector<int> strides;
   strides.push_back(gbm_bo_get_stride(bo));
-  scoped_refptr<GbmBuffer> buffer(
-      new GbmBuffer(gbm, bo, format, usage, std::move(fds), size, strides));
+  std::vector<uint64_t> modifiers;
+  modifiers.push_back(gbm_bo_get_format_modifier(bo));
+  scoped_refptr<GbmBuffer> buffer(new GbmBuffer(
+      gbm, bo, format, usage, std::move(fds), size, strides, modifiers));
   if (usage == gfx::BufferUsage::SCANOUT && !buffer->GetFramebufferId())
     return nullptr;
 
   return buffer;
 }
 
 // static
 scoped_refptr<GbmBuffer> GbmBuffer::CreateBufferFromFds(
     const scoped_refptr<GbmDevice>& gbm,
     gfx::BufferFormat format,
     const gfx::Size& size,
     std::vector<base::ScopedFD>&& fds,
     const std::vector<int>& strides) {
   TRACE_EVENT2("drm", "GbmBuffer::CreateBufferFromFD", "device",
                gbm->device_path().value(), "size", size.ToString());
   DCHECK_EQ(fds.size(), strides.size());
+  std::vector<uint64_t> modifiers;
   // TODO(reveman): Use gbm_bo_import after making buffers survive
   // GPU process crashes. crbug.com/597932
-  return make_scoped_refptr(new GbmBuffer(gbm, nullptr, format,
-                                          gfx::BufferUsage::GPU_READ,
-                                          std::move(fds), size, strides));
+  return make_scoped_refptr(
+      new GbmBuffer(gbm, nullptr, format, gfx::BufferUsage::GPU_READ,
+                    std::move(fds), size, strides, modifiers));
 }
 
 GbmPixmap::GbmPixmap(GbmSurfaceFactory* surface_manager,
                      const scoped_refptr<GbmBuffer>& buffer)
     : surface_manager_(surface_manager), buffer_(buffer) {}
 
 void GbmPixmap::SetProcessingCallback(
     const ProcessingCallback& processing_callback) {
   DCHECK(processing_callback_.is_null());
   processing_callback_ = processing_callback;
@@ skipping 27 matching lines @@
 }
 
 int GbmPixmap::GetDmaBufFd(size_t plane) const {
   return buffer_->GetFd(plane);
 }
 
 int GbmPixmap::GetDmaBufPitch(size_t plane) const {
   return buffer_->GetStride(plane);
 }
 
+uint64_t GbmPixmap::GetDmaBufModifier(size_t plane) const {
+  return buffer_->GetFormatModifier(plane);
+}
+
 gfx::BufferFormat GbmPixmap::GetBufferFormat() const {
   return buffer_->GetFormat();
 }
 
 gfx::Size GbmPixmap::GetBufferSize() const {
   return buffer_->GetSize();
 }
 
 bool GbmPixmap::ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
                                      int plane_z_order,
@@ skipping 37 matching lines @@
   DCHECK(!processing_callback_.is_null());
   if (!processing_callback_.Run(this, processed_pixmap_)) {
     LOG(ERROR) << "Failed processing NativePixmap";
     return nullptr;
   }
 
   return processed_pixmap_->buffer();
 }
 
 }  // namespace ui