Revert of 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<gfx::NativePixmapPlane>&& planes)
+                     const std::vector<int>& strides,
+                     const std::vector<int>& offsets)
     : GbmBufferBase(gbm, bo, format, usage),
       format_(format),
       usage_(usage),
       fds_(std::move(fds)),
       size_(size),
-      planes_(std::move(planes)) {}
+      strides_(strides),
+      offsets_(offsets) {}
 
 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;
 }
 
 size_t GbmBuffer::GetFdCount() const {
   return fds_.size();
 }
 
-int GbmBuffer::GetFd(size_t index) const {
-  DCHECK_LT(index, fds_.size());
-  return fds_[index].get();
+int GbmBuffer::GetFd(size_t plane) const {
+  DCHECK_LT(plane, fds_.size());
+  return fds_[plane].get();
 }
 
-int GbmBuffer::GetStride(size_t index) const {
-  DCHECK_LT(index, planes_.size());
-  return planes_[index].stride;
+int GbmBuffer::GetStride(size_t plane) const {
+  DCHECK_LT(plane, strides_.size());
+  return strides_[plane];
 }
 
-int GbmBuffer::GetOffset(size_t index) const {
-  DCHECK_LT(index, planes_.size());
-  return planes_[index].offset;
-}
-
-uint64_t GbmBuffer::GetFormatModifier(size_t index) const {
-  DCHECK_LT(index, planes_.size());
-  return planes_[index].modifier;
+int GbmBuffer::GetOffset(size_t plane) const {
+  DCHECK_LT(plane, offsets_.size());
+  return offsets_[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(
@@ skipping 25 matching lines @@
   // The fd returned by gbm_bo_get_fd is not ref-counted and need to be
   // kept open for the lifetime of the buffer.
   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<gfx::NativePixmapPlane> planes;
-  planes.emplace_back(gbm_bo_get_stride(bo), gbm_bo_get_plane_offset(bo, 0),
-                      gbm_bo_get_format_modifier(bo));
+  std::vector<int> strides;
+  strides.push_back(gbm_bo_get_stride(bo));
+  std::vector<int> offsets;
+  offsets.push_back(gbm_bo_get_plane_offset(bo, 0));
   scoped_refptr<GbmBuffer> buffer(new GbmBuffer(
-      gbm, bo, format, usage, std::move(fds), size, std::move(planes)));
+      gbm, bo, format, usage, std::move(fds), size, strides, offsets));
   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<gfx::NativePixmapPlane>& planes) {
+    const std::vector<int>& strides,
+    const std::vector<int>& offsets) {
   TRACE_EVENT2("drm", "GbmBuffer::CreateBufferFromFD", "device",
                gbm->device_path().value(), "size", size.ToString());
-  DCHECK_LE(fds.size(), planes.size());
-  DCHECK_EQ(planes[0].offset, 0);
+  DCHECK_LE(fds.size(), strides.size());
+  DCHECK_EQ(strides.size(), offsets.size());
+  DCHECK_EQ(offsets[0], 0);
 
   uint32_t fourcc_format = GetFourCCFormatFromBufferFormat(format);
 
   // Use scanout if supported.
   bool use_scanout = gbm_device_is_format_supported(
       gbm->device(), fourcc_format, GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING);
 
   gbm_bo* bo = nullptr;
   if (use_scanout) {
     struct gbm_import_fd_data fd_data;
     fd_data.fd = fds[0].get();
     fd_data.width = size.width();
     fd_data.height = size.height();
-    fd_data.stride = planes[0].stride;
+    fd_data.stride = strides[0];
     fd_data.format = fourcc_format;
 
     // The fd passed to gbm_bo_import is not ref-counted and need to be
     // kept open for the lifetime of the buffer.
     bo = gbm_bo_import(gbm->device(), GBM_BO_IMPORT_FD, &fd_data,
                        GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING);
     if (!bo) {
       LOG(ERROR) << "nullptr returned from gbm_bo_import";
       return nullptr;
     }
   }
 
   scoped_refptr<GbmBuffer> buffer(new GbmBuffer(
       gbm, bo, format,
       use_scanout ? gfx::BufferUsage::SCANOUT : gfx::BufferUsage::GPU_READ,
-      std::move(fds), size, std::move(planes)));
+      std::move(fds), size, strides, offsets));
   // If scanout support for buffer is expected then make sure we managed to
   // create a framebuffer for it as otherwise using it for scanout will fail.
   if (use_scanout && !buffer->GetFramebufferId())
     return nullptr;
 
   return buffer;
 }
 
 GbmPixmap::GbmPixmap(GbmSurfaceFactory* surface_manager,
                      const scoped_refptr<GbmBuffer>& buffer)
@@ skipping 12 matching lines @@
     // Some formats (e.g: YVU_420) might have less than one fd per plane.
     if (i < buffer_->GetFdCount()) {
       base::ScopedFD scoped_fd(HANDLE_EINTR(dup(buffer_->GetFd(i))));
       if (!scoped_fd.is_valid()) {
         PLOG(ERROR) << "dup";
         return gfx::NativePixmapHandle();
       }
       handle.fds.emplace_back(
           base::FileDescriptor(scoped_fd.release(), true /* auto_close */));
     }
-    handle.planes.emplace_back(buffer_->GetStride(i), buffer_->GetOffset(i),
-                               buffer_->GetFormatModifier(i));
+    handle.strides_and_offsets.emplace_back(buffer_->GetStride(i),
+                                            buffer_->GetOffset(i));
   }
   return handle;
 }
 
 GbmPixmap::~GbmPixmap() {
 }
 
 void* GbmPixmap::GetEGLClientBuffer() const {
   return nullptr;
 }
@@ skipping 11 matching lines @@
 }
 
 int GbmPixmap::GetDmaBufPitch(size_t plane) const {
   return buffer_->GetStride(plane);
 }
 
 int GbmPixmap::GetDmaBufOffset(size_t plane) const {
   return buffer_->GetOffset(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