Chromium Code Reviews| 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 977f02e424ff06f389098e1a4094bc4dfa6da31a..97e784313b6dece79a905fbcad5fc469b822d7e5 100644 |
| --- a/ui/gl/gl_image_ozone_native_pixmap.cc |
| +++ b/ui/gl/gl_image_ozone_native_pixmap.cc |
| @@ -137,9 +137,14 @@ bool GLImageOzoneNativePixmap::Initialize(ui::NativePixmap* pixmap, |
| 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)); |
| @@ -147,6 +152,10 @@ bool GLImageOzoneNativePixmap::Initialize(ui::NativePixmap* pixmap, |
| attrs.push_back(pixmap->GetDmaBufOffset(plane)); |
| attrs.push_back(EGL_DMA_BUF_PLANE0_PITCH_EXT + plane * 3); |
| attrs.push_back(pixmap->GetDmaBufPitch(plane)); |
| + attrs.push_back(kLinuxDrmModifiers[plane]); |
|
rickyz (no longer on Chrome)
2016/06/28 06:53:13
Should we DCHECK that plane < arraysize(kLinuxDrmM
|
| + 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); |