| Index: ui/ozone/platform/drm/gpu/gbm_buffer.h
|
| diff --git a/ui/ozone/platform/drm/gpu/gbm_buffer.h b/ui/ozone/platform/drm/gpu/gbm_buffer.h
|
| index f2351fa62bf868d90f8b14235b131898eee4ae2f..387befb9e32e5b02d15903483176f3fd520be10c 100644
|
| --- a/ui/ozone/platform/drm/gpu/gbm_buffer.h
|
| +++ b/ui/ozone/platform/drm/gpu/gbm_buffer.h
|
| @@ -33,8 +33,7 @@ class GbmBuffer : public GbmBufferBase {
|
| gfx::BufferFormat format,
|
| const gfx::Size& size,
|
| std::vector<base::ScopedFD>&& fds,
|
| - const std::vector<int>& strides,
|
| - const std::vector<int>& offsets);
|
| + const std::vector<gfx::GbmBufferPlane>& planes);
|
| gfx::BufferFormat GetFormat() const { return format_; }
|
| gfx::BufferUsage GetUsage() const { return usage_; }
|
| bool AreFdsValid() const;
|
| @@ -42,6 +41,7 @@ class GbmBuffer : public GbmBufferBase {
|
| int GetFd(size_t plane) const;
|
| int GetStride(size_t plane) const;
|
| int GetOffset(size_t plane) const;
|
| + uint64_t GetFormatModifier(size_t plane) const;
|
| gfx::Size GetSize() const override;
|
|
|
| private:
|
| @@ -51,16 +51,15 @@ class GbmBuffer : public GbmBufferBase {
|
| gfx::BufferUsage usage,
|
| std::vector<base::ScopedFD>&& fds,
|
| const gfx::Size& size,
|
| - const std::vector<int>& strides,
|
| - const std::vector<int>& offsets);
|
| + const std::vector<gfx::GbmBufferPlane>&& planes);
|
| ~GbmBuffer() override;
|
|
|
| gfx::BufferFormat format_;
|
| gfx::BufferUsage usage_;
|
| std::vector<base::ScopedFD> fds_;
|
| gfx::Size size_;
|
| - std::vector<int> strides_;
|
| - std::vector<int> offsets_;
|
| +
|
| + std::vector<gfx::GbmBufferPlane> planes_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(GbmBuffer);
|
| };
|
| @@ -80,6 +79,7 @@ class GbmPixmap : public NativePixmap {
|
| int GetDmaBufFd(size_t plane) const override;
|
| int GetDmaBufPitch(size_t plane) const override;
|
| int GetDmaBufOffset(size_t plane) const override;
|
| + uint64_t GetDmaBufModifier(size_t plane) const override;
|
| gfx::BufferFormat GetBufferFormat() const override;
|
| gfx::Size GetBufferSize() const override;
|
| bool ScheduleOverlayPlane(gfx::AcceleratedWidget widget,
|
|
|