Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(279)

Unified Diff: components/exo/display_unittest.cc

Issue 2110213002: Revert of Add format modifier IDs for EGL_EXT_image_dma_buf_import extension (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/exo/display.cc ('k') | components/exo/wayland/server.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/exo/display_unittest.cc
diff --git a/components/exo/display_unittest.cc b/components/exo/display_unittest.cc
index 694915dbf624be1dba91dbfc994756c9c6810081..6d6f6624cb1106a88d9abdb4813cacc36b676e2f 100644
--- a/components/exo/display_unittest.cc
+++ b/components/exo/display_unittest.cc
@@ -68,20 +68,23 @@
gfx::BufferFormat::RGBA_8888,
gfx::BufferUsage::GPU_READ);
gfx::NativePixmapHandle native_pixmap_handle = pixmap->ExportHandle();
- std::vector<gfx::NativePixmapPlane> planes;
+ std::vector<int> strides;
+ std::vector<int> offsets;
std::vector<base::ScopedFD> fds;
- planes.push_back(native_pixmap_handle.planes[0]);
+ strides.push_back(native_pixmap_handle.strides_and_offsets[0].first);
+ offsets.push_back(native_pixmap_handle.strides_and_offsets[0].second);
fds.push_back(base::ScopedFD(native_pixmap_handle.fds[0].fd));
std::unique_ptr<Buffer> buffer1 = display->CreateLinuxDMABufBuffer(
- buffer_size, gfx::BufferFormat::RGBA_8888, planes, std::move(fds));
+ buffer_size, gfx::BufferFormat::RGBA_8888, strides, offsets,
+ std::move(fds));
EXPECT_TRUE(buffer1);
std::vector<base::ScopedFD> invalid_fds;
invalid_fds.push_back(base::ScopedFD());
// Creating a prime buffer using an invalid fd should fail.
std::unique_ptr<Buffer> buffer2 = display->CreateLinuxDMABufBuffer(
- buffer_size, gfx::BufferFormat::RGBA_8888, planes,
+ buffer_size, gfx::BufferFormat::RGBA_8888, strides, offsets,
std::move(invalid_fds));
EXPECT_FALSE(buffer2);
}
« no previous file with comments | « components/exo/display.cc ('k') | components/exo/wayland/server.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698