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

Unified Diff: ui/gl/gl_image_ozone_native_pixmap.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 | « ui/gfx/native_pixmap_handle_ozone.cc ('k') | ui/gl/gl_image_ozone_native_pixmap_drm_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_image_ozone_native_pixmap.cc
diff --git a/ui/gl/gl_image_ozone_native_pixmap.cc b/ui/gl/gl_image_ozone_native_pixmap.cc
index dd2fb3e1a4bbd9dc6f8f7fdf9d0b78af3e6bd1cb..977f02e424ff06f389098e1a4094bc4dfa6da31a 100644
--- a/ui/gl/gl_image_ozone_native_pixmap.cc
+++ b/ui/gl/gl_image_ozone_native_pixmap.cc
@@ -137,14 +137,9 @@
attrs.push_back(EGL_LINUX_DRM_FOURCC_EXT);
attrs.push_back(FourCC(format));
- const EGLint kLinuxDrmModifiers[] = {EGL_LINUX_DRM_PLANE0_MODIFIER0_EXT,
- EGL_LINUX_DRM_PLANE1_MODIFIER0_EXT,
- EGL_LINUX_DRM_PLANE2_MODIFIER0_EXT};
-
for (size_t plane = 0;
plane < gfx::NumberOfPlanesForBufferFormat(pixmap->GetBufferFormat());
++plane) {
- uint64_t modifier = pixmap->GetDmaBufModifier(plane);
attrs.push_back(EGL_DMA_BUF_PLANE0_FD_EXT + plane * 3);
attrs.push_back(
pixmap->GetDmaBufFd(plane < pixmap->GetDmaBufFdCount() ? plane : 0));
@@ -152,11 +147,6 @@
attrs.push_back(pixmap->GetDmaBufOffset(plane));
attrs.push_back(EGL_DMA_BUF_PLANE0_PITCH_EXT + plane * 3);
attrs.push_back(pixmap->GetDmaBufPitch(plane));
- DCHECK(plane < arraysize(kLinuxDrmModifiers));
- attrs.push_back(kLinuxDrmModifiers[plane]);
- attrs.push_back(modifier & 0xffffffff);
- attrs.push_back(kLinuxDrmModifiers[plane] + 1);
- attrs.push_back(static_cast<uint32_t>(modifier >> 32));
}
attrs.push_back(EGL_NONE);
« no previous file with comments | « ui/gfx/native_pixmap_handle_ozone.cc ('k') | ui/gl/gl_image_ozone_native_pixmap_drm_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698